summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /app-admin
reinit the tree, so we can have metadata
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/389-console/389-console-1.1.7-r1.ebuild52
-rw-r--r--app-admin/389-console/Manifest6
-rw-r--r--app-admin/389-console/metadata.xml8
-rw-r--r--app-admin/abrt/Manifest11
-rw-r--r--app-admin/abrt/abrt-2.0.12-r2.ebuild115
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch64
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch111
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-gentoo.patch398
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-r1-conf27
-rw-r--r--app-admin/abrt/files/abrt-2.0.12-r1-init76
-rw-r--r--app-admin/abrt/files/abrt-2.0.6-format-security.patch27
-rw-r--r--app-admin/abrt/metadata.xml11
-rw-r--r--app-admin/aerospike-amc-community/Manifest19
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild63
-rw-r--r--app-admin/aerospike-amc-community/files/amc.init23
-rw-r--r--app-admin/aerospike-amc-community/files/amc.init224
-rw-r--r--app-admin/aerospike-amc-community/metadata.xml7
-rw-r--r--app-admin/amazon-ec2-init/Manifest5
-rw-r--r--app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild32
-rw-r--r--app-admin/amazon-ec2-init/files/amazon-ec2.init34
-rw-r--r--app-admin/amazon-ec2-init/metadata.xml5
-rw-r--r--app-admin/analog/Manifest9
-rw-r--r--app-admin/analog/analog-6.0-r4.ebuild55
-rw-r--r--app-admin/analog/files/analog-5.1-gentoo.diff20
-rw-r--r--app-admin/analog/files/analog-6.0-bzip2.patch64
-rw-r--r--app-admin/analog/files/analog-6.0-undefined-macro.patch38
-rw-r--r--app-admin/analog/files/analog.cfg101
-rw-r--r--app-admin/analog/metadata.xml5
-rw-r--r--app-admin/ansible/Manifest10
-rw-r--r--app-admin/ansible/ansible-2.3.2.0-r2.ebuild65
-rw-r--r--app-admin/ansible/ansible-2.4.0.0.ebuild59
-rw-r--r--app-admin/ansible/ansible-9999.ebuild71
-rw-r--r--app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch74
-rw-r--r--app-admin/ansible/metadata.xml29
-rw-r--r--app-admin/apache-tools/Manifest13
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.31.ebuild89
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.34.ebuild85
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.27.ebuild106
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.28.ebuild106
-rw-r--r--app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch41
-rw-r--r--app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch47
-rw-r--r--app-admin/apache-tools/metadata.xml13
-rw-r--r--app-admin/apachetop/Manifest10
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r1.ebuild44
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r2.ebuild36
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch12
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-configure.patch101
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch13
-rw-r--r--app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch39
-rw-r--r--app-admin/apachetop/metadata.xml4
-rw-r--r--app-admin/apg/Manifest8
-rw-r--r--app-admin/apg/apg-2.3.0b-r5.ebuild51
-rw-r--r--app-admin/apg/files/apg-2.3.0b-cracklib.patch17
-rw-r--r--app-admin/apg/files/apg-2.3.0b-crypt_password.patch31
-rw-r--r--app-admin/apg/files/apg-glibc-2.4.patch11
-rw-r--r--app-admin/apg/metadata.xml14
-rw-r--r--app-admin/augeas/Manifest19
-rw-r--r--app-admin/augeas/augeas-1.7.0-r1.ebuild52
-rw-r--r--app-admin/augeas/augeas-1.7.0.ebuild48
-rw-r--r--app-admin/augeas/augeas-1.8.0-r1.ebuild47
-rw-r--r--app-admin/augeas/augeas-1.8.0.ebuild41
-rw-r--r--app-admin/augeas/augeas-1.8.1.ebuild46
-rw-r--r--app-admin/augeas/augeas-1.9.0.ebuild46
-rw-r--r--app-admin/augeas/files/augeas-0.10.0-gets.patch15
-rw-r--r--app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch24
-rw-r--r--app-admin/augeas/files/augeas-0.10.0-test.patch56
-rw-r--r--app-admin/augeas/files/augeas-0.10.0-test2.patch49
-rw-r--r--app-admin/augeas/files/cve-2017-7555.patch159
-rw-r--r--app-admin/augeas/files/cve-bunch-of-them-symlink.patch76
-rw-r--r--app-admin/augeas/metadata.xml17
-rw-r--r--app-admin/authbind/Manifest6
-rw-r--r--app-admin/authbind/authbind-2.1.1.ebuild51
-rw-r--r--app-admin/authbind/files/authbind-2.1.1-respect-flags.patch26
-rw-r--r--app-admin/authbind/metadata.xml8
-rw-r--r--app-admin/aws-as-tools/Manifest5
-rw-r--r--app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild63
-rw-r--r--app-admin/aws-as-tools/metadata.xml13
-rw-r--r--app-admin/aws-cw-tools/Manifest5
-rw-r--r--app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild61
-rw-r--r--app-admin/aws-cw-tools/metadata.xml13
-rw-r--r--app-admin/aws-elb-tools/Manifest6
-rw-r--r--app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild59
-rw-r--r--app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild60
-rw-r--r--app-admin/aws-elb-tools/metadata.xml5
-rw-r--r--app-admin/aws-iam-tools/Manifest5
-rw-r--r--app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild60
-rw-r--r--app-admin/aws-iam-tools/metadata.xml13
-rw-r--r--app-admin/aws-rds-tools/Manifest5
-rw-r--r--app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild60
-rw-r--r--app-admin/aws-rds-tools/metadata.xml13
-rw-r--r--app-admin/bastille/Manifest10
-rw-r--r--app-admin/bastille/bastille-3.0.9-r1.ebuild69
-rw-r--r--app-admin/bastille/bastille-3.0.9-r2.ebuild80
-rw-r--r--app-admin/bastille/files/bastille-3.0.9-openrc.patch12
-rw-r--r--app-admin/bastille/files/bastille-3.0.9-perl.patch25
-rw-r--r--app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch48
-rw-r--r--app-admin/bastille/metadata.xml12
-rw-r--r--app-admin/bcfg2/Manifest6
-rw-r--r--app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild66
-rw-r--r--app-admin/bcfg2/files/bcfg2-server-1.2.0.rc23
-rw-r--r--app-admin/bcfg2/metadata.xml13
-rw-r--r--app-admin/calamares/Manifest8
-rw-r--r--app-admin/calamares/calamares-3.1.4.ebuild80
-rw-r--r--app-admin/calamares/calamares-3.1.5.ebuild80
-rw-r--r--app-admin/calamares/files/calamares-pkexec2
-rw-r--r--app-admin/calamares/metadata.xml27
-rw-r--r--app-admin/cancd/Manifest11
-rw-r--r--app-admin/cancd/cancd-0.1.0-r3.ebuild37
-rw-r--r--app-admin/cancd/files/cancd-0.1.0-build.patch14
-rw-r--r--app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch65
-rw-r--r--app-admin/cancd/files/cancd-conf.d19
-rw-r--r--app-admin/cancd/files/cancd-init.d22
-rw-r--r--app-admin/cancd/files/netconsole-conf.d27
-rw-r--r--app-admin/cancd/files/netconsole-init.d67
-rw-r--r--app-admin/cancd/metadata.xml8
-rw-r--r--app-admin/ccze/Manifest10
-rw-r--r--app-admin/ccze/ccze-0.2.1-r3.ebuild44
-rw-r--r--app-admin/ccze/ccze-0.2.1-r4.ebuild47
-rw-r--r--app-admin/ccze/files/ccze-0.2.1-tinfo.patch10
-rw-r--r--app-admin/ccze/files/ccze-fbsd.patch25
-rw-r--r--app-admin/ccze/files/ccze-ldflags.patch11
-rw-r--r--app-admin/ccze/files/ccze-segfault.patch29
-rw-r--r--app-admin/ccze/metadata.xml11
-rw-r--r--app-admin/cdist/Manifest5
-rw-r--r--app-admin/cdist/cdist-4.6.1.ebuild24
-rw-r--r--app-admin/cdist/metadata.xml16
-rw-r--r--app-admin/cgmanager/Manifest10
-rw-r--r--app-admin/cgmanager/cgmanager-0.39.ebuild52
-rw-r--r--app-admin/cgmanager/cgmanager-0.41.ebuild49
-rw-r--r--app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch31
-rw-r--r--app-admin/cgmanager/files/cgmanager.initd-r114
-rw-r--r--app-admin/cgmanager/files/cgproxy.initd-r127
-rw-r--r--app-admin/cgmanager/metadata.xml12
-rw-r--r--app-admin/checksec/Manifest11
-rw-r--r--app-admin/checksec/checksec-1.7.2.ebuild29
-rw-r--r--app-admin/checksec/checksec-1.7.3.ebuild29
-rw-r--r--app-admin/checksec/checksec-1.7.4.ebuild36
-rw-r--r--app-admin/checksec/checksec-1.7.5.ebuild36
-rw-r--r--app-admin/checksec/files/checksec-1.7.2-path.patch24
-rw-r--r--app-admin/checksec/metadata.xml11
-rw-r--r--app-admin/chroot_safe/Manifest6
-rw-r--r--app-admin/chroot_safe/chroot_safe-1.4.ebuild35
-rw-r--r--app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch13
-rw-r--r--app-admin/chroot_safe/metadata.xml8
-rw-r--r--app-admin/chrootuid/Manifest6
-rw-r--r--app-admin/chrootuid/chrootuid-1.3-r1.ebuild29
-rw-r--r--app-admin/chrootuid/chrootuid-1.3.ebuild29
-rw-r--r--app-admin/chrootuid/metadata.xml7
-rw-r--r--app-admin/chrpath/Manifest8
-rw-r--r--app-admin/chrpath/chrpath-0.13-r2.ebuild38
-rw-r--r--app-admin/chrpath/files/chrpath-0.13-multilib.patch160
-rw-r--r--app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch19
-rw-r--r--app-admin/chrpath/files/chrpath-keepgoing.patch20
-rw-r--r--app-admin/chrpath/metadata.xml11
-rw-r--r--app-admin/cli53/Manifest5
-rw-r--r--app-admin/cli53/cli53-0.8.9.ebuild34
-rw-r--r--app-admin/cli53/cli53-9999.ebuild34
-rw-r--r--app-admin/cli53/metadata.xml11
-rw-r--r--app-admin/clog/Manifest5
-rw-r--r--app-admin/clog/clog-1.1.0.ebuild37
-rw-r--r--app-admin/clog/metadata.xml8
-rw-r--r--app-admin/clsync/Manifest11
-rw-r--r--app-admin/clsync/clsync-0.4.1.ebuild114
-rw-r--r--app-admin/clsync/clsync-0.4.2.ebuild103
-rw-r--r--app-admin/clsync/files/clsync.conf18
-rw-r--r--app-admin/clsync/files/clsync.confd20
-rw-r--r--app-admin/clsync/files/clsync.initd17
-rw-r--r--app-admin/clsync/metadata.xml30
-rw-r--r--app-admin/clustershell/Manifest8
-rw-r--r--app-admin/clustershell/clustershell-1.6-r1.ebuild47
-rw-r--r--app-admin/clustershell/clustershell-1.6.ebuild45
-rw-r--r--app-admin/clustershell/clustershell-1.7.3.ebuild57
-rw-r--r--app-admin/clustershell/metadata.xml8
-rw-r--r--app-admin/collectd/Manifest16
-rw-r--r--app-admin/collectd/collectd-5.6.2-r4.ebuild532
-rw-r--r--app-admin/collectd/collectd-5.7.1.ebuild537
-rw-r--r--app-admin/collectd/collectd-5.7.2.ebuild536
-rw-r--r--app-admin/collectd/files/collectd-5.6.0-gentoo.patch153
-rw-r--r--app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch56
-rw-r--r--app-admin/collectd/files/collectd-5.6.2-issue2303.patch44
-rw-r--r--app-admin/collectd/files/collectd-5.7.2-issue-2443.patch160
-rw-r--r--app-admin/collectd/files/collectd.confd-r145
-rw-r--r--app-admin/collectd/files/collectd.initd-r178
-rw-r--r--app-admin/collectd/files/collectd.logrotate9
-rw-r--r--app-admin/collectd/metadata.xml27
-rw-r--r--app-admin/conky/Manifest9
-rw-r--r--app-admin/conky/conky-1.10.4.ebuild184
-rw-r--r--app-admin/conky/conky-1.10.6-r2.ebuild190
-rw-r--r--app-admin/conky/files/conky-1.10.4-x11-build.patch31
-rw-r--r--app-admin/conky/files/conky-1.10.6-new_graph-oor.patch35
-rw-r--r--app-admin/conky/metadata.xml40
-rw-r--r--app-admin/conkyforecast/Manifest5
-rw-r--r--app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild44
-rw-r--r--app-admin/conkyforecast/metadata.xml11
-rw-r--r--app-admin/conserver/Manifest12
-rw-r--r--app-admin/conserver/conserver-8.1.18-r1.ebuild89
-rw-r--r--app-admin/conserver/conserver-8.1.18.ebuild86
-rw-r--r--app-admin/conserver/files/conserver-8.1.18-dmalloc.patch100
-rw-r--r--app-admin/conserver/files/conserver-prestrip.patch24
-rw-r--r--app-admin/conserver/files/conserver.confd6
-rw-r--r--app-admin/conserver/files/conserver.initd37
-rw-r--r--app-admin/conserver/files/conserver.initd-r137
-rw-r--r--app-admin/conserver/files/conserver.pam-pambase6
-rw-r--r--app-admin/conserver/metadata.xml26
-rw-r--r--app-admin/consolehm/Manifest6
-rw-r--r--app-admin/consolehm/consolehm-1.31.ebuild45
-rw-r--r--app-admin/consolehm/files/consolehm-gcc4.patch10
-rw-r--r--app-admin/consolehm/metadata.xml8
-rw-r--r--app-admin/consul-replicate/Manifest15
-rw-r--r--app-admin/consul-replicate/consul-replicate-0.2.0.ebuild87
-rw-r--r--app-admin/consul-replicate/metadata.xml10
-rw-r--r--app-admin/consul-template/Manifest9
-rw-r--r--app-admin/consul-template/consul-template-0.18.5-r1.ebuild61
-rw-r--r--app-admin/consul-template/files/consul-template.confd7
-rw-r--r--app-admin/consul-template/files/consul-template.initd20
-rw-r--r--app-admin/consul-template/files/consul-template.logrotated7
-rw-r--r--app-admin/consul-template/files/consul-template.service16
-rw-r--r--app-admin/consul-template/metadata.xml10
-rw-r--r--app-admin/consul/Manifest14
-rw-r--r--app-admin/consul/consul-0.8.4-r1.ebuild67
-rw-r--r--app-admin/consul/consul-0.9.3.ebuild68
-rw-r--r--app-admin/consul/files/bootstrap.json.example4
-rw-r--r--app-admin/consul/files/consul.confd10
-rw-r--r--app-admin/consul/files/consul.initd27
-rw-r--r--app-admin/consul/files/consul.logrotated7
-rw-r--r--app-admin/consul/files/consul.service16
-rw-r--r--app-admin/consul/files/data-dir.json.example3
-rw-r--r--app-admin/consul/files/ui.json.example3
-rw-r--r--app-admin/consul/metadata.xml13
-rw-r--r--app-admin/cpulimit/Manifest10
-rw-r--r--app-admin/cpulimit/cpulimit-1.8.ebuild29
-rw-r--r--app-admin/cpulimit/cpulimit-2.2.ebuild29
-rw-r--r--app-admin/cpulimit/cpulimit-2.4.ebuild34
-rw-r--r--app-admin/cpulimit/files/cpulimit.849
-rw-r--r--app-admin/cpulimit/metadata.xml11
-rw-r--r--app-admin/cronolog/Manifest16
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r3.ebuild28
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r4.ebuild30
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r5.ebuild28
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch11
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch12
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch24
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch27
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch11
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch390
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch46
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch26
-rw-r--r--app-admin/cronolog/files/cronolog-1.6.2-umask.patch86
-rw-r--r--app-admin/cronolog/metadata.xml16
-rw-r--r--app-admin/denyhosts/Manifest13
-rw-r--r--app-admin/denyhosts/denyhosts-2.9.ebuild72
-rw-r--r--app-admin/denyhosts/denyhosts-3.0-r1.ebuild66
-rw-r--r--app-admin/denyhosts/denyhosts-3.0.ebuild63
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-hostname.patch21
-rw-r--r--app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch51
-rw-r--r--app-admin/denyhosts/files/denyhosts.init-r227
-rw-r--r--app-admin/denyhosts/files/denyhosts.logrotate-r210
-rw-r--r--app-admin/denyhosts/files/denyhosts.service12
-rw-r--r--app-admin/denyhosts/metadata.xml12
-rw-r--r--app-admin/diamond/Manifest11
-rw-r--r--app-admin/diamond/diamond-4.0-r1.ebuild74
-rw-r--r--app-admin/diamond/diamond-4.0.515.ebuild70
-rw-r--r--app-admin/diamond/diamond-9999.ebuild64
-rw-r--r--app-admin/diamond/files/diamond-4.0-psutil.patch48
-rw-r--r--app-admin/diamond/files/diamond.confd2
-rw-r--r--app-admin/diamond/files/diamond.initd19
-rw-r--r--app-admin/diamond/metadata.xml22
-rw-r--r--app-admin/dio/Manifest5
-rw-r--r--app-admin/dio/dio-1.5.2.ebuild28
-rw-r--r--app-admin/dio/metadata.xml16
-rw-r--r--app-admin/diradm/Manifest5
-rw-r--r--app-admin/diradm/diradm-2.9.7.1.ebuild75
-rw-r--r--app-admin/diradm/metadata.xml12
-rw-r--r--app-admin/doas/Manifest4
-rw-r--r--app-admin/doas/doas-6.0.ebuild39
-rw-r--r--app-admin/doas/metadata.xml15
-rw-r--r--app-admin/drush/Manifest7
-rw-r--r--app-admin/drush/drush-6.7.0-r1.ebuild65
-rw-r--r--app-admin/drush/drush-6.7.0.ebuild63
-rw-r--r--app-admin/drush/files/update-bash-completion-script-for-2.1.patch39
-rw-r--r--app-admin/drush/metadata.xml14
-rw-r--r--app-admin/durep/Manifest8
-rw-r--r--app-admin/durep/durep-0.9-r4.ebuild33
-rw-r--r--app-admin/durep/files/durep-0.9-dirhandle.patch31
-rw-r--r--app-admin/durep/files/durep-0.9-gigabyte.patch17
-rw-r--r--app-admin/durep/files/durep-0.9-r4-color-output.patch98
-rw-r--r--app-admin/durep/metadata.xml6
-rw-r--r--app-admin/ec2-ami-tools/Manifest5
-rw-r--r--app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild51
-rw-r--r--app-admin/ec2-ami-tools/metadata.xml8
-rw-r--r--app-admin/eclean-kernel/Manifest12
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild18
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild18
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.ebuild18
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild13
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-9999.ebuild21
-rw-r--r--app-admin/eclean-kernel/metadata.xml17
-rw-r--r--app-admin/elektra/Manifest10
-rw-r--r--app-admin/elektra/elektra-0.8.15.ebuild121
-rw-r--r--app-admin/elektra/elektra-0.8.16.ebuild121
-rw-r--r--app-admin/elektra/elektra-9999.ebuild118
-rw-r--r--app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch15
-rw-r--r--app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch20
-rw-r--r--app-admin/elektra/metadata.xml15
-rw-r--r--app-admin/emacs-updater/Manifest5
-rw-r--r--app-admin/emacs-updater/emacs-updater-1.15.ebuild37
-rw-r--r--app-admin/emacs-updater/metadata.xml8
-rw-r--r--app-admin/entr/Manifest8
-rw-r--r--app-admin/entr/entr-3.7.ebuild23
-rw-r--r--app-admin/entr/entr-3.8.ebuild23
-rw-r--r--app-admin/entr/entr-3.9.ebuild23
-rw-r--r--app-admin/entr/metadata.xml12
-rw-r--r--app-admin/equo/Manifest5
-rw-r--r--app-admin/equo/equo-302.ebuild41
-rw-r--r--app-admin/equo/metadata.xml14
-rw-r--r--app-admin/eselect/Manifest8
-rw-r--r--app-admin/eselect/eselect-1.4.8.ebuild61
-rw-r--r--app-admin/eselect/eselect-1.4.9.ebuild61
-rw-r--r--app-admin/eselect/eselect-9999.ebuild62
-rw-r--r--app-admin/eselect/metadata.xml8
-rw-r--r--app-admin/evtxtools/Manifest5
-rw-r--r--app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild32
-rw-r--r--app-admin/evtxtools/metadata.xml8
-rw-r--r--app-admin/fam/Manifest9
-rw-r--r--app-admin/fam/fam-2.7.0-r7.ebuild54
-rw-r--r--app-admin/fam/files/fam-2.7.0-out-of-tree.patch13
-rw-r--r--app-admin/fam/files/fam-2.7.0-sysmacros.patch15
-rw-r--r--app-admin/fam/files/famd26
-rw-r--r--app-admin/fam/metadata.xml8
-rw-r--r--app-admin/fetchlog/Manifest7
-rw-r--r--app-admin/fetchlog/fetchlog-1.0.ebuild39
-rw-r--r--app-admin/fetchlog/fetchlog-1.4-r1.ebuild42
-rw-r--r--app-admin/fetchlog/metadata.xml8
-rw-r--r--app-admin/fifo-cronolog/Manifest5
-rw-r--r--app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild31
-rw-r--r--app-admin/fifo-cronolog/metadata.xml14
-rw-r--r--app-admin/filebeat/Manifest8
-rw-r--r--app-admin/filebeat/filebeat-5.5.2.ebuild69
-rw-r--r--app-admin/filebeat/filebeat-5.6.2.ebuild69
-rw-r--r--app-admin/filebeat/files/filebeat.confd15
-rw-r--r--app-admin/filebeat/files/filebeat.initd43
-rw-r--r--app-admin/filebeat/metadata.xml15
-rw-r--r--app-admin/filewatcher/Manifest6
-rw-r--r--app-admin/filewatcher/files/filewatcher.conf24
-rw-r--r--app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild38
-rw-r--r--app-admin/filewatcher/metadata.xml8
-rw-r--r--app-admin/fleet/Manifest12
-rw-r--r--app-admin/fleet/files/fleet.service14
-rw-r--r--app-admin/fleet/files/fleet.socket2
-rw-r--r--app-admin/fleet/fleet-0.11.5.ebuild46
-rw-r--r--app-admin/fleet/fleet-0.11.8.ebuild46
-rw-r--r--app-admin/fleet/fleet-1.0.0.ebuild46
-rw-r--r--app-admin/fleet/fleet-9999.ebuild44
-rw-r--r--app-admin/fleet/metadata.xml8
-rw-r--r--app-admin/fsvs/Manifest7
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch31
-rw-r--r--app-admin/fsvs/fsvs-1.2.5-r1.ebuild55
-rw-r--r--app-admin/fsvs/fsvs-1.2.5-r2.ebuild60
-rw-r--r--app-admin/fsvs/metadata.xml5
-rw-r--r--app-admin/gam-server/Manifest12
-rw-r--r--app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch67
-rw-r--r--app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch47
-rw-r--r--app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch38
-rw-r--r--app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch65
-rw-r--r--app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch76
-rw-r--r--app-admin/gam-server/gam-server-0.1.10-r2.ebuild88
-rw-r--r--app-admin/gam-server/metadata.xml7
-rw-r--r--app-admin/gamin/Manifest4
-rw-r--r--app-admin/gamin/gamin-0.1.10-r1.ebuild21
-rw-r--r--app-admin/gamin/metadata.xml7
-rw-r--r--app-admin/genromfs/Manifest6
-rw-r--r--app-admin/genromfs/files/genromfs-0.5.2-build.patch28
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild26
-rw-r--r--app-admin/genromfs/metadata.xml10
-rw-r--r--app-admin/gentoo-perl-helpers/Manifest9
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild47
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild53
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild53
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild54
-rw-r--r--app-admin/gentoo-perl-helpers/metadata.xml15
-rw-r--r--app-admin/gentoo-rsync-mirror/Manifest9
-rw-r--r--app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf9
-rw-r--r--app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh11
-rw-r--r--app-admin/gentoo-rsync-mirror/files/rsyncd.conf25
-rw-r--r--app-admin/gentoo-rsync-mirror/files/rsyncd.motd1
-rw-r--r--app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl128
-rw-r--r--app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild53
-rw-r--r--app-admin/gentoo-rsync-mirror/metadata.xml13
-rw-r--r--app-admin/github-backup-utils/Manifest23
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild48
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild48
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild47
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild47
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild47
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild47
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild48
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild47
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild48
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild48
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild48
-rw-r--r--app-admin/github-backup-utils/metadata.xml18
-rw-r--r--app-admin/gixy/Manifest3
-rw-r--r--app-admin/gixy/gixy-0.1.5.ebuild31
-rw-r--r--app-admin/gixy/metadata.xml8
-rw-r--r--app-admin/gkrellm/Manifest22
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch10
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch30
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch24
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-config.patch43
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch32
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch12
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch17
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.5-width.patch11
-rw-r--r--app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch11
-rw-r--r--app-admin/gkrellm/files/gkrellmd21
-rw-r--r--app-admin/gkrellm/files/gkrellmd.conf8
-rw-r--r--app-admin/gkrellm/files/gkrellmd.initd15
-rw-r--r--app-admin/gkrellm/files/gkrellmd.service10
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild144
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild128
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.7.ebuild144
-rw-r--r--app-admin/gkrellm/metadata.xml22
-rw-r--r--app-admin/glance/Manifest16
-rw-r--r--app-admin/glance/files/glance.initd21
-rw-r--r--app-admin/glance/files/glance.initd-215
-rw-r--r--app-admin/glance/files/glance.initd-r217
-rw-r--r--app-admin/glance/glance-13.0.0.ebuild140
-rw-r--r--app-admin/glance/glance-14.0.0-r1.ebuild135
-rw-r--r--app-admin/glance/glance-14.0.0.ebuild135
-rw-r--r--app-admin/glance/glance-15.0.0.ebuild143
-rw-r--r--app-admin/glance/glance-2016.2.9999.ebuild139
-rw-r--r--app-admin/glance/glance-2017.1.9999.ebuild136
-rw-r--r--app-admin/glance/glance-2017.2.9999.ebuild144
-rw-r--r--app-admin/glance/metadata.xml23
-rw-r--r--app-admin/gnome-system-log/Manifest5
-rw-r--r--app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild38
-rw-r--r--app-admin/gnome-system-log/metadata.xml8
-rw-r--r--app-admin/graylog2/Manifest12
-rw-r--r--app-admin/graylog2/files/confd7
-rw-r--r--app-admin/graylog2/files/confd-r19
-rw-r--r--app-admin/graylog2/files/initd54
-rw-r--r--app-admin/graylog2/files/initd-r155
-rw-r--r--app-admin/graylog2/graylog2-2.1.2.ebuild67
-rw-r--r--app-admin/graylog2/graylog2-2.2.2.ebuild87
-rw-r--r--app-admin/graylog2/graylog2-2.2.3.ebuild87
-rw-r--r--app-admin/graylog2/metadata.xml8
-rw-r--r--app-admin/grubconfig/Manifest5
-rw-r--r--app-admin/grubconfig/grubconfig-1.28-r2.ebuild27
-rw-r--r--app-admin/grubconfig/metadata.xml8
-rw-r--r--app-admin/gtkdiskfree/Manifest8
-rw-r--r--app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch19
-rw-r--r--app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild45
-rw-r--r--app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild28
-rw-r--r--app-admin/gtkdiskfree/metadata.xml22
-rw-r--r--app-admin/hardening-check/Manifest9
-rw-r--r--app-admin/hardening-check/hardening-check-2.5.ebuild26
-rw-r--r--app-admin/hardening-check/hardening-check-2.6.ebuild27
-rw-r--r--app-admin/hardening-check/hardening-check-2.7.ebuild29
-rw-r--r--app-admin/hardening-check/metadata.xml13
-rw-r--r--app-admin/hardinfo/Manifest5
-rw-r--r--app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild23
-rw-r--r--app-admin/hardinfo/metadata.xml5
-rw-r--r--app-admin/haskell-updater/Manifest7
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.10.ebuild45
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.9.ebuild45
-rw-r--r--app-admin/haskell-updater/metadata.xml8
-rw-r--r--app-admin/hddtemp/Manifest20
-rw-r--r--app-admin/hddtemp/files/hddgentoo.db253
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch28
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch20
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch21
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch28
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch14
-rw-r--r--app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch26
-rw-r--r--app-admin/hddtemp/files/hddtemp-conf.d12
-rw-r--r--app-admin/hddtemp/files/hddtemp-init22
-rw-r--r--app-admin/hddtemp/files/hddtemp.service11
-rw-r--r--app-admin/hddtemp/files/hddtemp.service-r110
-rw-r--r--app-admin/hddtemp/files/hddtemp.service.conf3
-rw-r--r--app-admin/hddtemp/files/update-hddtemp.db33
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild114
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild96
-rw-r--r--app-admin/hddtemp/metadata.xml10
-rw-r--r--app-admin/ide-smart/Manifest6
-rw-r--r--app-admin/ide-smart/ide-smart-1.4-r1.ebuild23
-rw-r--r--app-admin/ide-smart/ide-smart-1.4-r2.ebuild25
-rw-r--r--app-admin/ide-smart/metadata.xml5
-rw-r--r--app-admin/integrit/Manifest7
-rw-r--r--app-admin/integrit/integrit-4.0.ebuild65
-rw-r--r--app-admin/integrit/integrit-4.1-r1.ebuild65
-rw-r--r--app-admin/integrit/metadata.xml8
-rw-r--r--app-admin/jinit/Manifest6
-rw-r--r--app-admin/jinit/files/jinit-0.1.12-gcc43.patch10
-rw-r--r--app-admin/jinit/jinit-0.1.12-r1.ebuild33
-rw-r--r--app-admin/jinit/metadata.xml5
-rw-r--r--app-admin/keepass/Manifest7
-rw-r--r--app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch43
-rw-r--r--app-admin/keepass/files/keepass.xml9
-rw-r--r--app-admin/keepass/keepass-2.36.ebuild111
-rw-r--r--app-admin/keepass/metadata.xml23
-rw-r--r--app-admin/keepassx/Manifest10
-rw-r--r--app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch11
-rw-r--r--app-admin/keepassx/keepassx-0.4.4.ebuild42
-rw-r--r--app-admin/keepassx/keepassx-2.0.2-r1.ebuild54
-rw-r--r--app-admin/keepassx/keepassx-2.0.3.ebuild54
-rw-r--r--app-admin/keepassx/metadata.xml17
-rw-r--r--app-admin/keepassxc/Manifest8
-rw-r--r--app-admin/keepassxc/keepassxc-2.1.4.ebuild63
-rw-r--r--app-admin/keepassxc/keepassxc-2.2.0.ebuild65
-rw-r--r--app-admin/keepassxc/keepassxc-2.2.1.ebuild65
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild65
-rw-r--r--app-admin/keepassxc/metadata.xml21
-rw-r--r--app-admin/killproc/Manifest7
-rw-r--r--app-admin/killproc/files/killproc-2.13-argz.patch10
-rw-r--r--app-admin/killproc/files/killproc-2.13-makefile.patch42
-rw-r--r--app-admin/killproc/killproc-2.13-r1.ebuild30
-rw-r--r--app-admin/killproc/metadata.xml7
-rw-r--r--app-admin/kpcli/Manifest7
-rw-r--r--app-admin/kpcli/kpcli-3.0.ebuild43
-rw-r--r--app-admin/kpcli/kpcli-3.1.ebuild47
-rw-r--r--app-admin/kpcli/metadata.xml11
-rw-r--r--app-admin/lastpass-binary-component/Manifest4
-rw-r--r--app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild73
-rw-r--r--app-admin/lastpass-binary-component/metadata.xml20
-rw-r--r--app-admin/lastpass-cli/Manifest9
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild43
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild44
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild57
-rw-r--r--app-admin/lastpass-cli/metadata.xml20
-rw-r--r--app-admin/lib_users/Manifest5
-rw-r--r--app-admin/lib_users/lib_users-0.10.ebuild44
-rw-r--r--app-admin/lib_users/metadata.xml15
-rw-r--r--app-admin/lnav/Manifest7
-rw-r--r--app-admin/lnav/lnav-0.8.1.ebuild37
-rw-r--r--app-admin/lnav/lnav-0.8.2.ebuild33
-rw-r--r--app-admin/lnav/metadata.xml11
-rw-r--r--app-admin/localepurge/Manifest9
-rw-r--r--app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch20
-rw-r--r--app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch11
-rw-r--r--app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch18
-rw-r--r--app-admin/localepurge/files/localepurge-0.5.4-prefix.patch58
-rw-r--r--app-admin/localepurge/localepurge-0.5.4-r2.ebuild42
-rw-r--r--app-admin/localepurge/metadata.xml7
-rw-r--r--app-admin/logcheck/Manifest10
-rw-r--r--app-admin/logcheck/files/logcheck.cron10
-rw-r--r--app-admin/logcheck/logcheck-1.3.15-r2.ebuild51
-rw-r--r--app-admin/logcheck/logcheck-1.3.17.ebuild51
-rw-r--r--app-admin/logcheck/logcheck-1.3.18.ebuild51
-rw-r--r--app-admin/logcheck/metadata.xml5
-rw-r--r--app-admin/logmon/Manifest9
-rw-r--r--app-admin/logmon/files/logmon-0.4.4-char2int.diff11
-rw-r--r--app-admin/logmon/files/logmon-0.4.4-gcc43.patch14
-rw-r--r--app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch15
-rw-r--r--app-admin/logmon/files/logmon-0.4.4-tinfo.patch10
-rw-r--r--app-admin/logmon/logmon-0.4.4-r1.ebuild41
-rw-r--r--app-admin/logmon/metadata.xml11
-rw-r--r--app-admin/logrotate/Manifest29
-rw-r--r--app-admin/logrotate/files/logrotate-3.11.0-Werror.patch12
-rw-r--r--app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch57
-rw-r--r--app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch14
-rw-r--r--app-admin/logrotate/files/logrotate-3.11.0-lfs.patch11
-rw-r--r--app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch55
-rw-r--r--app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch36
-rw-r--r--app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch14
-rw-r--r--app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch36
-rw-r--r--app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch14
-rw-r--r--app-admin/logrotate/files/logrotate-3.9.1-Werror.patch12
-rw-r--r--app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch43
-rw-r--r--app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch57
-rw-r--r--app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch15
-rw-r--r--app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch55
-rw-r--r--app-admin/logrotate/files/logrotate.conf42
-rw-r--r--app-admin/logrotate/files/logrotate.tmpfiles1
-rw-r--r--app-admin/logrotate/logrotate-3.11.0.ebuild88
-rw-r--r--app-admin/logrotate/logrotate-3.12.2.ebuild83
-rw-r--r--app-admin/logrotate/logrotate-3.12.3-r1.ebuild99
-rw-r--r--app-admin/logrotate/logrotate-3.12.3-r2.ebuild99
-rw-r--r--app-admin/logrotate/logrotate-3.12.3.ebuild98
-rw-r--r--app-admin/logrotate/logrotate-3.9.1.ebuild81
-rw-r--r--app-admin/logrotate/metadata.xml29
-rw-r--r--app-admin/logsentry/Manifest6
-rw-r--r--app-admin/logsentry/logsentry-1.1.1-r2.ebuild69
-rw-r--r--app-admin/logsentry/logsentry-1.1.1.ebuild65
-rw-r--r--app-admin/logsentry/metadata.xml8
-rw-r--r--app-admin/logstalgia/Manifest5
-rw-r--r--app-admin/logstalgia/logstalgia-1.0.7.ebuild27
-rw-r--r--app-admin/logstalgia/metadata.xml12
-rw-r--r--app-admin/logstash-bin/Manifest14
-rw-r--r--app-admin/logstash-bin/files/agent.conf.sample29
-rw-r--r--app-admin/logstash-bin/files/logstash-plugin.eselect85
-rw-r--r--app-admin/logstash-bin/files/logstash.confd37
-rw-r--r--app-admin/logstash-bin/files/logstash.confd-r140
-rw-r--r--app-admin/logstash-bin/files/logstash.initd74
-rw-r--r--app-admin/logstash-bin/files/logstash.initd-r175
-rw-r--r--app-admin/logstash-bin/files/logstash.logrotate6
-rw-r--r--app-admin/logstash-bin/logstash-bin-5.5.3.ebuild75
-rw-r--r--app-admin/logstash-bin/logstash-bin-5.6.2.ebuild77
-rw-r--r--app-admin/logstash-bin/metadata.xml19
-rw-r--r--app-admin/logsurfer+/Manifest8
-rw-r--r--app-admin/logsurfer+/files/logsurfer-1.8.initd50
-rw-r--r--app-admin/logsurfer+/files/logsurfer-1.8.initd-r132
-rw-r--r--app-admin/logsurfer+/files/logsurfer.confd4
-rw-r--r--app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild40
-rw-r--r--app-admin/logsurfer+/metadata.xml5
-rw-r--r--app-admin/longrun/Manifest8
-rw-r--r--app-admin/longrun/files/0.9-makefile_cflags.patch14
-rw-r--r--app-admin/longrun/files/0.9-replace-loff_t.patch35
-rw-r--r--app-admin/longrun/longrun-0.9-r4.ebuild74
-rw-r--r--app-admin/longrun/metadata.xml13
-rw-r--r--app-admin/lsat/Manifest8
-rw-r--r--app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch42
-rw-r--r--app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch45
-rw-r--r--app-admin/lsat/lsat-0.9.7.1-r1.ebuild47
-rw-r--r--app-admin/lsat/lsat-0.9.7.1-r2.ebuild54
-rw-r--r--app-admin/lsat/metadata.xml15
-rw-r--r--app-admin/lsyncd/Manifest10
-rw-r--r--app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch8
-rw-r--r--app-admin/lsyncd/lsyncd-2.2.0.ebuild28
-rw-r--r--app-admin/lsyncd/lsyncd-2.2.1.ebuild28
-rw-r--r--app-admin/lsyncd/lsyncd-2.2.2.ebuild28
-rw-r--r--app-admin/lsyncd/metadata.xml12
-rw-r--r--app-admin/makepasswd/Manifest5
-rw-r--r--app-admin/makepasswd/makepasswd-1.10.ebuild19
-rw-r--r--app-admin/makepasswd/metadata.xml11
-rw-r--r--app-admin/matter/Manifest5
-rw-r--r--app-admin/matter/matter-302.ebuild36
-rw-r--r--app-admin/matter/metadata.xml17
-rw-r--r--app-admin/mcelog/Manifest13
-rw-r--r--app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch8
-rw-r--r--app-admin/mcelog/files/mcelog-129-debugflags.patch22
-rw-r--r--app-admin/mcelog/files/mcelog.init-r115
-rw-r--r--app-admin/mcelog/files/mcelog.service10
-rw-r--r--app-admin/mcelog/mcelog-149.ebuild52
-rw-r--r--app-admin/mcelog/mcelog-152.ebuild52
-rw-r--r--app-admin/mcelog/mcelog-153.ebuild58
-rw-r--r--app-admin/mcelog/metadata.xml25
-rw-r--r--app-admin/mcollective/Manifest10
-rw-r--r--app-admin/mcollective/files/mcollectived.initd28
-rw-r--r--app-admin/mcollective/mcollective-2.11.1.ebuild60
-rw-r--r--app-admin/mcollective/mcollective-2.11.2.ebuild60
-rw-r--r--app-admin/mcollective/mcollective-2.11.3.ebuild60
-rw-r--r--app-admin/mcollective/metadata.xml17
-rw-r--r--app-admin/mei-amt-check/Manifest3
-rw-r--r--app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild33
-rw-r--r--app-admin/mei-amt-check/metadata.xml8
-rw-r--r--app-admin/metadata.xml38
-rw-r--r--app-admin/metalog/Manifest11
-rw-r--r--app-admin/metalog/files/consolelog.sh20
-rw-r--r--app-admin/metalog/files/metalog-0.9-metalog-conf.patch11
-rw-r--r--app-admin/metalog/files/metalog.confd18
-rw-r--r--app-admin/metalog/files/metalog.initd41
-rw-r--r--app-admin/metalog/files/metalog.service-r110
-rw-r--r--app-admin/metalog/metadata.xml14
-rw-r--r--app-admin/metalog/metalog-3-r1.ebuild58
-rw-r--r--app-admin/metalog/metalog-3-r2.ebuild56
-rw-r--r--app-admin/mktwpol/Manifest7
-rw-r--r--app-admin/mktwpol/metadata.xml41
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.6.ebuild42
-rw-r--r--app-admin/mktwpol/mktwpol-1.0.0.ebuild42
-rw-r--r--app-admin/mms-agent/Manifest9
-rw-r--r--app-admin/mms-agent/files/mms-monitoring-agent.initd24
-rw-r--r--app-admin/mms-agent/metadata.xml14
-rw-r--r--app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild70
-rw-r--r--app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild59
-rw-r--r--app-admin/mongo-tools/Manifest25
-rw-r--r--app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch10
-rw-r--r--app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch9
-rw-r--r--app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch12
-rw-r--r--app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch9
-rw-r--r--app-admin/mongo-tools/metadata.xml14
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.14.ebuild56
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.15.ebuild56
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.12.ebuild58
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.13.ebuild58
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.16.ebuild58
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.3.ebuild61
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.4.ebuild61
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.6.ebuild61
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.7.ebuild66
-rw-r--r--app-admin/monit/Manifest12
-rw-r--r--app-admin/monit/files/monit.initd-5.0-r140
-rw-r--r--app-admin/monit/files/monit.pamd4
-rw-r--r--app-admin/monit/files/monit.service11
-rw-r--r--app-admin/monit/metadata.xml8
-rw-r--r--app-admin/monit/monit-5.20.0.ebuild51
-rw-r--r--app-admin/monit/monit-5.23.0.ebuild51
-rw-r--r--app-admin/monit/monit-5.24.0.ebuild51
-rw-r--r--app-admin/mtail/Manifest20
-rw-r--r--app-admin/mtail/metadata.xml10
-rw-r--r--app-admin/mtail/mtail-0_pre20161108.ebuild94
-rw-r--r--app-admin/mtail/mtail-3.0.0_rc2.ebuild47
-rw-r--r--app-admin/multilog-watch/Manifest6
-rw-r--r--app-admin/multilog-watch/metadata.xml11
-rw-r--r--app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild40
-rw-r--r--app-admin/needrestart/Manifest12
-rw-r--r--app-admin/needrestart/files/needrestart-parallelmake.patch17
-rw-r--r--app-admin/needrestart/metadata.xml14
-rw-r--r--app-admin/needrestart/needrestart-2.10.ebuild40
-rw-r--r--app-admin/needrestart/needrestart-2.11.ebuild40
-rw-r--r--app-admin/needrestart/needrestart-2.8-r1.ebuild43
-rw-r--r--app-admin/needrestart/needrestart-2.9-r1.ebuild40
-rw-r--r--app-admin/needrestart/needrestart-9999.ebuild40
-rw-r--r--app-admin/newsyslog/Manifest6
-rw-r--r--app-admin/newsyslog/files/newsyslog-html.patch21
-rw-r--r--app-admin/newsyslog/metadata.xml5
-rw-r--r--app-admin/newsyslog/newsyslog-1.1-r1.ebuild42
-rw-r--r--app-admin/ngxtop/Manifest8
-rw-r--r--app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch45
-rw-r--r--app-admin/ngxtop/metadata.xml8
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild27
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild28
-rw-r--r--app-admin/openrc-settingsd/Manifest5
-rw-r--r--app-admin/openrc-settingsd/metadata.xml16
-rw-r--r--app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild49
-rw-r--r--app-admin/packagekit-base/Manifest16
-rw-r--r--app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch26
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch12
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch13
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch15
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-elogind-support.patch184
-rw-r--r--app-admin/packagekit-base/metadata.xml24
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.0.11.ebuild111
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.1.ebuild113
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.4.ebuild116
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild129
-rw-r--r--app-admin/packagekit-gtk/Manifest11
-rw-r--r--app-admin/packagekit-gtk/metadata.xml18
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild61
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild60
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild60
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild60
-rw-r--r--app-admin/packagekit-qt/Manifest4
-rw-r--r--app-admin/packagekit-qt/metadata.xml18
-rw-r--r--app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild31
-rw-r--r--app-admin/packagekit/Manifest7
-rw-r--r--app-admin/packagekit/metadata.xml18
-rw-r--r--app-admin/packagekit/packagekit-1.0.11-r1.ebuild18
-rw-r--r--app-admin/packagekit/packagekit-1.1.1.ebuild18
-rw-r--r--app-admin/packagekit/packagekit-1.1.4.ebuild18
-rw-r--r--app-admin/packagekit/packagekit-1.1.5.ebuild18
-rw-r--r--app-admin/pass/Manifest7
-rw-r--r--app-admin/pass/files/50pass-gentoo.el9
-rw-r--r--app-admin/pass/metadata.xml28
-rw-r--r--app-admin/pass/pass-1.7.1.ebuild76
-rw-r--r--app-admin/pass/pass-9999.ebuild76
-rw-r--r--app-admin/passook/Manifest6
-rw-r--r--app-admin/passook/files/passook.patch26
-rw-r--r--app-admin/passook/metadata.xml10
-rw-r--r--app-admin/passook/passook-20121001.ebuild30
-rw-r--r--app-admin/passwordsafe/Manifest4
-rw-r--r--app-admin/passwordsafe/metadata.xml20
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild89
-rw-r--r--app-admin/paxtest/Manifest6
-rw-r--r--app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch21
-rw-r--r--app-admin/paxtest/metadata.xml28
-rw-r--r--app-admin/paxtest/paxtest-0.9.15-r1.ebuild41
-rw-r--r--app-admin/perl-cleaner/Manifest15
-rw-r--r--app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch111
-rw-r--r--app-admin/perl-cleaner/metadata.xml12
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.20.ebuild46
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.23.ebuild42
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.24.ebuild42
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.25.ebuild42
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.26.ebuild42
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-9999.ebuild42
-rw-r--r--app-admin/petrovich/Manifest8
-rw-r--r--app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff32
-rw-r--r--app-admin/petrovich/files/petrovich.conf6
-rw-r--r--app-admin/petrovich/metadata.xml8
-rw-r--r--app-admin/petrovich/petrovich-1.0.0-r1.ebuild30
-rw-r--r--app-admin/petrovich/petrovich-1.0.0.ebuild32
-rw-r--r--app-admin/pprocm/Manifest5
-rw-r--r--app-admin/pprocm/metadata.xml5
-rw-r--r--app-admin/pprocm/pprocm-1.0-r2.ebuild33
-rw-r--r--app-admin/prelude-manager/Manifest15
-rw-r--r--app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch11
-rw-r--r--app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch57
-rw-r--r--app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch13
-rw-r--r--app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch13
-rw-r--r--app-admin/prelude-manager/files/prelude-manager.initd25
-rw-r--r--app-admin/prelude-manager/files/prelude-manager.run4
-rw-r--r--app-admin/prelude-manager/files/prelude-manager.service14
-rw-r--r--app-admin/prelude-manager/metadata.xml28
-rw-r--r--app-admin/prelude-manager/prelude-manager-3.0.0.ebuild62
-rw-r--r--app-admin/prelude-manager/prelude-manager-3.1.0.ebuild58
-rw-r--r--app-admin/prelude-manager/prelude-manager-4.0.0.ebuild58
-rw-r--r--app-admin/procinfo-ng/Manifest7
-rw-r--r--app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch11
-rw-r--r--app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch11
-rw-r--r--app-admin/procinfo-ng/metadata.xml11
-rw-r--r--app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild40
-rw-r--r--app-admin/procinfo/Manifest9
-rw-r--r--app-admin/procinfo/files/cpu-usage-fix.patch31
-rw-r--r--app-admin/procinfo/files/kernel-2.6.patch296
-rw-r--r--app-admin/procinfo/files/procinfo-18-stat.patch21
-rw-r--r--app-admin/procinfo/files/procinfo-flags.patch16
-rw-r--r--app-admin/procinfo/metadata.xml5
-rw-r--r--app-admin/procinfo/procinfo-18-r2.ebuild38
-rw-r--r--app-admin/profile-cleaner/Manifest3
-rw-r--r--app-admin/profile-cleaner/metadata.xml16
-rw-r--r--app-admin/profile-cleaner/profile-cleaner-2.36.ebuild21
-rw-r--r--app-admin/psmon/Manifest5
-rw-r--r--app-admin/psmon/metadata.xml10
-rw-r--r--app-admin/psmon/psmon-1.39-r1.ebuild31
-rw-r--r--app-admin/puppet-agent/Manifest15
-rw-r--r--app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch329
-rw-r--r--app-admin/puppet-agent/files/mcollective.initd18
-rw-r--r--app-admin/puppet-agent/files/mcollective.service14
-rw-r--r--app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd1
-rw-r--r--app-admin/puppet-agent/files/puppet.initd29
-rw-r--r--app-admin/puppet-agent/files/puppet.service14
-rw-r--r--app-admin/puppet-agent/metadata.xml15
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.10.7.ebuild111
-rw-r--r--app-admin/puppet-agent/puppet-agent-5.1.0-r1.ebuild104
-rw-r--r--app-admin/puppet-lint/Manifest13
-rw-r--r--app-admin/puppet-lint/metadata.xml13
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.0.2.ebuild24
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.2.1.ebuild25
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.3.0.ebuild25
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.3.2.ebuild29
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.3.3.ebuild29
-rw-r--r--app-admin/puppet/Manifest29
-rw-r--r--app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch329
-rw-r--r--app-admin/puppet/files/50puppet-mode-gentoo.el6
-rw-r--r--app-admin/puppet/files/puppet-fix-tests-4.7.0.patch18
-rw-r--r--app-admin/puppet/files/puppet-systemd.patch10
-rw-r--r--app-admin/puppet/files/puppet.init40
-rw-r--r--app-admin/puppet/files/puppet.init-4.x29
-rw-r--r--app-admin/puppet/files/puppet.init-r124
-rw-r--r--app-admin/puppet/files/puppetmaster.confd18
-rw-r--r--app-admin/puppet/files/puppetmaster.init37
-rw-r--r--app-admin/puppet/files/puppetmaster.init-4.x37
-rw-r--r--app-admin/puppet/files/puppetmaster.init-r130
-rw-r--r--app-admin/puppet/files/tmpfiles.d1
-rw-r--r--app-admin/puppet/metadata.xml36
-rw-r--r--app-admin/puppet/puppet-3.8.7-r1.ebuild196
-rw-r--r--app-admin/puppet/puppet-4.10.1.ebuild184
-rw-r--r--app-admin/puppet/puppet-4.10.6-r1.ebuild194
-rw-r--r--app-admin/puppet/puppet-4.10.6.ebuild192
-rw-r--r--app-admin/puppet/puppet-4.10.8.ebuild194
-rw-r--r--app-admin/puppet/puppet-4.8.1.ebuild177
-rw-r--r--app-admin/puppet/puppet-5.1.0-r1.ebuild144
-rw-r--r--app-admin/puppet/puppet-5.1.0.ebuild144
-rw-r--r--app-admin/puppetdb/Manifest8
-rw-r--r--app-admin/puppetdb/files/puppetdb.initd64
-rw-r--r--app-admin/puppetdb/metadata.xml11
-rw-r--r--app-admin/puppetdb/puppetdb-4.4.0.ebuild94
-rw-r--r--app-admin/puppetdb/puppetdb-5.0.1.ebuild92
-rw-r--r--app-admin/puppetserver/Manifest10
-rw-r--r--app-admin/puppetserver/files/puppetserver.init72
-rw-r--r--app-admin/puppetserver/files/puppetserver.initd71
-rw-r--r--app-admin/puppetserver/metadata.xml14
-rw-r--r--app-admin/puppetserver/puppetserver-2.8.0.ebuild113
-rw-r--r--app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild129
-rw-r--r--app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild130
-rw-r--r--app-admin/pwcrypt/Manifest6
-rw-r--r--app-admin/pwcrypt/metadata.xml7
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild27
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2.ebuild24
-rw-r--r--app-admin/pwgen/Manifest9
-rw-r--r--app-admin/pwgen/files/2.06-special-char.patch11
-rw-r--r--app-admin/pwgen/files/pwgen.rc18
-rw-r--r--app-admin/pwgen/metadata.xml27
-rw-r--r--app-admin/pwgen/pwgen-2.07.ebuild28
-rw-r--r--app-admin/pwgen/pwgen-2.08.ebuild23
-rw-r--r--app-admin/pydf/Manifest5
-rw-r--r--app-admin/pydf/metadata.xml8
-rw-r--r--app-admin/pydf/pydf-12-r1.ebuild36
-rw-r--r--app-admin/python-updater/Manifest6
-rw-r--r--app-admin/python-updater/metadata.xml8
-rw-r--r--app-admin/python-updater/python-updater-0.14.ebuild37
-rw-r--r--app-admin/python-updater/python-updater-9999.ebuild37
-rw-r--r--app-admin/qpage/Manifest8
-rw-r--r--app-admin/qpage/files/qpage28
-rw-r--r--app-admin/qpage/files/qpage-3.3-fix-warning.patch12
-rw-r--r--app-admin/qpage/files/qpage-3.3-gentoo.patch72
-rw-r--r--app-admin/qpage/metadata.xml15
-rw-r--r--app-admin/qpage/qpage-3.3.ebuild69
-rw-r--r--app-admin/qtpass/Manifest5
-rw-r--r--app-admin/qtpass/metadata.xml18
-rw-r--r--app-admin/qtpass/qtpass-1.1.6.ebuild43
-rw-r--r--app-admin/qtpass/qtpass-9999.ebuild40
-rw-r--r--app-admin/quickswitch/Manifest5
-rw-r--r--app-admin/quickswitch/metadata.xml10
-rw-r--r--app-admin/quickswitch/quickswitch-1.05.ebuild38
-rw-r--r--app-admin/r10k/Manifest7
-rw-r--r--app-admin/r10k/metadata.xml18
-rw-r--r--app-admin/r10k/r10k-1.5.1-r1.ebuild67
-rw-r--r--app-admin/r10k/r10k-1.5.1-r2.ebuild68
-rw-r--r--app-admin/r10k/r10k-1.5.1.ebuild62
-rw-r--r--app-admin/radmind/Manifest8
-rw-r--r--app-admin/radmind/files/radmind-1.14.0-parallel-make.patch50
-rw-r--r--app-admin/radmind/files/radmind-1.7.0-gentoo.patch29
-rw-r--r--app-admin/radmind/files/radmind-1.7.1-dnssd.patch22
-rw-r--r--app-admin/radmind/metadata.xml10
-rw-r--r--app-admin/radmind/radmind-1.14.1-r1.ebuild32
-rw-r--r--app-admin/ranpwd/Manifest5
-rw-r--r--app-admin/ranpwd/metadata.xml8
-rw-r--r--app-admin/ranpwd/ranpwd-1.2.ebuild28
-rw-r--r--app-admin/rcm/Manifest3
-rw-r--r--app-admin/rcm/metadata.xml19
-rw-r--r--app-admin/rcm/rcm-1.3.1.ebuild19
-rw-r--r--app-admin/recursos/Manifest5
-rw-r--r--app-admin/recursos/metadata.xml9
-rw-r--r--app-admin/recursos/recursos-2.0-r1.ebuild57
-rw-r--r--app-admin/reportmagic/Manifest5
-rw-r--r--app-admin/reportmagic/metadata.xml8
-rw-r--r--app-admin/reportmagic/reportmagic-2.21.ebuild43
-rw-r--r--app-admin/restart_services/Manifest7
-rw-r--r--app-admin/restart_services/metadata.xml8
-rw-r--r--app-admin/restart_services/restart_services-0.13.0-r1.ebuild37
-rw-r--r--app-admin/restart_services/restart_services-0.13.1.ebuild37
-rw-r--r--app-admin/rex/Manifest12
-rw-r--r--app-admin/rex/metadata.xml359
-rw-r--r--app-admin/rex/rex-1.3.3.ebuild61
-rw-r--r--app-admin/rex/rex-1.4.0-r1.ebuild59
-rw-r--r--app-admin/rex/rex-1.4.1.ebuild59
-rw-r--r--app-admin/rex/rex-1.5.0.ebuild144
-rw-r--r--app-admin/rex/rex-9999.ebuild144
-rw-r--r--app-admin/rsyslog/Manifest36
-rw-r--r--app-admin/rsyslog/files/8-stable/50-default-r1.conf107
-rw-r--r--app-admin/rsyslog/files/8-stable/50-default.conf95
-rw-r--r--app-admin/rsyslog/files/8-stable/README.gentoo36
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch160
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch39
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch27
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch43
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch23
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.conf61
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.confd-r130
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.initd-r172
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.logrotate37
-rw-r--r--app-admin/rsyslog/metadata.xml41
-rw-r--r--app-admin/rsyslog/rsyslog-8.19.0.ebuild444
-rw-r--r--app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild448
-rw-r--r--app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild450
-rw-r--r--app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild452
-rw-r--r--app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild456
-rw-r--r--app-admin/rsyslog/rsyslog-8.28.0.ebuild451
-rw-r--r--app-admin/rsyslog/rsyslog-8.29.0.ebuild451
-rw-r--r--app-admin/sagan-rules/Manifest8
-rw-r--r--app-admin/sagan-rules/metadata.xml10
-rw-r--r--app-admin/sagan-rules/sagan-rules-20130430.ebuild28
-rw-r--r--app-admin/sagan-rules/sagan-rules-20140617.ebuild29
-rw-r--r--app-admin/sagan-rules/sagan-rules-99999999.ebuild30
-rw-r--r--app-admin/sagan/Manifest12
-rw-r--r--app-admin/sagan/files/mysql_check.patch26
-rw-r--r--app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch55
-rw-r--r--app-admin/sagan/files/sagan.confd9
-rw-r--r--app-admin/sagan/files/sagan.init17
-rw-r--r--app-admin/sagan/files/sagan.init-r117
-rw-r--r--app-admin/sagan/metadata.xml15
-rw-r--r--app-admin/sagan/sagan-0.2.3.ebuild85
-rw-r--r--app-admin/sagan/sagan-1.0.0_rc3.ebuild89
-rw-r--r--app-admin/salt/Manifest46
-rw-r--r--app-admin/salt/files/api-confd-15
-rw-r--r--app-admin/salt/files/api-initd-414
-rw-r--r--app-admin/salt/files/master-confd-15
-rw-r--r--app-admin/salt/files/master-initd-414
-rw-r--r--app-admin/salt/files/minion-confd-15
-rw-r--r--app-admin/salt/files/minion-initd-415
-rw-r--r--app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch104
-rw-r--r--app-admin/salt/files/salt-2015.5.10-buggy-tests.patch38
-rw-r--r--app-admin/salt/files/salt-2015.5.5-auth-tests.patch34
-rw-r--r--app-admin/salt/files/salt-2015.5.5-cron-tests.patch17
-rw-r--r--app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch46
-rw-r--r--app-admin/salt/files/salt-2015.5.7-tmpdir.patch37
-rw-r--r--app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch56
-rw-r--r--app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch35
-rw-r--r--app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch69
-rw-r--r--app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch36
-rw-r--r--app-admin/salt/files/salt-2015.8.2-tmpdir.patch56
-rw-r--r--app-admin/salt/files/salt-2016.11.0-broken-tests.patch23
-rw-r--r--app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch34
-rw-r--r--app-admin/salt/files/salt-2016.11.0-tmpdir.patch34
-rw-r--r--app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch18
-rw-r--r--app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch33
-rw-r--r--app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch32
-rw-r--r--app-admin/salt/files/salt-2016.3.5-tmpdir.patch47
-rw-r--r--app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch19
-rw-r--r--app-admin/salt/files/salt-api.service10
-rw-r--r--app-admin/salt/files/salt-master.service10
-rw-r--r--app-admin/salt/files/salt-minion.service10
-rw-r--r--app-admin/salt/files/salt-syndic.service10
-rw-r--r--app-admin/salt/files/syndic-confd-15
-rw-r--r--app-admin/salt/files/syndic-initd-414
-rw-r--r--app-admin/salt/metadata.xml44
-rw-r--r--app-admin/salt/salt-2015.5.10.ebuild133
-rw-r--r--app-admin/salt/salt-2015.8.13-r1.ebuild141
-rw-r--r--app-admin/salt/salt-2015.8.13.ebuild140
-rw-r--r--app-admin/salt/salt-2016.11.7.ebuild146
-rw-r--r--app-admin/salt/salt-2016.3.7.ebuild142
-rw-r--r--app-admin/salt/salt-2017.7.1.ebuild140
-rw-r--r--app-admin/salt/salt-9999.ebuild136
-rw-r--r--app-admin/serf/Manifest9
-rw-r--r--app-admin/serf/files/serf.confd7
-rw-r--r--app-admin/serf/files/serf.initd27
-rw-r--r--app-admin/serf/files/serf.logrotated7
-rw-r--r--app-admin/serf/files/serf.service14
-rw-r--r--app-admin/serf/metadata.xml10
-rw-r--r--app-admin/serf/serf-0.8.1-r1.ebuild83
-rw-r--r--app-admin/setools/Manifest16
-rw-r--r--app-admin/setools/files/setools-3.3.8-no-check-file.patch15
-rw-r--r--app-admin/setools/files/setools-3.3.8-policy-max.patch29
-rw-r--r--app-admin/setools/files/setools-4.0.1-remove-gui.patch17
-rw-r--r--app-admin/setools/files/setools-4.1.0-remove-gui.patch18
-rw-r--r--app-admin/setools/files/setools-4.1.1-remove-gui.patch18
-rw-r--r--app-admin/setools/metadata.xml12
-rw-r--r--app-admin/setools/setools-3.3.8-r7.ebuild141
-rw-r--r--app-admin/setools/setools-4.0.1.ebuild52
-rw-r--r--app-admin/setools/setools-4.1.1.ebuild53
-rw-r--r--app-admin/setools/setools-9999.ebuild53
-rw-r--r--app-admin/socklog/Manifest6
-rw-r--r--app-admin/socklog/files/socklog-2.1.0-headers.patch54
-rw-r--r--app-admin/socklog/metadata.xml8
-rw-r--r--app-admin/socklog/socklog-2.1.0.ebuild36
-rw-r--r--app-admin/sshguard/Manifest9
-rw-r--r--app-admin/sshguard/files/sshguard.confd21
-rw-r--r--app-admin/sshguard/files/sshguard.initd24
-rw-r--r--app-admin/sshguard/metadata.xml14
-rw-r--r--app-admin/sshguard/sshguard-1.7.1.ebuild65
-rw-r--r--app-admin/sshguard/sshguard-2.0.0.ebuild45
-rw-r--r--app-admin/stow/Manifest5
-rw-r--r--app-admin/stow/metadata.xml17
-rw-r--r--app-admin/stow/stow-2.2.2-r1.ebuild27
-rw-r--r--app-admin/sud/Manifest6
-rw-r--r--app-admin/sud/files/sud.rc620
-rw-r--r--app-admin/sud/metadata.xml14
-rw-r--r--app-admin/sud/sud-1.3-r1.ebuild47
-rw-r--r--app-admin/sudo/Manifest10
-rw-r--r--app-admin/sudo/metadata.xml33
-rw-r--r--app-admin/sudo/sudo-1.8.20_p2.ebuild216
-rw-r--r--app-admin/sudo/sudo-1.8.21_p1.ebuild218
-rw-r--r--app-admin/sudo/sudo-1.8.21_p2.ebuild218
-rw-r--r--app-admin/sudo/sudo-9999.ebuild224
-rw-r--r--app-admin/superadduser/Manifest6
-rw-r--r--app-admin/superadduser/files/1.0.9/superadduser407
-rw-r--r--app-admin/superadduser/files/superadduser.820
-rw-r--r--app-admin/superadduser/metadata.xml8
-rw-r--r--app-admin/superadduser/superadduser-1.0.9.ebuild18
-rw-r--r--app-admin/supernova/Manifest9
-rw-r--r--app-admin/supernova/metadata.xml12
-rw-r--r--app-admin/supernova/supernova-2.0.9.ebuild52
-rw-r--r--app-admin/supernova/supernova-2.1.0.ebuild51
-rw-r--r--app-admin/supernova/supernova-2.2.0.ebuild51
-rw-r--r--app-admin/supervisor/Manifest10
-rw-r--r--app-admin/supervisor/files/conf.d4
-rw-r--r--app-admin/supervisor/files/init.d27
-rw-r--r--app-admin/supervisor/files/init.d-r112
-rw-r--r--app-admin/supervisor/metadata.xml20
-rw-r--r--app-admin/supervisor/supervisor-3.1.4.ebuild46
-rw-r--r--app-admin/supervisor/supervisor-3.3.3.ebuild50
-rw-r--r--app-admin/swatchdog/Manifest8
-rw-r--r--app-admin/swatchdog/files/swatchdog-confd25
-rw-r--r--app-admin/swatchdog/files/swatchdog-init53
-rw-r--r--app-admin/swatchdog/files/swatchdogrc10
-rw-r--r--app-admin/swatchdog/metadata.xml27
-rw-r--r--app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild35
-rw-r--r--app-admin/swatchdog/swatchdog-3.2.4.ebuild31
-rw-r--r--app-admin/sxid/Manifest6
-rw-r--r--app-admin/sxid/metadata.xml8
-rw-r--r--app-admin/sxid/sxid-4.2-r1.ebuild31
-rw-r--r--app-admin/sxid/sxid-4.2-r2.ebuild32
-rw-r--r--app-admin/sysklogd/Manifest17
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff162
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff103
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff118
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.5-build.patch20
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch38
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch11
-rw-r--r--app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch103
-rw-r--r--app-admin/sysklogd/files/sysklogd.confd6
-rw-r--r--app-admin/sysklogd/files/sysklogd.logrotate8
-rw-r--r--app-admin/sysklogd/files/sysklogd.rc774
-rw-r--r--app-admin/sysklogd/metadata.xml11
-rw-r--r--app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild69
-rw-r--r--app-admin/sysklogd/sysklogd-1.5.1.ebuild60
-rw-r--r--app-admin/syslog-ng/Manifest34
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo36
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd24
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened114
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.confd42
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.rc658
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch29
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo36
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd24
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened114
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.confd42
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.rc658
-rw-r--r--app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo36
-rw-r--r--app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd24
-rw-r--r--app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened114
-rw-r--r--app-admin/syslog-ng/files/3.7/syslog-ng.confd42
-rw-r--r--app-admin/syslog-ng/files/3.7/syslog-ng.rc658
-rw-r--r--app-admin/syslog-ng/files/README.hardened13
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate12
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.hardened75
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in75
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.in12
-rw-r--r--app-admin/syslog-ng/metadata.xml20
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.4.8.ebuild119
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.2.ebuild123
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.4.ebuild123
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.7.2.ebuild143
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.7.3.ebuild138
-rw-r--r--app-admin/syslog-summary/Manifest5
-rw-r--r--app-admin/syslog-summary/metadata.xml8
-rw-r--r--app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild38
-rw-r--r--app-admin/syslogread/Manifest9
-rw-r--r--app-admin/syslogread/files/0.92/klogd.run4
-rw-r--r--app-admin/syslogread/files/0.92/syslogread-log.run3
-rw-r--r--app-admin/syslogread/files/0.92/syslogread.run2
-rw-r--r--app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch19
-rw-r--r--app-admin/syslogread/metadata.xml9
-rw-r--r--app-admin/syslogread/syslogread-0.92-r1.ebuild90
-rw-r--r--app-admin/sysrqd/Manifest7
-rw-r--r--app-admin/sysrqd/files/sysrqd-config.patch13
-rw-r--r--app-admin/sysrqd/files/sysrqd.init31
-rw-r--r--app-admin/sysrqd/metadata.xml14
-rw-r--r--app-admin/sysrqd/sysrqd-14.ebuild55
-rw-r--r--app-admin/sysstat/Manifest14
-rw-r--r--app-admin/sysstat/files/sysstat-10.0.4-flags.patch31
-rw-r--r--app-admin/sysstat/files/sysstat-11.0.4-cron.patch38
-rw-r--r--app-admin/sysstat/files/sysstat.init.d18
-rw-r--r--app-admin/sysstat/metadata.xml11
-rw-r--r--app-admin/sysstat/sysstat-11.4.0.ebuild92
-rw-r--r--app-admin/sysstat/sysstat-11.4.5.ebuild95
-rw-r--r--app-admin/sysstat/sysstat-11.4.6.ebuild95
-rw-r--r--app-admin/sysstat/sysstat-11.6.0.ebuild89
-rw-r--r--app-admin/system-config-printer/Manifest5
-rw-r--r--app-admin/system-config-printer/metadata.xml16
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.4.8.ebuild101
-rw-r--r--app-admin/system-tools-backends/Manifest8
-rw-r--r--app-admin/system-tools-backends/files/stb.rc20
-rw-r--r--app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch47
-rw-r--r--app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch25
-rw-r--r--app-admin/system-tools-backends/metadata.xml13
-rw-r--r--app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild66
-rw-r--r--app-admin/systemdgenie/Manifest3
-rw-r--r--app-admin/systemdgenie/metadata.xml17
-rw-r--r--app-admin/systemdgenie/systemdgenie-0.99.0.ebuild33
-rw-r--r--app-admin/systemrescuecd-x86/Manifest63
-rw-r--r--app-admin/systemrescuecd-x86/metadata.xml18
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild61
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild61
-rw-r--r--app-admin/tenshi/Manifest14
-rw-r--r--app-admin/tenshi/files/tenshi-create-mandir.patch10
-rw-r--r--app-admin/tenshi/files/tenshi-openrc-init-r1.patch11
-rw-r--r--app-admin/tenshi/files/tenshi-openrc-init.patch11
-rw-r--r--app-admin/tenshi/metadata.xml18
-rw-r--r--app-admin/tenshi/tenshi-0.12.ebuild50
-rw-r--r--app-admin/tenshi/tenshi-0.14.ebuild46
-rw-r--r--app-admin/tenshi/tenshi-0.15.ebuild46
-rw-r--r--app-admin/tenshi/tenshi-0.16-r1.ebuild47
-rw-r--r--app-admin/testdisk/Manifest5
-rw-r--r--app-admin/testdisk/metadata.xml13
-rw-r--r--app-admin/testdisk/testdisk-7.0-r3.ebuild81
-rw-r--r--app-admin/tmpreaper/Manifest7
-rw-r--r--app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch46
-rw-r--r--app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch47
-rw-r--r--app-admin/tmpreaper/metadata.xml24
-rw-r--r--app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild44
-rw-r--r--app-admin/tmpwatch/Manifest8
-rw-r--r--app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch30
-rw-r--r--app-admin/tmpwatch/files/tmpwatch.cron47
-rw-r--r--app-admin/tmpwatch/metadata.xml5
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild36
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11.ebuild31
-rw-r--r--app-admin/tripwire/Manifest10
-rw-r--r--app-admin/tripwire/files/tripwire10
-rw-r--r--app-admin/tripwire/files/tripwire.txt272
-rw-r--r--app-admin/tripwire/files/twcfg.txt15
-rw-r--r--app-admin/tripwire/metadata.xml35
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.5.ebuild79
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.6.ebuild79
-rw-r--r--app-admin/ulogd/Manifest8
-rw-r--r--app-admin/ulogd/files/ulogd.init41
-rw-r--r--app-admin/ulogd/files/ulogd.logrotate9
-rw-r--r--app-admin/ulogd/files/ulogd.service13
-rw-r--r--app-admin/ulogd/metadata.xml23
-rw-r--r--app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild142
-rw-r--r--app-admin/usbview/Manifest5
-rw-r--r--app-admin/usbview/metadata.xml8
-rw-r--r--app-admin/usbview/usbview-2.0.ebuild36
-rw-r--r--app-admin/vault/Manifest14
-rw-r--r--app-admin/vault/files/localhost.json.example9
-rw-r--r--app-admin/vault/files/vault.confd7
-rw-r--r--app-admin/vault/files/vault.initd19
-rw-r--r--app-admin/vault/files/vault.logrotated7
-rw-r--r--app-admin/vault/files/vault.service18
-rw-r--r--app-admin/vault/metadata.xml10
-rw-r--r--app-admin/vault/vault-0.7.3-r1.ebuild66
-rw-r--r--app-admin/vault/vault-0.8.2.ebuild67
-rw-r--r--app-admin/vault/vault-0.8.3.ebuild67
-rw-r--r--app-admin/verynice/Manifest9
-rw-r--r--app-admin/verynice/files/verynice19
-rw-r--r--app-admin/verynice/files/verynice-1.1-build.patch73
-rw-r--r--app-admin/verynice/files/verynice.service8
-rw-r--r--app-admin/verynice/metadata.xml9
-rw-r--r--app-admin/verynice/verynice-1.1-r2.ebuild32
-rw-r--r--app-admin/verynice/verynice-1.1-r3.ebuild33
-rw-r--r--app-admin/watchfolder/Manifest7
-rw-r--r--app-admin/watchfolder/files/0.3.3-64bit.patch11
-rw-r--r--app-admin/watchfolder/files/0.3.3-fortify-sources.patch11
-rw-r--r--app-admin/watchfolder/metadata.xml8
-rw-r--r--app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild43
-rw-r--r--app-admin/webalizer/Manifest14
-rw-r--r--app-admin/webalizer/files/apache.webalizer9
-rw-r--r--app-admin/webalizer/files/webalizer-language-list.txt136
-rw-r--r--app-admin/webalizer/metadata.xml15
-rw-r--r--app-admin/webalizer/webalizer-2.23.05.ebuild133
-rw-r--r--app-admin/webalizer/webalizer-2.23.08.ebuild147
-rw-r--r--app-admin/webapp-config/Manifest16
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch185
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch25
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch12
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch49
-rw-r--r--app-admin/webapp-config/metadata.xml22
-rw-r--r--app-admin/webapp-config/webapp-config-1.52-r1.ebuild64
-rw-r--r--app-admin/webapp-config/webapp-config-1.53-r2.ebuild67
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r2.ebuild65
-rw-r--r--app-admin/webapp-config/webapp-config-1.55.ebuild65
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild72
-rw-r--r--app-admin/webmin/Manifest9
-rw-r--r--app-admin/webmin/files/gentoo-setup-1.791438
-rw-r--r--app-admin/webmin/files/init.d.webmin85
-rw-r--r--app-admin/webmin/files/webmin.service18
-rw-r--r--app-admin/webmin/metadata.xml8
-rw-r--r--app-admin/webmin/webmin-1.791.ebuild308
-rw-r--r--app-admin/whowatch/Manifest7
-rw-r--r--app-admin/whowatch/files/whowatch-1.8.4-select.patch17
-rw-r--r--app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch19
-rw-r--r--app-admin/whowatch/metadata.xml11
-rw-r--r--app-admin/whowatch/whowatch-1.8.5.ebuild34
-rw-r--r--app-admin/xstow/Manifest7
-rw-r--r--app-admin/xstow/files/99xstow3
-rw-r--r--app-admin/xstow/files/xstow-1.0.1-ncurses.patch56
-rw-r--r--app-admin/xstow/metadata.xml21
-rw-r--r--app-admin/xstow/xstow-1.0.1.ebuild48
-rw-r--r--app-admin/xtail/Manifest7
-rw-r--r--app-admin/xtail/metadata.xml13
-rw-r--r--app-admin/xtail/xtail-2.1-r1.ebuild35
-rw-r--r--app-admin/xtail/xtail-2.1.ebuild25
-rw-r--r--app-admin/yaala/Manifest7
-rw-r--r--app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch31
-rw-r--r--app-admin/yaala/metadata.xml11
-rw-r--r--app-admin/yaala/yaala-0.7.3-r1.ebuild70
-rw-r--r--app-admin/yaala/yaala-0.7.3-r2.ebuild72
-rw-r--r--app-admin/yadm/Manifest4
-rw-r--r--app-admin/yadm/metadata.xml18
-rw-r--r--app-admin/yadm/yadm-1.07.ebuild43
1286 files changed, 55160 insertions, 0 deletions
diff --git a/app-admin/389-console/389-console-1.1.7-r1.ebuild b/app-admin/389-console/389-console-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..25ca62955f9b
--- /dev/null
+++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java based console for remote management 389 server"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2
+ https://dev.gentoo.org/~lxnay/${PN}/fedora.png"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/jss:3.4
+ dev-java/ldapsdk:4.1
+ >=dev-java/idm-console-framework-1.1"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+src_prepare() {
+ java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+ java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
+ java-pkg_jar-from idm-console-framework-1.1
+}
+
+src_compile() {
+ eant -Dbuilt.dir="${S}"/build \
+ -Dldapjdk.local.location="${S}" \
+ -Djss.local.location="${S}" \
+ -Dconsole.local.location="${S}" ${antflags}
+}
+
+src_install() {
+ java-pkg_newjar "${S}"/build/389-console-${PV}_en.jar 389-console_en.jar
+ java-pkg_dolauncher ${PN} \
+ --main com.netscape.management.client.console.Console \
+ --pwd "/usr/share/dirsrv/html/java/" \
+ --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\""
+
+ doicon "${DISTDIR}"/fedora.png
+ make_desktop_entry ${PN} "Port389 Management Console" fedora System
+}
diff --git a/app-admin/389-console/Manifest b/app-admin/389-console/Manifest
new file mode 100644
index 000000000000..933d81fc401d
--- /dev/null
+++ b/app-admin/389-console/Manifest
@@ -0,0 +1,6 @@
+DIST 389-console-1.1.7.tar.bz2 112970 SHA256 dcaf63654ec4c6986b9a3b10d79d8e0592f334fd42d34869b0b767bbffd01a05 SHA512 d2ea4c65ea6bb01d3163271a44bb4fab4167863e2df1389e8d4bd2782083c33563ddfd232512d8b28f0de037a7cf0dd7ee554c1660d40fa50d731224748d9f6e WHIRLPOOL dc1fed080e91fdee1a4dd7150a779a5d525c81020e2121127f9e7824e4a23f366907edf40c565332515cf7ba1654262bae82c7819185b31b99154050910548f0
+DIST fedora.png 11606 SHA256 88318e1704924c7d33aac3e37c195f99d29eb6f6f6235f254f254881257bbb0e SHA512 f6adbf8d3cb0e09a819baa54fc638bf48a478bbea666a49ed7f6ac91c3ee2e03ded61d7e17a184ae29dddfc128a11fee724dfaa42e0493a57dd7c91531809aad WHIRLPOOL c105c9daaa4ca4e1329a8bc7f6e403bfacf873db3f719e00b099fa2fb91eac550aa7222967518f8ad0ab99b94f59406082e27d99827c5bbf5ceeaecdb36a9d3c
+EBUILD 389-console-1.1.7-r1.ebuild 1347 SHA256 699a3939bb35d485ec58f6ffcca9a5d08342b1506cbe813adc67c4e97d259d41 SHA512 a5b3c0dc60fdb54adcb93ba0a180c60a700d8a6e2f013801e8f8488abdfaa4b75be299445792da6980988b465a783ae07acf6a0d429f1148d7bc75ab7a9a410c WHIRLPOOL 1a8ea4e3667c8f25d54fd6680ebef974694ca96d175c32b6de8cb111eef144383f9e35ef3f4c69c6a588c59a0010e51f41de6eff7207a705edc3ed00cb863b64
+MISC ChangeLog 2794 SHA256 5ac268e4a1ec14f3ce7abd0ea5677f6cba1133b05ec1117a1942a60630b40176 SHA512 2c0b2757a9d2ad3d732bd1d985b06df06fe2a305834062a342fd83c1062032b2792f676e22b3e6332d7b19085c972d8db0c0bb025d156a768e1ae5ee598b2b24 WHIRLPOOL b1c9394cb1632764f00efba6647d59fcd987f46c60d8d31e41d30917b9792eefbc745df521603842fbe46bfc4b6f9a77b4465d4d8f16abc233bbc9c1a71153a1
+MISC ChangeLog-2015 1429 SHA256 700bd6cd7b44e9d86f8f115b42c3d62e986b31f5bf8c0f53211f743258b8f588 SHA512 592ae188bd8a85aabb106c5d6f8d0efe618445bf35af7f40960d61a1779efd7877b0db897b68d8d3d1425a75460319d090087ec154cb95d83b7c46bce2cfdf35 WHIRLPOOL a4b59fe77b83b566c06ee5fcc227cd08f5e0efe77acd165b88128b9b36e0383f59025a1e60fad09823c09b036f14ce2595d5003236ff5e36f9f3f7f783d5379d
+MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/app-admin/389-console/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-admin/abrt/Manifest b/app-admin/abrt/Manifest
new file mode 100644
index 000000000000..1eec296684cb
--- /dev/null
+++ b/app-admin/abrt/Manifest
@@ -0,0 +1,11 @@
+AUX abrt-2.0.12-automake-1.12.patch 1905 SHA256 6a3772721095070dd792a73838440244c101a7522785c96614cc8460a368e415 SHA512 f29fd4bcb33bb20fd1d555ddc9dc21bb243641bb0d6a44d5a49948f2c6221404482718f4d6a4bb68a8e59945c2ca5566faab2628fa4c98f7900fa76e994ad7cb WHIRLPOOL 2a029f546aba01e70f45d8fc3f3a08dbf8d89882762ed424b7344e062306eb7ca7becdd8c598deee0c8400b9a550c82536575360fc265b50cd9a4a223f7d53c2
+AUX abrt-2.0.12-dbus-fallback.patch 3515 SHA256 f82f2a42c632d4e9e4ebdc2dec46efc657a964de058dc1e0c4714bb6bc13f1fb SHA512 6f6c298c14e0f6a0e127c635337883ee9ae3f1afa0229064a7bd2ad9431c5ec144452c33f2ee65a3ba0aebbcd33c10f9688ff8f74a553ad179a3faa098a9dbcd WHIRLPOOL 22154cd7504f534c3a554adace06631b1614f1929563f4c7e3661d36da723e0727407736208ff03987906522c5e18bb2766874d5d6ce8e535f93d22d24135888
+AUX abrt-2.0.12-gentoo.patch 13050 SHA256 05c8e5ae82432ea13ba54ef3c0c7b0b64219478901d13cf89d46c3191c018d1a SHA512 246eaf8faf1a5793837be94ecc3a56dc37488473140b05c17d6383c235922494468fac7aaa18f50654395c0b4fbaafc904262a3c15a8dc9fc21de320da43bbfa WHIRLPOOL 43708194563f677f38969ac4c20a679a46809573c75fd774e85aeb50bc8bdc53a932bf06394095f6cbb28e67edcf53237c9a6915627a9a3c841e1d3ff168af5f
+AUX abrt-2.0.12-r1-conf 687 SHA256 92e678393b44ff5ce42a5787618da170fc151d823187bf56bb1cf41054bfde17 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2 WHIRLPOOL d97533b294fd9127045530ca5619059bc17b971ef3ead0336e4902600ac6103faad89e9011efdbe2803f14f3fb08f10f898dc621ab1c50c759f2b3fc2c806f4b
+AUX abrt-2.0.12-r1-init 1921 SHA256 6b12ecdb7fe8a2b203c05e130155581a2c98c0a4880242dfcfebd99eb145fa8e SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81 WHIRLPOOL 3bd274f8674d6db4b9dc2165ed039b53539bb11489844cdfe1b6116d2e0887c51d8ea6af14f37fe4402ff9e33ccd553e3e87a83f2786ff2fc7eb33a30f55bf44
+AUX abrt-2.0.6-format-security.patch 911 SHA256 23059d8bfc28ed3277828493dc267801baa1351e5a8a70c4879fbac3742f5ec8 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71 WHIRLPOOL 0f3c6998e00608099ff5cce33ab07326776244ad666bb72a714652e60fcd4ef73cb75fffe0936f930588b3fa0ba383f1318eed60875961077747a30887da4e77
+DIST abrt-2.0.12.tar.gz 1090121 SHA256 2957f4136958078c3c8c9b2031febd8b322ef8705ca25a51592279b3ccd5c9e2 SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a WHIRLPOOL 9b39fe91f77e2de5b3816d5cfc10f75c7c3d7dedfc354ed4e052b50e6cebb94bd26fec94aaba6cfd1cc79b71f1cc34b77bfd70d27d25761fa853a6a2af5ef7ce
+EBUILD abrt-2.0.12-r2.ebuild 2643 SHA256 6c656ffb300daa0edfdc197efbdbb03602a2899f172eb3a13a36f841c5781aeb SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809 WHIRLPOOL 7f098e675e16651cb87137ba490cd98131f7a7c638ffbe9d9f715ee23a36d26c8f1e0bd5cf095781a99197f97c3e2f108678787186dc9d660cc2b56270757592
+MISC ChangeLog 2913 SHA256 be33a65ce51c93eb0a0b69499a43859871b785184dec83997337f9a48c8d9378 SHA512 d18ae73834e11ebe45696cd2431713601ee0d9f99ff539d2fa60636833e18745681c251fff4cf6c15b2ae6bc50958a0094fdf9017dbb6f75ac2ebc3795f71b09 WHIRLPOOL d361a4a95a9e9479566e19f03346cd28fc05d58f8d310315723f4eaa547d7b1873c4f446f49bca7cd52795973f3ecca5289b7c4e71d10378d190e865a7f3d01a
+MISC ChangeLog-2015 4113 SHA256 7f5e094da088bd659d9e6372c513646b7bb15037452a0226c71b237dfa4460ac SHA512 8f67fdfc04fec5ae65cd0834989919dd1720068234308da21244509eabd9e0e337741acce83397dad2f0bbf5d6e86d63ab42291431bd4d463afacf7a46c3f6e5 WHIRLPOOL 2d360415e3bfa35c8b811d38565abdb4a5d5b72476ad094069249eeb8934afb30f99710710e33c96d5abf817ea8e37a7258709e420825a53285cba5b31d94482
+MISC metadata.xml 327 SHA256 689b1cac547392d55e093e5b71f254b68a84959777a9efc9eeb4c244b78d04e7 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40 WHIRLPOOL 01a6c239bc9725742b4ed3e743d45c71c80da6d7214bb506fda2a4904bf297ec6b7fc6ea234369c7c7c0a77dfdf4772a2bbb52020fe46cef293702ffdefa8d88
diff --git a/app-admin/abrt/abrt-2.0.12-r2.ebuild b/app-admin/abrt/abrt-2.0.12-r2.ebuild
new file mode 100644
index 000000000000..e9e2cbced8f7
--- /dev/null
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# Need gnome2-utils for gnome2_icon_cache_update
+inherit autotools eutils gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=dev-libs/btparser-0.18
+ >=dev-libs/glib-2.21:2
+ >=dev-libs/libreport-2.0.11[${PYTHON_USEDEP}]
+ dev-libs/libxml2
+ dev-libs/nss
+ sys-apps/dbus
+ sys-auth/polkit
+ sys-fs/inotify-tools
+ x11-libs/gtk+:3
+ x11-libs/libnotify"
+RDEPEND="${COMMON_DEPEND}
+ app-arch/cpio
+ dev-libs/elfutils
+ >=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ enewgroup abrt
+ enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+ # Disable redhat-specific code not usable in gentoo, or that requires
+ # bugs.gentoo.org infra support.
+ epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
+
+ # Using a server response as a format string is a bad idea
+ epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
+
+ # pyhook test is sensitive to the format of python's error messages, and
+ # fails with certain python versions
+ sed -e '/pyhook.at/ d' \
+ -i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
+
+ # automake-1.12, #427926
+ epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
+
+ # Fix dbus timeout in gui; in next release
+ epatch "${FILESDIR}/${P}-dbus-fallback.patch"
+
+ eautoreconf
+
+ python_fix_shebang .
+}
+
+src_configure() {
+ myeconfargs=(
+ "--localstatedir=${EPREFIX}/var"
+ "$(systemd_with_unitdir)"
+ )
+ # --disable-debug enables debug!
+ use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /var/run/abrt
+ # /var/spool/abrt is created by dev-libs/libreport
+
+ diropts -m 700 -o abrt -g abrt
+ keepdir /var/spool/abrt-upload
+
+ diropts -m 775 -o abrt -g abrt
+ keepdir /var/cache/abrt-di
+
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+
+ newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+ newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ elog "To start the bug detection service on an openrc-based system, do"
+ elog "# /etc/init.d/abrt start"
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
new file mode 100644
index 000000000000..e2723067cb6e
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-automake-1.12.patch
@@ -0,0 +1,64 @@
+From 00704d4eb30dd12d6f4fcf97320c354ed3eacfa7 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:50:38 -0400
+Subject: [PATCH] Fix automake-1.12 autoreconf issues
+
+Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am and
+':='-style assignments and $(wildcard *~) in src/hooks/Makefile.am.
+
+Need AM_PROG_CC_C_O for src/applet/applet.c
+
+gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
+problems for automake-1.12.
+---
+ configure.ac | 8 +++-----
+ src/daemon/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a78d9f8..42acccf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ AC_INIT([abrt],
+ [crash-catcher@fedorahosted.org])
+
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
+ # Support silent build rules. Disable by either passing --disable-silent-rules
+ # to ./configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+@@ -12,8 +12,9 @@ AM_SILENT_RULES([yes])
+
+
+ AC_DISABLE_STATIC
++AM_PROG_AR
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_LN_S
+
+ AC_SYS_LARGEFILE
+@@ -30,9 +31,6 @@ GETTEXT_PACKAGE=abrt
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+-
+ IT_PROG_INTLTOOL([0.35.0])
+
+ dnl ****** END ****************************************
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 777dfc4..5a5f0ea 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -63,4 +63,4 @@ EXTRA_DIST = abrt-handle-upload
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+ install-data-local:
+- $(mkdir_p) '$(DESTDIR)/$(VAR_RUN)'
++ $(MKDIR_P) '$(DESTDIR)/$(VAR_RUN)'
+--
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
new file mode 100644
index 000000000000..e15731bbf04c
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-dbus-fallback.patch
@@ -0,0 +1,111 @@
+From 3ddf2f38a47c7cc13dd6f480841b9b90f6304ed4 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 3 Sep 2012 19:01:24 +0200
+Subject: [PATCH] abrt-gui: fall back to direct access if dbus access fails.
+ Closes #484
+
+It looks like this:
+
+root> abrt-gui
+Can't connect to system DBus: Error connecting: No such file or directory
+Error in DBus communication, falling back to direct access to '/var/spool/abrt'
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ src/gui-gtk/main.c | 44 +++++++++++++++++++++++++++-----------------
+ src/lib/problem_api.c | 5 +++--
+ 2 files changed, 30 insertions(+), 19 deletions(-)
+
+diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
+index 2cc4bef..e6e8ef0 100644
+--- a/src/gui-gtk/main.c
++++ b/src/gui-gtk/main.c
+@@ -252,23 +252,6 @@ static void add_directory_to_dirlist(const char *problem_dir_path, gpointer data
+ VERB1 log("added: %s", problem_dir_path);
+ }
+
+-static void query_dbus_and_add_to_dirlist(void)
+-{
+- GList *problem_dirs = get_problems_over_dbus(g_authorize);
+-
+- if (problem_dirs)
+- {
+- g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
+- list_free_with_free(problem_dirs);
+- }
+-
+- /* HACK ALERT! We "magically know" that dbus-reported problem dirs
+- * live in g_settings_dump_location.
+- * Notifications on changes should be implemented to go over dbus too.
+- */
+- watch_this_dir(g_settings_dump_location);
+-}
+-
+ static void scan_directory_and_add_to_dirlist(const char *path)
+ {
+ DIR *dp = opendir(path);
+@@ -296,6 +279,33 @@ static void scan_directory_and_add_to_dirlist(const char *path)
+ watch_this_dir(path);
+ }
+
++static void query_dbus_and_add_to_dirlist(void)
++{
++ GList *problem_dirs = get_problems_over_dbus(g_authorize);
++
++ if (problem_dirs == ERR_PTR)
++ {
++ /* One way to trigger this is to temporarily rename
++ * dbus socket (/var/run/dbus/system_bus_socket)
++ */
++ error_msg("Error in DBus communication, falling back to direct access to '%s'", g_settings_dump_location);
++ scan_directory_and_add_to_dirlist(g_settings_dump_location);
++ return;
++ }
++
++ if (problem_dirs)
++ {
++ g_list_foreach(problem_dirs, (GFunc)add_directory_to_dirlist, /*use_dbus:*/ (void*)true);
++ list_free_with_free(problem_dirs);
++ }
++
++ /* HACK ALERT! We "magically know" that dbus-reported problem dirs
++ * live in g_settings_dump_location.
++ * Notifications on changes should be implemented to go over dbus too.
++ */
++ watch_this_dir(g_settings_dump_location);
++}
++
+ static void scan_dirs_and_add_to_dirlist(void)
+ {
+ if (!(g_opts & OPT_D))
+diff --git a/src/lib/problem_api.c b/src/lib/problem_api.c
+index b9967e8..04f4069 100644
+--- a/src/lib/problem_api.c
++++ b/src/lib/problem_api.c
+@@ -144,7 +144,7 @@ GList *get_problems_over_dbus(bool authorize)
+ {
+ GDBusProxy *proxy = get_dbus_proxy();
+ if (!proxy)
+- return NULL;
++ return ERR_PTR;
+
+ GError *error = NULL;
+ GVariant *result = g_dbus_proxy_call_sync(proxy,
+@@ -159,6 +159,7 @@ GList *get_problems_over_dbus(bool authorize)
+ {
+ error_msg(_("Can't get problem list from abrt-dbus: %s"), error->message);
+ g_error_free(error);
++ return ERR_PTR;
+ }
+
+ GList *list = NULL;
+@@ -172,4 +173,4 @@ GList *get_problems_over_dbus(bool authorize)
+ }
+
+ return list;
+-}
+\ No newline at end of file
++}
+--
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-gentoo.patch b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
new file mode 100644
index 000000000000..0aa4267910e6
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-gentoo.patch
@@ -0,0 +1,398 @@
+From 1f56956ade3bd28ef192fba675e798db58b3ae40 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 22 Sep 2012 05:45:28 -0400
+Subject: [PATCH] Disable code not relevant for Gentoo
+
+Disable code that is only relevant for an RPM-based distro or that
+requires additional bugs.gentoo.org infrastructure support. Ensure that
+crashes still get analyzed even if they cannot be assigned to any
+package (since we lack any way of doing that at the moment).
+---
+ configure.ac | 1 -
+ doc/Makefile.am | 2 --
+ src/daemon/Makefile.am | 18 ----------
+ src/daemon/abrt_event.conf | 14 +++++---
+ src/plugins/Makefile.am | 71 +------------------------------------
+ src/plugins/abrt-action-list-dsos | 18 +++-------
+ src/plugins/ccpp_event.conf | 29 +--------------
+ src/plugins/ccpp_retrace_event.conf | 8 +----
+ src/plugins/koops_event.conf | 15 --------
+ src/plugins/python_event.conf | 16 ---------
+ src/plugins/xorg_event.conf | 2 +-
+ 11 files changed, 17 insertions(+), 177 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bb2b986..a78d9f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,7 +79,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
+ PKG_CHECK_MODULES([DBUS], [dbus-1])
+ PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+-PKG_CHECK_MODULES([RPM], [rpm])
+ PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
+ PKG_CHECK_MODULES([NSS], [nss])
+ PKG_CHECK_MODULES([BTPARSER], [btparser])
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 0a829d4..33cc8e6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -16,11 +16,9 @@ MAN1_TXT += abrt-cli.txt
+ MAN1_TXT += abrt-action-save-package-data.txt
+ MAN1_TXT += abrt-install-ccpp-hook.txt
+ MAN1_TXT += abrt-action-analyze-vmcore.txt
+-MAN1_TXT += abrt-bodhi.txt
+
+ MAN5_TXT =
+ MAN5_TXT += abrt.conf.txt
+-MAN5_TXT += abrt-action-save-package-data.conf.txt
+
+ MAN8_TXT =
+ MAN8_TXT += abrtd.txt abrt-dbus.txt
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 2e24403..777dfc4 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -6,9 +6,6 @@ dist_eventsconf_DATA = \
+ bin_SCRIPTS = \
+ abrt-handle-upload
+
+-bin_PROGRAMS = \
+- abrt-action-save-package-data
+-
+ sbin_PROGRAMS = \
+ abrtd \
+ abrt-server
+@@ -55,21 +52,6 @@ abrt_handle_event_LDADD = \
+ $(LIBREPORT_LIBS) \
+ $(BTPARSER_LIBS)
+
+-abrt_action_save_package_data_SOURCES = \
+- rpm.h rpm.c \
+- abrt-action-save-package-data.c
+-abrt_action_save_package_data_CPPFLAGS = \
+- -I$(srcdir)/../include \
+- -I$(srcdir)/../lib \
+- -DCONF_DIR=\"$(CONF_DIR)\" \
+- $(GLIB_CFLAGS) \
+- $(LIBREPORT_CFLAGS) \
+- -D_GNU_SOURCE
+-abrt_action_save_package_data_LDADD = \
+- $(RPM_LIBS) \
+- $(LIBREPORT_LIBS) \
+- ../lib/libabrt.la
+-
+ daemonconfdir = $(CONF_DIR)
+ dist_daemonconf_DATA = \
+ abrt.conf \
+diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf
+index a1411e4..aab7dc0 100644
+--- a/src/daemon/abrt_event.conf
++++ b/src/daemon/abrt_event.conf
+@@ -44,7 +44,7 @@
+
+
+ # Determine in which package/component the crash happened (if not yet done):
+-EVENT=post-create component= remote!=1
++#EVENT=post-create component= remote!=1
+ abrt-action-save-package-data
+
+
+@@ -60,19 +60,19 @@ EVENT=post-create
+ if [ -f uid ]; then getent passwd "`cat uid`" | cut -d: -f1 >username; fi
+
+
+-EVENT=notify package!= uid!=
++EVENT=notify uid!=
+ dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+
+-EVENT=notify package!= uid=
++EVENT=notify uid=
+ dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ string:"`cat package`" string:"$DUMP_DIR"
+
+-EVENT=notify-dup package!= uid!=
++EVENT=notify-dup uid!=
+ dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ string:"`cat package`" string:"$DUMP_DIR" string:"`cat uid`"
+
+-EVENT=notify-dup package!= uid=
++EVENT=notify-dup uid=
+ dbus-send --system --type=signal /com/redhat/abrt com.redhat.abrt.Crash \
+ string:"`cat package`" string:"$DUMP_DIR"
+
+@@ -108,6 +108,10 @@ EVENT=notify-dup package!= uid=
+ #EVENT=post-create
+ reporter-upload -u scp://user:password@server.name/var/spool/abrt-upload || :
+
++#report-gui event is used for reporting by abrt-applet and abrt-gui
++
++EVENT=report-gui analyzer=CCpp
++ report-gtk -e analyze_LocalGDB -e report_Logger -- "$DUMP_DIR"
+
+ #open-gui event is used by abrt-gui's "Edit"->"Open problem data"
+
+diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
+index 10ab579..f0248b1 100644
+--- a/src/plugins/Makefile.am
++++ b/src/plugins/Makefile.am
+@@ -1,7 +1,6 @@
+ -include ../../config.mak
+
+ bin_SCRIPTS = \
+- abrt-action-install-debuginfo \
+ abrt-action-analyze-core \
+ abrt-action-analyze-vmcore \
+ abrt-action-list-dsos
+@@ -16,12 +15,7 @@ bin_PROGRAMS = \
+ abrt-action-trim-files \
+ abrt-action-generate-backtrace \
+ abrt-action-generate-core-backtrace \
+- abrt-action-analyze-backtrace \
+- abrt-retrace-client \
+- abrt-dedup-client \
+- abrt-bodhi
+-
+-libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
++ abrt-action-analyze-backtrace
+
+ #dist_pluginsconf_DATA = Python.conf
+
+@@ -44,7 +38,6 @@ eventsconfdir = $(EVENTS_CONF_DIR)
+
+ dist_eventsconf_DATA = \
+ ccpp_event.conf \
+- ccpp_retrace_event.conf \
+ koops_event.conf \
+ xorg_event.conf \
+ vmcore_event.conf \
+@@ -56,7 +49,6 @@ dist_eventsconf_DATA = \
+
+
+ PYTHON_FILES = \
+- abrt-action-install-debuginfo.in \
+ abrt-action-list-dsos \
+ abrt-action-analyze-core \
+ abrt-action-analyze-vmcore.in
+@@ -69,7 +61,6 @@ EXTRA_DIST = \
+ collect_vimrc_user.xml.in \
+ collect_vimrc_system.xml.in \
+ analyze_LocalGDB.xml.in \
+- analyze_RetraceServer.xml.in \
+ analyze_VMcore.xml.in \
+ abrt-action-analyze-vmcore \
+ https-utils.h \
+@@ -204,64 +195,4 @@ abrt_action_analyze_backtrace_LDADD = \
+ $(LIBREPORT_LIBS) \
+ $(BTPARSER_LIBS)
+
+-abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \
+- abrt-action-install-debuginfo-to-abrt-cache.c
+-abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \
+- -I$(srcdir)/../include \
+- -I$(srcdir)/../lib \
+- -D_GNU_SOURCE \
+- $(LIBREPORT_CFLAGS) \
+- -Wall -Wwrite-strings
+-abrt_action_install_debuginfo_to_abrt_cache_LDADD = \
+- $(LIBREPORT_LIBS) \
+- ../lib/libabrt.la
+-
+-abrt_retrace_client_SOURCES = \
+- abrt-retrace-client.c \
+- https-utils.c
+- abrt_retrace_client_CFLAGS = \
+- -I$(srcdir)/../include \
+- -I$(srcdir)/../lib \
+- $(NSS_CFLAGS) \
+- $(GLIB_CFLAGS) \
+- -D_GNU_SOURCE \
+- $(LIBREPORT_CFLAGS)
+- abrt_retrace_client_LDADD = \
+- $(LIBREPORT_LIBS) \
+- $(BTPARSER_LIBS) \
+- $(NSS_LIBS)
+-
+-abrt_dedup_client_SOURCES = \
+- abrt-dedup-client.c \
+- https-utils.c
+- abrt_dedup_client_CFLAGS = \
+- -I$(srcdir)/../include \
+- -I$(srcdir)/../lib \
+- $(NSS_CFLAGS) \
+- $(GLIB_CFLAGS) \
+- -D_GNU_SOURCE \
+- $(LIBREPORT_CFLAGS)
+- abrt_dedup_client_LDADD = \
+- $(LIBREPORT_LIBS) \
+- $(BTPARSER_LIBS) \
+- $(NSS_LIBS)
+-
+-abrt_bodhi_SOURCES = \
+- bodhi.c
+- abrt_bodhi_CPPFLAGS = \
+- -I$(srcdir)/../include \
+- -I$(srcdir)/../lib \
+- $(GLIB_CFLAGS) \
+- $(LIBREPORT_CFLAGS) \
+- $(LIBREPORT_WEB_CFLAGS) \
+- $(JSON_C_CFLAGS) \
+- $(RPM_CFLAGS) \
+- -D_GNU_SOURCE
+- abrt_bodhi_LDADD = \
+- $(JSON_C_LIBS) \
+- $(RPM_LIBS) \
+- $(LIBREPORT_LIBS) \
+- $(LIBREPORT_WEB_LIBS)
+-
+-
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
+index 81a9927..bf1491c 100644
+--- a/src/plugins/abrt-action-list-dsos
++++ b/src/plugins/abrt-action-list-dsos
+@@ -5,7 +5,6 @@
+ import sys
+ import os
+ import getopt
+-import rpm
+
+ def log(s):
+ sys.stderr.write("%s\n" % s)
+@@ -68,19 +67,10 @@ if __name__ == "__main__":
+ try:
+ dso_paths = parse_maps(memfile)
+ for path in dso_paths:
+- ts = rpm.TransactionSet()
+- mi = ts.dbMatch('basenames', path)
+- if len(mi):
+- for h in mi:
+- if outname:
+- outfile = xopen(outname, "w")
+- outname = None
+- outfile.write("%s %s (%s) %s\n" %
+- (path,
+- h[rpm.RPMTAG_NEVRA],
+- h[rpm.RPMTAG_VENDOR],
+- h[rpm.RPMTAG_INSTALLTIME])
+- )
++ if outname:
++ outfile = xopen(outname, "w")
++ outname = None
++ outfile.write(path)
+
+ except Exception, ex:
+ error_msg_and_die("Can't get the DSO list: %s" % ex)
+diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf
+index 81b14d2..cda0b7d 100644
+--- a/src/plugins/ccpp_event.conf
++++ b/src/plugins/ccpp_event.conf
+@@ -31,31 +31,4 @@ EVENT=collect_xsession_errors analyzer=CCpp dso_list~=.*/libX11.*
+ # or was this ability lost with move to python installer?
+ EVENT=analyze_LocalGDB analyzer=CCpp
+ abrt-action-analyze-core --core=coredump -o build_ids &&
+- /usr/libexec/abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 &&
+- abrt-action-generate-backtrace &&
+- abrt-action-analyze-backtrace &&
+- (
+- bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+- if test -n "$bug_id"; then
+- abrt-bodhi -r -b $bug_id
+- fi
+- )
+-
+-
+-# Bugzilla requires nonempty duphash
+-EVENT=report_Bugzilla analyzer=CCpp duphash!=
+- abrt-dedup-client
+- test -f component || abrt-action-save-package-data
+- reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=CCpp
+- reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=CCpp
+- reporter-ureport -r
+-
+-# Reporting of C/Cpp problems
+-EVENT=report-gui analyzer=CCpp
+- report-gtk -e report_uReport -e analyze_RetraceServer -e report_Bugzilla -e post_report -- "$DUMP_DIR"
++ abrt-action-generate-backtrace
+diff --git a/src/plugins/ccpp_retrace_event.conf b/src/plugins/ccpp_retrace_event.conf
+index 60e53d7..893502f 100644
+--- a/src/plugins/ccpp_retrace_event.conf
++++ b/src/plugins/ccpp_retrace_event.conf
+@@ -1,9 +1,3 @@
+ EVENT=analyze_RetraceServer analyzer=CCpp
+ abrt-retrace-client batch --dir "$DUMP_DIR" --status-delay 10 &&
+- abrt-action-analyze-backtrace &&
+- (
+- bug_id=$(reporter-bugzilla -h `cat duphash`) &&
+- if test -n "$bug_id"; then
+- abrt-bodhi -r -b $bug_id
+- fi
+- )
++ abrt-action-analyze-backtrace
+diff --git a/src/plugins/koops_event.conf b/src/plugins/koops_event.conf
+index 91759b1..41708df 100644
+--- a/src/plugins/koops_event.conf
++++ b/src/plugins/koops_event.conf
+@@ -14,18 +14,3 @@ EVENT=post-create analyzer=Kerneloops
+ # report
+ #EVENT=report_Kerneloops analyzer=Kerneloops
+ reporter-kerneloops
+-
+-EVENT=report_Bugzilla analyzer=Kerneloops
+- reporter-bugzilla -b
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Kerneloops
+- reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Kerneloops
+- reporter-ureport -r
+-
+-# Reporting of kernel oopses
+-EVENT=report-gui analyzer=Kerneloops
+- report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/python_event.conf b/src/plugins/python_event.conf
+index e60df11..66b41f2 100644
+--- a/src/plugins/python_event.conf
++++ b/src/plugins/python_event.conf
+@@ -1,19 +1,3 @@
+ EVENT=post-create analyzer=Python
+ abrt-action-analyze-python
+ abrt-action-generate-core-backtrace
+-
+-EVENT=report_Bugzilla analyzer=Python
+- test -f component || abrt-action-save-package-data
+- reporter-bugzilla -b -c /etc/libreport/plugins/bugzilla.conf
+-
+-# Send micro report
+-EVENT=report_uReport analyzer=Python
+- reporter-ureport
+-
+-# update ABRT database after successful report to bugzilla
+-EVENT=post_report analyzer=Python
+- reporter-ureport -r
+-
+-# Reporting of python exceptions
+-EVENT=report-gui analyzer=Python
+- report-gtk -e report_uReport -e report_Bugzilla -e post_report -- "$DUMP_DIR"
+diff --git a/src/plugins/xorg_event.conf b/src/plugins/xorg_event.conf
+index b974a6b..5476230 100644
+--- a/src/plugins/xorg_event.conf
++++ b/src/plugins/xorg_event.conf
+@@ -33,4 +33,4 @@ EVENT=report_Bugzilla analyzer=xorg
+
+ # Reporting of xorg problems
+ EVENT=report-gui analyzer=xorg
+- report-gtk -e report_Bugzilla -- "$DUMP_DIR"
++ report-gtk -e report_Logger -- "$DUMP_DIR"
+--
+1.7.12
+
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-conf b/app-admin/abrt/files/abrt-2.0.12-r1-conf
new file mode 100644
index 000000000000..073eb0daf82e
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-conf
@@ -0,0 +1,27 @@
+# abrtd command-line options
+# Default: ""
+ABRTD_OPTS=""
+
+# Run abrt-harvest-vmcore to make new kdump dumps available for abrtd
+START_VMCORE="yes"
+
+# Install abrt-ccpp hook to watch for segfaults
+START_CCPP="yes"
+
+# Call abrt-dump-oops to log kernel oops
+START_OOPS="yes"
+# log file to watch for kernel oops
+# Default: "/var/log/messages"
+OOPS_WATCH_LOG="/var/log/messages"
+# abrt-dump-oops command-line options
+# Default: "-xD"
+OOPS_DUMP_OPTS="-xD"
+
+# Call abrt-dump-xorg to log X crashes
+START_XORG="yes"
+# log file to watch for X crashes
+# Default: "/var/log/Xorg.0.log"
+XORG_WATCH_LOG="/var/log/Xorg.0.log"
+# abrt-dump-xorg command-line options
+# Default: "-xD"
+XORG_DUMP_OPTS="-xD"
diff --git a/app-admin/abrt/files/abrt-2.0.12-r1-init b/app-admin/abrt/files/abrt-2.0.12-r1-init
new file mode 100644
index 000000000000..3fb32b7c3e43
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-init
@@ -0,0 +1,76 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Automated crash detection service"
+
+depend() {
+ need dbus logger
+}
+
+start() {
+ ebegin "Starting abrtd"
+ start-stop-daemon --start --quiet --pidfile /var/run/abrt/abrtd.pid \
+ --exec /usr/sbin/abrtd -- ${ABRTD_OPTS}
+ eend $?
+
+ if [ "${START_VMCORE}" = "yes" ]; then
+ ebegin "Running abrt-harvest-vmcore"
+ /usr/sbin/abrt-harvest-vmcore
+ eend $?
+ fi
+
+ if [ "${START_CCPP}" = "yes" ]; then
+ ebegin "Installing abrt-ccpp hook"
+ /usr/sbin/abrt-install-ccpp-hook install
+ eend $?
+ fi
+
+ if [ "${START_OOPS}" = "yes" ]; then
+ ebegin "Starting abrt-dump-oops"
+ start-stop-daemon --start --quiet \
+ --pidfile /var/run/abrt/abrt-dump-oops.pid \
+ --make-pidfile --background \
+ --exec /usr/bin/abrt-watch-log -- \
+ -F "`/usr/bin/abrt-dump-oops -m`" ${OOPS_WATCH_LOG} -- \
+ /usr/bin/abrt-dump-oops ${OOPS_DUMP_OPTS}
+ eend $?
+ fi
+
+ if [ "${START_XORG}" = "yes" ]; then
+ ebegin "Starting abrt-dump-xorg"
+ start-stop-daemon --start --quiet \
+ --pidfile /var/run/abrt/abrt-dump-xorg.pid \
+ --make-pidfile --background \
+ --exec /usr/bin/abrt-watch-log -- \
+ -F "`/usr/bin/abrt-dump-xorg -m`" ${XORG_WATCH_LOG} -- \
+ /usr/bin/abrt-dump-xorg ${XORG_DUMP_OPTS}
+ eend $?
+ fi
+}
+
+stop() {
+ if [ "${START_XORG}" = "yes" ]; then
+ ebegin "Stopping abrt-dump-xorg"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/abrt/abrt-dump-xorg.pid
+ eend $?
+ fi
+
+ if [ "${START_OOPS}" = "yes" ]; then
+ ebegin "Stopping abrt-dump-oops"
+ start-stop-daemon --stop --quiet \
+ --pidfile /var/run/abrt/abrt-dump-oops.pid
+ eend $?
+ fi
+
+ if [ "${START_CCPP}" = "yes" ]; then
+ ebegin "Uninstalling abrt-ccpp hook"
+ /usr/sbin/abrt-install-ccpp-hook uninstall
+ eend $?
+ fi
+
+ ebegin "Stopping abrtd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/abrt/abrtd.pid
+ eend $?
+}
diff --git a/app-admin/abrt/files/abrt-2.0.6-format-security.patch b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
new file mode 100644
index 000000000000..6b5c8d0e3721
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.6-format-security.patch
@@ -0,0 +1,27 @@
+From d0d7954713541df4612ab5b54b2808aae9a3d6f0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 16 Nov 2011 00:41:10 -0500
+Subject: [PATCH] Don't use server response as a format string
+
+It's bad practice even for trusted servers, and makes gcc complain about
+format-security.
+---
+ src/plugins/abrt-retrace-client.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
+index 0fb17a3..4c30334 100644
+--- a/src/plugins/abrt-retrace-client.c
++++ b/src/plugins/abrt-retrace-client.c
+@@ -958,7 +958,7 @@ static int create(bool delete_temp_archive,
+ if (response_code == 500 || response_code == 507)
+ {
+ alert_server_error();
+- error_msg_and_die(http_body);
++ error_msg_and_die("%s", http_body);
+ }
+ else if (response_code == 403)
+ {
+--
+1.7.8.rc1
+
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
new file mode 100644
index 000000000000..a14673b81f96
--- /dev/null
+++ b/app-admin/abrt/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">abrt/abrt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
new file mode 100644
index 000000000000..4f47c84ddee3
--- /dev/null
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -0,0 +1,19 @@
+AUX amc.init 562 SHA256 3a0c1f1c5a26103a546fd236fbd360b3c0f3130925bb994db5987fd5ae6cb2dd SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094 WHIRLPOOL e00b3c69ca94aabbb1b7c843655b303feac2cb28919b2938c7a25eac02af638a96b2ed1f7a59d6feff64007d269e03fbc50286f2bfd6c405224728c5418e02ad
+AUX amc.init2 583 SHA256 e0a93635e9647b99591fa888f60d3d160f0c9635fd8e8d4b5cf9d2de2b120af4 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317 WHIRLPOOL 7ff0a802a024a896dbeb9856f5849b2466aa97ff7b9e7b3adb48803b25219c9384a7f08f4b3d4f0b9794688523fe3b262e6fbd76bd77e9b6d90a4661f6798b1c
+DIST aerospike-amc-community-3.6.10.1.all.x86_64.deb 1434334 SHA256 1f8424f64d2d3a609ec1a4ad30569ccbf13ac411eddb96f3e855efc396523b02 SHA512 2f9d208c501800d7a73d419347883ff9b4f8d65e76238c8676f1f04ad6c38aae2c9746ea65ed0d4ef36bcc9419a3a70b4d95f42aea72556935cdb3e82d943f05 WHIRLPOOL 5062770392f4ebe62ab616bb67b9848591cdaed334dc94476b88ede7691b6734c2fe0d91b2a7e1ca7f69c48931c194cbec630eee58281d3e8414ebf5072499e9
+DIST aerospike-amc-community-3.6.11.all.x86_64.deb 1434296 SHA256 435d68f20f9a98d2569c294d850bfac5d00eaca680dbe5c697955d6b6df82c9c SHA512 e6396d8328f1021bbe4505bd63d4b4835857f151d58e0bb089f18ad7b3115d4893e9b3aaac18321f26150e6d1d2f15eadcd39d2f361af145426dee0c8fd9e90d WHIRLPOOL 99fee74cf99ba081f7ad61fc839a3ddc150fe9580325cc5ab40f2aeb254348856bde554240c2f39ec49dd4979cae7f03fe2d9d5ad3c6af4d181caeaefb627ddf
+DIST aerospike-amc-community-3.6.12.all.x86_64.deb 1436482 SHA256 9120e3b3ed144f19ce84a3d7b36a3fa1a61dff82e1e318efa81c834bb6cdb339 SHA512 d02e02db2c041bdb4ed8392dc2703840fc7eec5a7de8f5bbb24db61538631302c94f0bcffe8e31c8e03ec2ca35b8ea82f49d713cdfe2c1e14d0a078b53fb9695 WHIRLPOOL 4147051729ce90b61e29db031f879ee740c53c55a3da39504ca78931a3a859ed31376b177b2fd00ad6269961c44623a7664e8126e63281b9bec34f53f7272237
+DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 SHA256 f55f5ef3108e7da7c112fb12ceb1dca017e567c6ba1d311f604948ae347da3f0 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb WHIRLPOOL 7cdaf5a99c8049681282ea673374a5e6e1baddde765933d5b4c0596cf766d83381bf847beff4f9d9f43b5a16355d57c34ecf02c61e3235714773b31210b63824
+DIST aerospike-amc-community-3.6.8.2.all.x86_64.deb 1429424 SHA256 6509c10fa4af2c41aa9f2a17ad75e2f1383010bb9d12586e19858aa990b127d5 SHA512 ed1b82f825888ce2985b77d75e2e9988f87a241159fc0452af12892f66c37ec0d88f7edd2be6fce6d06184a5c09305f5e9727af48774e55b6290402fa406abc3 WHIRLPOOL 7c98bf26f9cd32461a015572fb3f7c9f6d17dff8fa28a13adbac47267db0f83d3d2139faceb1ebb89a259df20dbdd6f9b81c8cdd9f305597835e84c3f985805c
+DIST aerospike-amc-community-3.6.8.all.x86_64.deb 1429404 SHA256 7c29269746a806f04c3828188a249af6407135ebcf151fe55550d84d2e8dc464 SHA512 de44333471307410461bd53266b84fdc9fa92f7115012eb4b29b3ad415dd471ca3d9bf1a7c52bec7063df02a7e600dce9366910a089751dd19163cc212574d28 WHIRLPOOL 134a8f6dbd006b9918be787f090ca762b45b4c9083f43b6f039b3f33ab1a43ef38be30e3fa31c137185e35672620eace1a2cff7615091f9a9bfab955dfa1f914
+DIST aerospike-amc-community-3.6.9.all.x86_64.deb 1431182 SHA256 fb3a21ed712b134ae0fbe41bcc60ee3b62fddb1a08af660b7197528cb978d827 SHA512 67059ef2b96c4cf69b8a2edacb3edc711a18889b7eee16a038c63e8176d80e4b5ff23f126c0c16113a529e181b9c6f16601cbfa0251b0b12231ad7a23b8bc65e WHIRLPOOL c04a136ed27029503fd58c08a872fd86c9f3530b161183cb74a86db9f66150b817df05492f697214ecf8bbde3951d3b5091eea5c53787faf79888606670ddba5
+EBUILD aerospike-amc-community-3.6.10.1.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.11.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.12.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.13-r1.ebuild 1404 SHA256 222e56d9a9bf07abc0c9926150de0f5d84ce0e23fee764990d1c57d8ec62e083 SHA512 b359adddaf57972b90436bf09edac8081ee5113636f427f69e94e57eae15da8ad1a93c0e1c97ee2ddd590a98ff22290a360fe2ff54da292a16d4ed009fbbf77d WHIRLPOOL 1ec9ff8a96588f7a0258c61f091bb7b1f359a86b4ca2c4fec0461155b087526f98f7ce6838ffabe358354f63ca5f8bf23f5945f1c9d873d08cc44f126f4f8d61
+EBUILD aerospike-amc-community-3.6.13.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.8.2.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.8.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+EBUILD aerospike-amc-community-3.6.9.ebuild 1403 SHA256 aaa0412f0fa48222b292c7138bed20b2e620cea0a19b2cb66f756728df0c908b SHA512 2de0eae1ff0ae5ecf6d9b5ee5c2215c980c857ad5155219fc578730e315e69c952eee2fa1aa34a0a74beec6f73b5554cceb2e7c7655e1727c8e2447d4e309798 WHIRLPOOL 2411ce715b3b66d540673b9a0434626d5f14ac68ce12860337614f326ae315452376120f7c164a1ca56e319d0431de6a61e54ed9d8651789e38c5e2c563a5b0c
+MISC ChangeLog 1757 SHA256 31dd163535280266608376e7482fb64fdb670f75d44f82e5653446345bc619bb SHA512 fced25b81c5b12fe6f48323536c0bcdffc827bc98497cfe61ff62a9ac26870b0fb4484fd26ef7d9f592b24f068648b8195430761f7bafeff73e7ca741232894d WHIRLPOOL 81d8cae5a7fdba134a9bba8df4d273ab06928df5cbb57394e07f9b79b71f2665c6618869d60ae19c3f2a054234d54080eb86ce2f845ad15389a7e41ec1cb5575
+MISC metadata.xml 218 SHA256 eb70897907d0514564c84c9039d280e84e39daa2e26df509aadb12de34c79949 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd WHIRLPOOL 8587c6e7906d0284b2ab0fc799e790371b07acd33f712c2c5625ede6d8b63892d991a9036788eab77d2afc8b37dbcd5d1194a9f5686777132e304628038d043d
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
new file mode 100644
index 000000000000..aeea28831d00
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init2 amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
new file mode 100644
index 000000000000..5e04b68567fe
--- /dev/null
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="app-crypt/gcr
+ dev-python/eventlet
+ dev-python/flask
+ dev-python/greenlet
+ dev-python/setproctitle
+ www-servers/gunicorn"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ default
+ mkdir "${P}"
+ tar -xf data.tar.xz -C "${S}" || die
+ tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
+}
+
+src_install() {
+ mv opt/amc/amc/* opt/amc/
+ rm -rf opt/amc/amc
+ rm -f opt/amc/install
+ rm -f opt/amc/bin/uninstall
+ rm -f opt/amc/bin/amc_*.sh
+ rm -f opt/amc/bin/gunicorn
+ rm -rf opt/amc/server/site-packages/
+ rm -rf opt/amc/server/setups/
+
+ insinto /etc/logrotate.d
+ newins opt/amc/config/logrotate amc
+ rm -f opt/amc/config/logrotate
+
+ insinto /etc/cron.daily
+ newins opt/amc/config/logcron amc
+ rm -f opt/amc/config/logcron
+
+ sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
+
+ insinto /etc/amc/config
+ doins -r opt/amc/config/*
+ rm -rf opt/amc/config/
+
+ echo "${PV}" > opt/amc/amc_version
+
+ insinto /opt/amc/
+ doins -r opt/amc/*
+
+ keepdir /var/log/amc
+
+ newinitd "${FILESDIR}"/amc.init amc
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init b/app-admin/aerospike-amc-community/files/amc.init
new file mode 100644
index 000000000000..06c14001f5d6
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
+run_dir=${run_dir:-/run}
+
+command="/usr/bin/gunicorn"
+command_args="--daemon --config ${config_file} flaskapp:app"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+required_files="${config_file}"
+
+depend() {
+ use net
+}
+
+start_post() {
+ ewaitfile 60 "${pidfile}"
+}
diff --git a/app-admin/aerospike-amc-community/files/amc.init2 b/app-admin/aerospike-amc-community/files/amc.init2
new file mode 100644
index 000000000000..3e3bdd9920a3
--- /dev/null
+++ b/app-admin/aerospike-amc-community/files/amc.init2
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
+run_dir=${run_dir:-/run}
+
+command="/usr/bin/gunicorn"
+command_args="--daemon --config ${config_file} flaskapp:app"
+command_progress="true"
+retry='TERM/30/KILL/5'
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-root}
+group=${group:-root}
+start_stop_daemon_args="--user ${user} --group ${group}"
+required_files="${config_file}"
+
+depend() {
+ use net
+}
+
+start_post() {
+ ewaitfile 60 "${pidfile}"
+}
diff --git a/app-admin/aerospike-amc-community/metadata.xml b/app-admin/aerospike-amc-community/metadata.xml
new file mode 100644
index 000000000000..8c5a5301197b
--- /dev/null
+++ b/app-admin/aerospike-amc-community/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>patrick@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/amazon-ec2-init/Manifest b/app-admin/amazon-ec2-init/Manifest
new file mode 100644
index 000000000000..b80adbe77028
--- /dev/null
+++ b/app-admin/amazon-ec2-init/Manifest
@@ -0,0 +1,5 @@
+AUX amazon-ec2.init 1073 SHA256 759b1cdc1189ecfe54e90a78ca66433b87cc3e0d9bae4b1fbd8d4b621540e03c SHA512 6dcbca0fed4e3a4e8c0d0e9da4cb8ea380f6604605402350d8980bad1377376584b644157f88a2babcd605e690f3a52cf89e63e130d679b501327675c90d5836 WHIRLPOOL db27b6252670df61d52fb469231209c57ad9957bb66e0a11d3d759ad0076c28a5cbe2350e2790da247c64c146ae9805b2c4efb8d8cecfe716d6c2760d360a829
+EBUILD amazon-ec2-init-20101127-r1.ebuild 766 SHA256 5f30c7c74c1f5d84f959ec7f78a8ebf4572d8a4790530ac9c52b0d0d60af53c6 SHA512 a0c1986867363a9eb4616afdef8b20cd2a08372d05ea03853289cb6539f1152a9da876e5379b364d46b3f0e0f5f0e23eaaedde5b7c45c026cbbe84b479bc7259 WHIRLPOOL 9df9f44fe00d97f40aed6d22a972e16a9d1e3b4e5122c933606a642b470a562578486c51c9de9a0f48ea1857ac41ef4e2cf4e536db8de17f6453db62ab31cda9
+MISC ChangeLog 3379 SHA256 e33b9a15098585faeb1cf58d9045909654f2d22805c708069592b49a691e69c0 SHA512 a40f055c4c56e3f7f0e2c724fd80d9aca94b47882e80032a6012b24bdcbc227176d22a84bddaf622089a4d71a3acf3df31b16c882d5ea6f9f8c523dd645e8bac WHIRLPOOL e898599f749b5500056479a08f83cabfd00f42d1d0953403c3f18de0ae4f183a1a0da23a3acc4930cea73a211ed32bc3f5ba925e68d15412e5b914983fc8d8b3
+MISC ChangeLog-2015 838 SHA256 0c583ee9e32f7b3370c3342f4266365de4f222a6b6184f185b7cbe7bcecdf40f SHA512 5264fa3be50f4513538efbff443b723e2f4690c26c148c20db5c38fcb71978d62a5446113025a6735e32c063889efc399040533b1db5734422f93ef09e2b8b05 WHIRLPOOL 64d7c76170628e929116d49d7308cd52787f89b6e3b1f01d6f1f87a15134ffc4018ecf641fe90f4d513a92dcd87d8b4909cd9d1ed19280bfbea228208fb958ec
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
new file mode 100644
index 000000000000..41cd0c9ccb81
--- /dev/null
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Init script to setup Amazon EC2 instance parameters"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+# Amazon only provides x86 and amd64 Linux Xen guests, possibly FreeBSD,
+# so just don't go adding further keywords.
+KEYWORDS="-* ~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="net-misc/wget"
+DEPEND=""
+
+# EAPI 4+ requires $S to be set
+S="$WORKDIR"
+
+src_install() {
+ newinitd "${FILESDIR}/amazon-ec2.init" amazon-ec2
+}
+
+pkg_postinst() {
+ elog "Remember to add amazon-ec2 init script to your boot runlevel"
+ elog "otherwise it won't bring up the correct interfaces and won't."
+ elog "start before the hostname has been set."
+}
diff --git a/app-admin/amazon-ec2-init/files/amazon-ec2.init b/app-admin/amazon-ec2-init/files/amazon-ec2.init
new file mode 100644
index 000000000000..29ce3aabd6a8
--- /dev/null
+++ b/app-admin/amazon-ec2-init/files/amazon-ec2.init
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ before hostname
+ need net.eth0
+}
+
+start() {
+ einfo "Fetching metadata from EC2 servers"
+
+ ebegin " hostname"
+ local hostname=$(wget -t 2 -T 5 -q -O - http://169.254.169.254/latest/meta-data/local-hostname)
+ echo "hostname=${hostname}" >> /etc/conf.d/hostname
+ eend $?
+
+ ebegin " SSH keys"
+
+ mkdir -p /root/.ssh
+
+ local keys=$(wget -t 2 -T 5 -q -O - http://169.254.169.254/latest/meta-data/public-keys/ | cut -d = -f 1 | xargs echo)
+ [ -n "${keys}" ] && \
+ wget -t 2 -T 5 -q -O - $(for key in $keys; do echo "http://169.254.169.254/latest/meta-data/public-keys/$key/openssh-key"; done) \
+ >> /root/.ssh/authorized_keys \
+ 2>/dev/null
+
+ if [ -f /root/.ssh/authorized_keys ]; then
+ chown root:root /root/.ssh/authorized_keys
+ chmod 0600 /root/.ssh/authorized_keys
+ fi
+
+ eend $?
+}
diff --git a/app-admin/amazon-ec2-init/metadata.xml b/app-admin/amazon-ec2-init/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/amazon-ec2-init/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-admin/analog/Manifest b/app-admin/analog/Manifest
new file mode 100644
index 000000000000..a0add8f88990
--- /dev/null
+++ b/app-admin/analog/Manifest
@@ -0,0 +1,9 @@
+AUX analog-5.1-gentoo.diff 799 SHA256 4d748bf259f372578306a16b04c8442ddfa22f5f867c281758abc589c09e1b14 SHA512 34b03160213ca13f1b634dad1895b2cba5777188c7f673bbf00ee543d43ae3cf593d7be83b861b553e213ad0619d28f25ffcd1850f3ba7633bd13e37c4bd67b2 WHIRLPOOL 79aad4ce500efdd60a21e243e5c422969e541a104bb647b587d73c227f038e6e95f2d7d5f3df699ad70a867e631d7d44ab326518d9d8975d4acfeb095e5e9ff7
+AUX analog-6.0-bzip2.patch 3260 SHA256 c71786544305d0ec1d469a621b3ae75889828af210d2d19a7a984d4a4c1faf6b SHA512 ea256338713338043ccaa48ffd8344753811721cf42c8269a2c58c2a14f7ebe901b16131ff021163a02c570b1b902bb3ab6516e34570a7961bce716cf600920b WHIRLPOOL 2b0bea08adc8424028c946b77ae88c89a9dc45f026f03c5495181c8e06186d7a0c8c9ddc960b5661b219b6011017192c5754ab65d0387923ca828f2e9d814660
+AUX analog-6.0-undefined-macro.patch 997 SHA256 0304bdfb273fabc3004ae3227f34c7dcedf8f170434f08b97d333785e5ef9d65 SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f WHIRLPOOL a00099b871b9d3627a95c1876909e3986ee9a18c51ad804e19ac8ec2ac4c45804b8b9e287e8da9670cd305764950af0aa8a43b34e63b8b520842b9afdd3d5c3c
+AUX analog.cfg 3992 SHA256 83742dc17e28297fe4a4844bc53ef397ad1bb0514ed98b79ad5a9857f3a61fa8 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141 WHIRLPOOL 49794c077abc943c5bb8df8f7c12a67bca71ad258f92d88bc371e45d53d8e05c6b45072cbc6fb7b69bec9f7e948230fcff748c058c5e7d0203ea73f2fc300c03
+DIST analog-6.0.tar.gz 1553316 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60 WHIRLPOOL fd5b2685cf443a3336904973cfd2985a2393a5d021b06708d23ac717f6e4f53310942923ae3e41c69640d22b435e6bd0d44647502ec50af7b0517f9f48aa14cb
+EBUILD analog-6.0-r4.ebuild 1274 SHA256 f057c9e41bbd888ba212b08c5727b36069199d921cc2a6b3d2a24629ce9cf4a7 SHA512 8dc0af3bd800e4deb00c3e3b65902fbdb58353365c3bb6366fc2c31f3395ca76761dea5b9dd65089f86a95a3f335a32cb2e50752923ee4f215f3b6c7b7044c28 WHIRLPOOL 820694b7702f9cbf3837242eeeb4e1b6e4ddee1c2ac0330e5179ff5e13f55bb087ffd563b90702b6553e580bf3fbda3cc43bef801e27ebabd2306946dfd153fe
+MISC ChangeLog 2781 SHA256 e3d8a9e43d73b73d8e7037b76389915a7a61b24198769ec0a49d5ba9cb15a7f9 SHA512 c3b7a69bb4403c640c0b3b02fc365c5469dd971ba281e37d3af9d8eb421f476f8a84f77c3ed528839172296c14b66813a1f0ff8c5a8d7ccfa3944b958491208b WHIRLPOOL 18315f6a8e4ca5c3b599ee1c3e07cfa695909ab5846887235ebd5f49c8eb074baad31329e4edf5e0be259607a968e83887c5cacd198316a1adbab6764e8b405d
+MISC ChangeLog-2015 8277 SHA256 262071065bca08f8d46bbf38ce561b59e9a1bb66dac57a6650e2c8c54b1ae874 SHA512 87291fda4a1c10f18cb4c1fcec116f2a128dd0b2e6f48d7e0f9ab08bfdc5e98867fbb6199c1981f2f882322d16b6f8a7428f143e7b74b1094d53d0983e9ad56e WHIRLPOOL aeccb52a2b51354cc615391aecac73c1fbdc6e59a707947484998198a8abfa5a5dc75bf0664bd1ec27007d2738100a2a72eb592d9a590fc2eb4481fd471f9b7c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
new file mode 100644
index 000000000000..334c5652bfc3
--- /dev/null
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="http://www.c-amie.co.uk/analog/"
+SRC_URI="http://www.analog.cx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libpcre-3.4
+ >=media-libs/gd-1.8.4-r2[jpeg,png]
+ sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cd src/
+ epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+ epatch "${FILESDIR}/${P}-bzip2.patch"
+ epatch "${FILESDIR}/${P}-undefined-macro.patch"
+
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+}
+
+src_compile() {
+ tc-export CC
+ # emake in main dir just executes "cd src && make",
+ # i.e. MAKEOPTS are ignored
+ emake -C src
+}
+
+src_install() {
+ dobin analog
+ newman analog.man analog.1
+
+ dodoc README.txt Licence.txt analog.cfg
+ dohtml -a html,gif,css,ico docs/*
+ dohtml -r how-to
+ dodoc -r examples
+ docinto cgi ; dodoc anlgform.pl
+
+ insinto /usr/share/analog/images ; doins images/*
+ insinto /usr/share/analog/lang ; doins lang/*
+ dodir /var/log/analog
+ dosym ../../../usr/share/analog/images /var/log/analog/images
+ insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
+}
diff --git a/app-admin/analog/files/analog-5.1-gentoo.diff b/app-admin/analog/files/analog-5.1-gentoo.diff
new file mode 100644
index 000000000000..b604c254c572
--- /dev/null
+++ b/app-admin/analog/files/analog-5.1-gentoo.diff
@@ -0,0 +1,20 @@
+--- a/src/anlghead.h Wed Nov 7 06:06:46 2001
++++ b/src/anlghead.h Mon Dec 31 16:47:43 2001
+@@ -81,15 +81,11 @@
+ and use that directory; or the current directory if it couldn't deduce a
+ directory. This may or may not work, so it's better to specify a location
+ explicitly here if you know where the files will be kept. */
+-#ifndef LANGDIR
+-#define LANGDIR NULL
+-#endif
++#define LANGDIR "/usr/share/analog/lang/"
+ /* Directory where the language files live. Actually, if this one is defined
+ to be NULL, they will be looked for inside the "lang" subdirectory of the
+ directory containing the analog binary. */
+-#ifndef CONFIGDIR
+-#define CONFIGDIR NULL
+-#endif
++#define CONFIGDIR "/etc/analog/"
+ /* Directory containing configuration files. */
+ #ifndef LOGSDIR
+ #define LOGSDIR NULL
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch
new file mode 100644
index 000000000000..f950a30ef470
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-bzip2.patch
@@ -0,0 +1,64 @@
+Use system bzip2 library. Get CC and CFLAGS from environment.
+ -jer (bug #249140)
+
+
+--- a/src/Makefile 2004-12-19 14:51:30.000000000 +0100
++++ b/src/Makefile 2008-12-15 22:50:04.000000000 +0100
+@@ -2,16 +2,16 @@
+ # Please read docs/Readme.html, or http://www.analog.cx/
+ # This is a general Unix-like Makefile: Makefiles for other OS's can be found
+ # in the "build" directory.
+-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different
++# CC is set in the environment.
+ # compilers need different CFLAGS, e.g., -O instead of -O2.
+ MAKE = make # which "make" to use
+-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation.
++# CFLAGS is set in the environment.
+ # Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
+ # HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
+ # BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
+ # BS2000/OSD needs CFLAGS = -XLLML -XLLMK
+ # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp
+-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
++DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB -DHAVE_BZLIB
+ # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
+ # ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
+ # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
+@@ -30,7 +30,7 @@
+ #
+ OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
+ # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
+-LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS)
++LIBS = -lgd -lz -lbz2 -lpcre -lm -lpng -ljpeg
+ # need -lm LAST
+ # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
+ # if you defined HAVE_ZLIB above you also need -lz
+@@ -54,7 +54,7 @@
+ input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \
+ outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \
+ tree.o utils.o win32.o
+-SUBDIRS = bzip2 libgd libpng pcre unzip zlib
++SUBDIRS = libgd libpng pcre unzip zlib
+ SUBDIROBJS = libgd/gd.o libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \
+ libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \
+ libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \
+@@ -63,9 +63,7 @@
+ zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
+ zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
+ zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+- zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \
+- bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \
+- bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o
++ zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \
+ pcre/pcre.h libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
+ zlib/zlib.h bzip2/bzlib.h
+@@ -77,8 +75,6 @@
+
+ # There doesn't seem to be a good way to write all these rules in a generic
+ # form that works for all "make" programs
+-bzip2: ALWAYS
+- cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+
+ libgd: ALWAYS
+ cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
diff --git a/app-admin/analog/files/analog-6.0-undefined-macro.patch b/app-admin/analog/files/analog-6.0-undefined-macro.patch
new file mode 100644
index 000000000000..5a98541c465c
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-undefined-macro.patch
@@ -0,0 +1,38 @@
+--- a/src/unzip/ioapi.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/ioapi.h 2012-01-11 18:07:59.570768250 +0100
+@@ -35,6 +35,16 @@
+ extern "C" {
+ #endif
+
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+--- a/src/unzip/unzip.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/unzip.h 2012-01-11 18:00:25.988120225 +0100
+@@ -47,6 +47,15 @@
+ extern "C" {
+ #endif
+
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
+ #ifndef _ZLIB_H
+ #include "../zlib/zlib.h"
+ #endif
+
diff --git a/app-admin/analog/files/analog.cfg b/app-admin/analog/files/analog.cfg
new file mode 100644
index 000000000000..99e452b36e3d
--- /dev/null
+++ b/app-admin/analog/files/analog.cfg
@@ -0,0 +1,101 @@
+# Configuration file for analog 5.1
+# See http://www.analog.cx/
+#
+# This is a simple default configuration file which works when you run
+# analog with no command line parameters. There are much more extensive
+# configuration examples included with the documentation.
+# See the big.cfg example file.
+#
+# If you need a LOGFORMAT command (most people don't -- try it without first!),
+# it must go here, above the LOGFILE commands.
+LOGFILE /var/log/apache/access_log
+OUTFILE /var/log/analog/index.html
+LANGUAGE ENGLISH
+IMAGEDIR images/
+# HOSTNAME "[my organisation]"
+REQLINKINCLUDE pages
+REFLINKINCLUDE *
+REDIRREFLINKINCLUDE *
+FAILREFLINKINCLUDE *
+UNCOMPRESS *.gz,*.Z "gzip -cd"
+BROWOUTPUTALIAS IWENG AOL
+SUBBROW */*
+SUBTYPE *.gz,*.Z
+# Add whichever of these types of pages you have on your server, or others.
+# PAGEINCLUDE *.shtml
+# PAGEINCLUDE *.asp
+# PAGEINCLUDE *.jsp
+# PAGEINCLUDE *.cfm
+# PAGEINCLUDE *.pl
+# PAGEINCLUDE *.php
+SEARCHENGINE http://*altavista.*/* q
+SEARCHENGINE http://*yahoo.*/* p
+SEARCHENGINE http://*google.*/* q
+SEARCHENGINE http://*lycos.*/* query
+SEARCHENGINE http://*aol.*/* query
+SEARCHENGINE http://*excite.*/* search
+SEARCHENGINE http://*go2net.*/* general
+SEARCHENGINE http://*metacrawler.*/* general
+SEARCHENGINE http://*msn.*/* MT
+SEARCHENGINE http://*hotbot.com/* MT
+SEARCHENGINE http://*netscape.*/* search
+SEARCHENGINE http://*looksmart.*/* key
+SEARCHENGINE http://*infoseek.*/* qt
+SEARCHENGINE http://*webcrawler.*/* search,searchText
+SEARCHENGINE http://*goto.*/* Keywords
+SEARCHENGINE http://*snap.*/* keyword
+SEARCHENGINE http://*dogpile.*/* q
+SEARCHENGINE http://*askjeeves.*/* ask
+SEARCHENGINE http://*ask.*/* ask
+SEARCHENGINE http://*aj.*/* ask
+SEARCHENGINE http://*directhit.*/* qry
+SEARCHENGINE http://*alltheweb.*/* query
+SEARCHENGINE http://*northernlight.*/* qr
+SEARCHENGINE http://*nlsearch.*/* qr
+SEARCHENGINE http://*dmoz.*/* search
+SEARCHENGINE http://*newhoo.*/* search
+SEARCHENGINE http://*netfind.*/* query,search,s
+SEARCHENGINE http://*/netfind* query
+SEARCHENGINE http://*/pursuit query
+ROBOTINCLUDE REGEXPI:robot
+ROBOTINCLUDE REGEXPI:spider
+ROBOTINCLUDE REGEXPI:crawler
+ROBOTINCLUDE Googlebot*
+ROBOTINCLUDE Infoseek*
+ROBOTINCLUDE Scooter*
+ROBOTINCLUDE Slurp*
+ROBOTINCLUDE Ultraseek*
+TYPEOUTPUTALIAS .html ".html [Hypertext Markup Language]"
+TYPEOUTPUTALIAS .htm ".htm [Hypertext Markup Language]"
+TYPEOUTPUTALIAS .shtml ".shtml [Server-parsed HTML]"
+TYPEOUTPUTALIAS .ps ".ps [PostScript]"
+TYPEOUTPUTALIAS .gz ".gz [Gzip compressed files]"
+TYPEOUTPUTALIAS .tar.gz ".tar.gz [Compressed archives]"
+TYPEOUTPUTALIAS .jpg ".jpg [JPEG graphics]"
+TYPEOUTPUTALIAS .jpeg ".jpeg [JPEG graphics]"
+TYPEOUTPUTALIAS .gif ".gif [GIF graphics]"
+TYPEOUTPUTALIAS .png ".png [PNG graphics]"
+TYPEOUTPUTALIAS .txt ".txt [Plain text]"
+TYPEOUTPUTALIAS .cgi ".cgi [CGI scripts]"
+TYPEOUTPUTALIAS .pl ".pl [Perl scripts]"
+TYPEOUTPUTALIAS .css ".css [Cascading Style Sheets]"
+TYPEOUTPUTALIAS .class ".class [Java class files]"
+TYPEOUTPUTALIAS .pdf ".pdf [Adobe Portable Document Format]"
+TYPEOUTPUTALIAS .zip ".zip [Zip archives]"
+TYPEOUTPUTALIAS .hqx ".hqx [Macintosh archives]"
+TYPEOUTPUTALIAS .exe ".exe [Executables]"
+TYPEOUTPUTALIAS .wav ".wav [WAV sound files]"
+TYPEOUTPUTALIAS .avi ".avi [AVI movies]"
+TYPEOUTPUTALIAS .arc ".arc [Compressed archives]"
+TYPEOUTPUTALIAS .mid ".mid [MIDI sound files]"
+TYPEOUTPUTALIAS .mp3 ".mp3 [MP3 sound files]"
+TYPEOUTPUTALIAS .doc ".doc [Microsoft Word document]"
+TYPEOUTPUTALIAS .rtf ".rtf [Rich Text Format]"
+TYPEOUTPUTALIAS .mov ".mov [Quick Time movie]"
+TYPEOUTPUTALIAS .mpg ".mpg [MPEG movie]"
+TYPEOUTPUTALIAS .mpeg ".mpeg [MPEG movie]"
+TYPEOUTPUTALIAS .asp ".asp [Active Server Pages]"
+TYPEOUTPUTALIAS .jsp ".jsp [Java Server Pages]"
+TYPEOUTPUTALIAS .cfm ".cfm [Cold Fusion]"
+TYPEOUTPUTALIAS .php ".php [PHP]"
+TYPEOUTPUTALIAS .js ".js [JavaScript code]"
diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/analog/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-admin/ansible/Manifest b/app-admin/ansible/Manifest
new file mode 100644
index 000000000000..6cc09ee384fb
--- /dev/null
+++ b/app-admin/ansible/Manifest
@@ -0,0 +1,10 @@
+AUX ansible-2.3.2.0-fix_key_error.patch 2733 SHA256 de439ac7f94ec49747ebf9531bab5c2b2d6f706f5c0327ae3b980f58ba8d10de SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e WHIRLPOOL 12d04ce7063c7e8688e49714e92fe7f9b828f119efd0abadfccc83d4199e808b6e9ce744f95a130216f7787099bd9745016921d213dc048dd6d34e8a9bcdea71
+DIST ansible-2.3.2.0-pycryptodome.patch 32472 SHA256 0e204895f8e16e030517dcda40c95c40b20cfe1641e077c15d80ff8fc4b0579a SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d WHIRLPOOL 24c9971b643da1cc5321ffe13f1b1ce27f42ab4c273b51ea532746564c0112ce5884072245e282d1525057c2d4117a5fe67d0d305f1a23d1feb9d3d464f1ec11
+DIST ansible-2.3.2.0.tar.gz 4319664 SHA256 0563b425279422487f12616ef719f6e558373b258dcf47e548d119be8d3168eb SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac WHIRLPOOL 3ce907ba1a08e4d7cbca3c49429f4315f7cfea828806cb4710e2cce6d681a60514f9ca65e702da08a3ae6fc96cc969af73a17d3224e57996ec947438642693c6
+DIST ansible-2.4.0.0.tar.gz 6623856 SHA256 1a276fee7f72d4e6601a7994879e8467edb763dacc3e215258cfe71350b77c76 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b WHIRLPOOL ef957f6b03558f3fd2f711b0551405b1991ec9f404e033e4d9ee074dad07735a651a01d8191d3d111f5e65017621f18711955465547966235048214b3b7bbe85
+EBUILD ansible-2.3.2.0-r2.ebuild 1676 SHA256 b25f23663e55dfaf3bf9002749e8893dacb7cc15faaa19d0a1dfea7810a9139e SHA512 51dd318154de64b19452db3fbc203b1b3bcb04a2aaca2dd92d3bcebb5401757b7e7647eb955806abebfcfa45b3927433dd59fc5bccb0ee5971960d10639631bd WHIRLPOOL 18c770bc291e34b22a80f76c33a5d0213810837a33cfdca4088c98e3c7440a2b8b984ba206441427a95fe57b2bb8b367d2706aa3c5b7a4aaa63441f7096ea007
+EBUILD ansible-2.4.0.0.ebuild 1438 SHA256 6e22a02f3eeb22f424d131da28c23a15c8d4c89578a76f279e911add2078bff1 SHA512 885de334709f35656b7876380d35cd6e834c1ed145dd1f88b8901a32add233be3d0985542c2785b211342fa63492afefd0d0408a8ada2956f2bc3d236fe03122 WHIRLPOOL 1837c096a4c947b4c908998643c1f7f8ea46c61369f885d63eb6cc84dba2db3f23247e54a56a9ea1048af856d9633dc52366efa0ee1a32cac0aef04ba702566e
+EBUILD ansible-9999.ebuild 1696 SHA256 08c84153e567af00758970889bf449dc3c4a06aea6d8123c419a8fff88875ab4 SHA512 cdcae2ecd1f9257c88aa3545cb874d1992a48d0dfbfe25a599fc5cd1d60b48abf3d1f17cb992fdc750625b6916f8e264ac79776e474945ff6f6a1dec3598b372 WHIRLPOOL 9dfb579a17443a0b2ab1c4ac987da55d03ed9c58cd0d72bc2e4bc56459479ac375768c129583ed2720be5d6ac1145fbbe0a7df6366ace40ccbf60b350af9bc73
+MISC ChangeLog 9769 SHA256 199baf005e4d3f8d68566cea3ff4b6410b202cce107ab90504981dac00dd34b5 SHA512 d0f84e1dcbd3628c26e0df2d80ff829cf146f3ab8e6f355c8dc187b2ad5e4be9a1e60f22176e669548f2d355c9659dbeccafcf096de47d52c50842d1b65afac4 WHIRLPOOL b6dba8621dc6d3da894e717f48d9c5ec844c885d594976ef2a759898ba1a9e49db0172b358c0e161e615ee71ab42bc7ddf51a7b77db29e41eed6f5e768d4f5ac
+MISC ChangeLog-2015 11597 SHA256 88b37db76a87a55c7ac0afd355e215dcb788a0217a70561d8a5bdac8af71415c SHA512 25b912511f5763eb335b67a5adf194800b131440c0170b7cb37772e07ee926a2df530586ab77f8963f95b1176e5309de3f5597e7bb57df80f5e025afe83969c4 WHIRLPOOL bee785f57512f313a52908c3e93984138fde5b67ed2f800e6fa7438d6a4fa9517c05aed9326f2b922e6eb89fe4e2ea2f98f4e5a44b5a55747b6ef8fbe4ed0540
+MISC metadata.xml 952 SHA256 7af861810098fe67b07c557dfbe0a898153e0ddc355ff1872550c5ca95004275 SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7 WHIRLPOOL 7f86dd2d6d69882b80b729e1eb9fccf86bca4ac8e3ba2ca46bbd4409411883fa59de0cf58b1a1f7183f88099cda2cb8eb1c6d05b661ab64a01edda7dc9ccdda3
diff --git a/app-admin/ansible/ansible-2.3.2.0-r2.ebuild b/app-admin/ansible/ansible-2.3.2.0-r2.ebuild
new file mode 100644
index 000000000000..aff0f1b8ef36
--- /dev/null
+++ b/app-admin/ansible/ansible-2.3.2.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ || (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ )
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+PATCHES=(
+ "${DISTDIR}/${PN}-2.3.2.0-pycryptodome.patch"
+ "${FILESDIR}/${PN}-2.3.2.0-fix_key_error.patch"
+ )
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+}
diff --git a/app-admin/ansible/ansible-2.4.0.0.ebuild b/app-admin/ansible/ansible-2.4.0.0.ebuild
new file mode 100644
index 000000000000..df9628037bd5
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+PATCHES=(
+ )
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
new file mode 100644
index 000000000000..114b173baeee
--- /dev/null
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 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 git-r3
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+EGIT_BRANCH="devel"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+ <dev-python/jinja-2.9[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ app-text/asciidoc
+ net-misc/sshpass
+ virtual/ssh
+"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-vcs/git
+)"
+
+python_prepare_all() {
+ rm -fv MANIFEST.in || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ sed -e "s:pwd_entry.pw_dir:os.environ['HOME']:" \
+ -e "s:~%s/local:~%s/${CATEGORY}/${PF}/homedir/local:" \
+ -i test/units/test_constants.py || die
+
+ emake tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+ emake -j1 docs
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/${PN}*.1
+ dodoc -r examples
+}
diff --git a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch b/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
new file mode 100644
index 000000000000..80b9350d3e37
--- /dev/null
+++ b/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch
@@ -0,0 +1,74 @@
+From fbe9ec58c7f48d2cef4a49ba96e84bce5933d654 Mon Sep 17 00:00:00 2001
+From: Denis Dupeyron <calchan@gentoo.org>
+Date: Wed, 9 Aug 2017 12:01:31 -0500
+Subject: [PATCH] template: fix KeyError: 'undefined variable: 0
+
+Fixes: https://github.com/ansible/ansible/issues/20494
+
+Based on a patch by Zac Medico at:
+https://github.com/zmedico/ansible/pull/1/commits/32e5613a95e525c3a25b8cd5aa1beaa75a4b0d5c
+---
+ lib/ansible/template/template.py | 10 ++++++++--
+ lib/ansible/template/vars.py | 14 +++++++++++++-
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py
+index 55936f4..fe11471 100644
+--- a/lib/ansible/template/template.py
++++ b/lib/ansible/template/template.py
+@@ -33,5 +33,11 @@ class AnsibleJ2Template(jinja2.environment.Template):
+ '''
+
+ def new_context(self, vars=None, shared=False, locals=None):
+- return self.environment.context_class(self.environment, vars.add_locals(locals), self.name, self.blocks)
+-
++ if vars is not None:
++ if isinstance(vars, dict):
++ vars = vars.copy()
++ if locals is not None:
++ vars.update(locals)
++ else:
++ vars = vars.add_locals(locals)
++ return self.environment.context_class(self.environment, vars, self.name, self.blocks)
+diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py
+index fc6140c..2bf95ac 100644
+--- a/lib/ansible/template/vars.py
++++ b/lib/ansible/template/vars.py
+@@ -19,6 +19,8 @@
+ from __future__ import (absolute_import, division, print_function)
+ __metaclass__ = type
+
++from collections import Mapping
++
+ from ansible.compat.six import iteritems
+ from jinja2.utils import missing
+ from ansible.module_utils._text import to_native
+@@ -27,7 +29,7 @@ from ansible.module_utils._text import to_native
+ __all__ = ['AnsibleJ2Vars']
+
+
+-class AnsibleJ2Vars:
++class AnsibleJ2Vars(Mapping):
+ '''
+ Helper class to template all variable content before jinja2 sees it. This is
+ done by hijacking the variable storage that jinja2 uses, and overriding __contains__
+@@ -68,6 +70,16 @@ class AnsibleJ2Vars:
+ return True
+ return False
+
++ def __iter__(self):
++ keys = set()
++ keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
++ return iter(keys)
++
++ def __len__(self):
++ keys = set()
++ keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras)
++ return len(keys)
++
+ def __getitem__(self, varname):
+ if varname not in self._templar._available_variables:
+ if varname in self._locals:
+--
+2.13.3
+
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
new file mode 100644
index 000000000000..7c4e1dffb27b
--- /dev/null
+++ b/app-admin/ansible/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>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>calchan@gentoo.org</email>
+ <name>Denis Dupeyron</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">ansible</remote-id>
+ <remote-id type="github">ansible/ansible</remote-id>
+ <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
+ </upstream>
+ <longdescription lang="en">
+Radically simple deployment, model-driven configuration management, and
+command execution framework.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
new file mode 100644
index 000000000000..4f5dc19ec66a
--- /dev/null
+++ b/app-admin/apache-tools/Manifest
@@ -0,0 +1,13 @@
+AUX apache-tools-2.2.20-Makefile.patch 1573 SHA256 a523a76bcd87059e401b89d341c691423ab4cb4752b8d8871f7d499715335ef8 SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892 WHIRLPOOL 45f4572d51ba4de804ea7be467c19720010a5e5dba9b1904b28f6666a5d0986fafe5a93737e4a38cc86dea32c6ce0ca816358744f240bd84ece0bbbf6e87d508
+AUX apache-tools-2.4.7-Makefile.patch 1695 SHA256 69e1d6f232cb887d516b36a38c4bff1e10d36ed91fd1776cb7029b798525f2f7 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448 WHIRLPOOL 6962efc88b83d7a42029440c0abbdbda92c71a6c7ffda98072756e25ed54060050bdec1115550de76cf5fd1802cf3a7fd156796ccdb8c1c4139f375be8ade7c1
+DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
+DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd
+DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba
+DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed
+EBUILD apache-tools-2.2.31.ebuild 2154 SHA256 3a0897803e8e7751d12ba5796d1446204b8cfc262f339caf5df103d03090c181 SHA512 ee6d208a81d42676e847f6502ab55361a4212a9a0eedb12eb8fc1039bf18af84bd969b04526db0adaf05ab8c50f1d99a9425155eb34aed00f5f8272feb1e13a9 WHIRLPOOL 185d4500e1f73ebfb34bb773e52c1ca38291a2f1f1a10111a8807e0a8201b3e2cf2e68fb6cd9a8f6a626048f6dd67af63ec19366030f5e45378748e7fdfcdc3f
+EBUILD apache-tools-2.2.34.ebuild 1991 SHA256 026033387f47395ca42923ba76a1de6af801ac7ff387988a073f0e966e62e742 SHA512 6cb23024cffc592605f92382e2285e1af8aab63acb9a2860c32814bc1020d86f6d02ad19391417688f5fa24ff330eb6f6c74b4397a009b2d935ca5fbcd172b7d WHIRLPOOL 93b800e7db122bde1cd26816c91ecf04fdc095f5d462784efc7b26c0d7cd6cd9e3d66837016643b88e1dc2dd878cf4ac0b2e9e4db790ffd1dd78ce159d63cd13
+EBUILD apache-tools-2.4.27.ebuild 2665 SHA256 a4a00940d981ba9e1fce7d0b9737fb044e63c7f588ba2f0212d1776f615f97d4 SHA512 a6fb3773dddad5cc2f9ef78dd84b716c18194a77b25c4f096d7b3fbb8feac40d6c48ab1dabad7fdf065e4a25624a6ea9d8e2c092b05a711e8a1b980503863435 WHIRLPOOL 02f1c15b64dd5ca3a6f3ae963e9a3a2753887d2791a3ddda161622d6691380ea5bd439cfb851d9d3f1bf227e4af8d962aa4ddf6607ce6b87a4e0e3c4adca2c6c
+EBUILD apache-tools-2.4.28.ebuild 2674 SHA256 e1192010d093e007643ba1d6f43e62590969e8b6e72351fd256e2853b4bde00f SHA512 0c389a3b8f5edb9b63b2248ab05e9441478cfd7f801bd9e389845c4ffbe7521d09f21b78f91d681935ac8ce8615f55782ed8bfe1f79fb5756f718f095b2fe89f WHIRLPOOL e27f202caed6995f9c0911e6a75d02d84bbc4cf5f5758400c2cbfb83143f3fdff0685ce7ee95194a7fa8f1a86bb4e153e98eda1c0aeae1bdc559e7b850ed8c45
+MISC ChangeLog 10183 SHA256 4160609514d162d5b28196a6b3a90b27cbb38ca71e9f4a8abdbae628d76a8e66 SHA512 b53f5eae871b1183b7230969cca04477a09cb263e5f6a95744831247d8c65aa95fbe5d639a184a4136de537223745500e43f36982c77d3bb0243158bd74ef664 WHIRLPOOL 8c9a2298544d2c4a91470ef3147e34e750a0cc687882511a8f6273c3073ec878a5e60536af3edab0d16d664daa57c6ce233016ca07536ae5784e2f332bed0c9a
+MISC ChangeLog-2015 27945 SHA256 5d6bee2eac0905e873ea8986ec7bc3d4bee37581d931c09e55e6ab8c414b2d83 SHA512 f2f602931d36aaec1068c643729dabc4cc30c2a936cd418f48cef14dcc25d0e6eebb79cd003667a38e82e0eddbc2c5f6b35801314c1d0fce08643713ceeb00e4 WHIRLPOOL 01ed580519a15a2b7d4b89a1ed5f7bd223eefbd6e4d3804802ae5970f08125c02b64db936c6f401075844f2a5e608499cad29963cc21d97bb3a625d58671146c
+MISC metadata.xml 508 SHA256 6278b055b895401969703dc8f7a8d49244543e693e77bf57be03485a76f518b2 SHA512 0837c71bf2c7d2c54b7f6e3fcc4f5f1f42b36d6e14a981e38d77089551318db72c731a5d0eef0fd95ca55e69629a790f2e6719ecb59368cd7dd935ebafaa89aa WHIRLPOOL e07c6e0a11487f30d482e847cef17aa6f6c9365f469e5f9debf057a93701d91ca82d014b1d89799abdbbf0203d3ff3713c502bc605c7b74a1179c3330dca256f
diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
new file mode 100644
index 000000000000..164fa3333408
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+ =dev-libs/apr-util-1*
+ dev-libs/expat
+ dev-libs/libpcre
+ kernel_linux? ( sys-apps/util-linux )
+ ssl? ( dev-libs/openssl )
+ !<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+ # Apply these patches:
+ # (1) apache-tools-2.2.20-Makefile.patch:
+ # - fix up the `make install' for support/
+ # - remove envvars from `make install'
+ epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
+}
+
+src_configure() {
+ # Brain dead check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ append-ldflags $(no-as-needed)
+
+ # econf overwrites the stuff from config.layout.
+ econf \
+ --sbindir=/usr/sbin \
+ --with-z=/usr \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ --with-pcre=/usr \
+ $(use_enable ssl) \
+ $(usex ssl '--with-ssl=/usr' '')
+}
+
+src_compile() {
+ cd support || die
+ emake
+}
+
+src_install () {
+ cd support || die
+
+ make DESTDIR="${D}" install || die
+
+ # install manpages
+ doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+ "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${D}"/usr/sbin/ >/dev/null || die
+ for i in *; do
+ dosym /usr/sbin/${i} /usr/sbin/${i}2
+ done
+ popd >/dev/null || die
+
+ # Provide a symlink for ab-ssl
+ if use ssl; then
+ dosym /usr/sbin/ab /usr/sbin/ab-ssl
+ dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+ fi
+
+ # make htpasswd accessible for non-root users
+ dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+ dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+ dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
new file mode 100644
index 000000000000..1cf84d96521a
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+ =dev-libs/apr-util-1*
+ dev-libs/expat
+ dev-libs/libpcre
+ kernel_linux? ( sys-apps/util-linux )
+ ssl? ( dev-libs/openssl:0= )
+ !<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.20-Makefile.patch"
+)
+
+src_configure() {
+ # Brain dead check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ append-ldflags $(no-as-needed)
+
+ # econf overwrites the stuff from config.layout.
+ econf \
+ --sbindir=/usr/sbin \
+ --with-z=/usr \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ --with-pcre=/usr \
+ $(use_enable ssl) \
+ $(usex ssl '--with-ssl=/usr' '')
+}
+
+src_compile() {
+ cd support || die
+ emake
+}
+
+src_install () {
+ cd support || die
+
+ make DESTDIR="${D}" install || die
+
+ # install manpages
+ doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+ "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${D}"/usr/sbin/ >/dev/null || die
+ for i in *; do
+ dosym /usr/sbin/${i} /usr/sbin/${i}2
+ done
+ popd >/dev/null || die
+
+ # Provide a symlink for ab-ssl
+ if use ssl; then
+ dosym /usr/sbin/ab /usr/sbin/ab-ssl
+ dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+ fi
+
+ # make htpasswd accessible for non-root users
+ dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+ dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+ dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/apache-tools-2.4.27.ebuild b/app-admin/apache-tools/apache-tools-2.4.27.ebuild
new file mode 100644
index 000000000000..d1a471c0e14a
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.27.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+ dev-libs/apr-util:1
+ dev-libs/expat
+ dev-libs/libpcre
+ kernel_linux? ( sys-apps/util-linux )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+ default
+
+ # This package really should upgrade to using pcre's .pc file.
+ cat <<-\EOF >"${T}"/pcre-config
+ #!/bin/bash
+ flags=()
+ for flag; do
+ if [[ ${flag} == "--version" ]]; then
+ flags+=( --modversion )
+ else
+ flags+=( "${flag}" )
+ fi
+ done
+ exec ${PKG_CONFIG} libpcre "${flags[@]}"
+ EOF
+ chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+ # Brain dead check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ tc-export PKG_CONFIG
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ #append-ldflags $(no-as-needed)
+
+ # econf overwrites the stuff from config.layout.
+ ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+ econf \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+ --sbindir="${EPREFIX}"/usr/sbin \
+ --with-perl="${EPREFIX}"/usr/bin/perl \
+ --with-expat="${EPREFIX}"/usr \
+ --with-z="${EPREFIX}"/usr \
+ --with-apr="${SYSROOT}${EPREFIX}"/usr \
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+ --with-pcre="${T}"/pcre-config \
+ $(use_enable ssl) \
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+ sed -i \
+ -e '/^LTFLAGS/s:--silent::' \
+ build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+ emake -C support
+}
+
+src_install() {
+ emake -C support DESTDIR="${D}" install
+ dodoc CHANGES
+ doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+ docs/man/{htcacheclean,rotatelogs}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${ED}"/usr/sbin >/dev/null || die
+ local i
+ for i in *; do
+ dosym ${i} /usr/sbin/${i}2
+ done
+ popd >/dev/null || die
+
+ # Provide a symlink for ab-ssl
+ if use ssl; then
+ dosym ab /usr/bin/ab-ssl
+ dosym ab /usr/bin/ab2-ssl
+ fi
+}
diff --git a/app-admin/apache-tools/apache-tools-2.4.28.ebuild b/app-admin/apache-tools/apache-tools-2.4.28.ebuild
new file mode 100644
index 000000000000..efe38de48918
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.28.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1
+ dev-libs/apr-util:1
+ dev-libs/expat
+ dev-libs/libpcre
+ kernel_linux? ( sys-apps/util-linux )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+ default
+
+ # This package really should upgrade to using pcre's .pc file.
+ cat <<-\EOF >"${T}"/pcre-config
+ #!/bin/bash
+ flags=()
+ for flag; do
+ if [[ ${flag} == "--version" ]]; then
+ flags+=( --modversion )
+ else
+ flags+=( "${flag}" )
+ fi
+ done
+ exec ${PKG_CONFIG} libpcre "${flags[@]}"
+ EOF
+ chmod a+x "${T}"/pcre-config
+}
+
+src_configure() {
+ # Brain dead check.
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+ tc-export PKG_CONFIG
+
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed
+ #append-ldflags $(no-as-needed)
+
+ # econf overwrites the stuff from config.layout.
+ ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+ econf \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+ --sbindir="${EPREFIX}"/usr/sbin \
+ --with-perl="${EPREFIX}"/usr/bin/perl \
+ --with-expat="${EPREFIX}"/usr \
+ --with-z="${EPREFIX}"/usr \
+ --with-apr="${SYSROOT}${EPREFIX}"/usr \
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr \
+ --with-pcre="${T}"/pcre-config \
+ $(use_enable ssl) \
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+ sed -i \
+ -e '/^LTFLAGS/s:--silent::' \
+ build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+ emake -C support
+}
+
+src_install() {
+ emake -C support DESTDIR="${D}" install
+ dodoc CHANGES
+ doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+ docs/man/{htcacheclean,rotatelogs}.8
+
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install
+ # at some point).
+ pushd "${ED}"/usr/sbin >/dev/null || die
+ local i
+ for i in *; do
+ dosym ${i} /usr/sbin/${i}2
+ done
+ popd >/dev/null || die
+
+ # Provide a symlink for ab-ssl
+ if use ssl; then
+ dosym ab /usr/bin/ab-ssl
+ dosym ab /usr/bin/ab2-ssl
+ fi
+}
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
new file mode 100644
index 000000000000..7bc39527790c
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
@@ -0,0 +1,41 @@
+=== modified file 'support/Makefile.in'
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,10 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++ logresolve.pl phf_abuse_log.cgi split-logfile
+
+ CLEAN_TARGETS = suexec
+
+-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \
++ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage
+ TARGETS = $(PROGRAMS)
+
+ PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+@@ -12,22 +13,13 @@
+ include $(top_builddir)/build/rules.mk
+
+ install:
+- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+- @for i in apxs apachectl dbmmanage; do \
++ @for i in $(PROGRAMS) ; do \
+ if test -f "$(builddir)/$$i"; then \
+ cp -p $$i $(DESTDIR)$(sbindir); \
+ chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ fi ; \
+ done
+- @if test -f "$(builddir)/envvars-std"; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir); \
+- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+- fi ; \
+- fi
+
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+
diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
new file mode 100644
index 000000000000..b7d3c274ea48
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/459446
+
+https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
+
+--- a/support/Makefile.in
++++ b/support/Makefile.in
+@@ -1,9 +1,9 @@
+ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
+- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
++ logresolve.pl phf_abuse_log.cgi split-logfile
+
+ CLEAN_TARGETS = suexec
+
+-bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
++bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
+ sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
+ TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
+
+@@ -15,26 +15,18 @@
+ install:
+ @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
+- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
+- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
+- @for i in apxs dbmmanage; do \
++ @for i in $(bin_PROGRAMS); do \
+ if test -f "$(builddir)/$$i"; then \
+ cp -p $$i $(DESTDIR)$(bindir); \
+ chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ fi ; \
+ done
+- @for i in apachectl; do \
++ @for i in $(sbin_PROGRAMS); do \
+ if test -f "$(builddir)/$$i"; then \
+ cp -p $$i $(DESTDIR)$(sbindir); \
+ chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ fi ; \
+ done
+- @if test -f "$(builddir)/envvars-std"; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir); \
+- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+- fi ; \
+- fi
+
+ htpasswd.lo: passwd_common.h
+ passwd_common.lo: passwd_common.h
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
new file mode 100644
index 000000000000..e9a2f7c43c36
--- /dev/null
+++ b/app-admin/apache-tools/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>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription lang="en">
+ app-admin/apache-tools contains tools that might be useful without
+ having apache itself installed (like htdigest/htpasswd, but also ab -
+ the apache benchmark).
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
new file mode 100644
index 000000000000..4ae974ae196f
--- /dev/null
+++ b/app-admin/apachetop/Manifest
@@ -0,0 +1,10 @@
+AUX apachetop-0.12.6-ac_config_header.patch 458 SHA256 8e8e3f7be92d121911ae0393502d70b82390114aacf91d4cf3478d76217bfb50 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109 WHIRLPOOL 670af1f2bf3de73fdcae312a5bb46ae0991412fe536881eb1505d539a21d1d3ae47ee7584ad002db81920fd40297ba16f2536b8cc5f4fa53a25840117378682b
+AUX apachetop-0.12.6-configure.patch 2884 SHA256 56c926a2bf56ebfbf38da95176f229ce89285b1fc86aea7c8924c50ddbb49c7a SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15 WHIRLPOOL 78f9e350679faa9cf5e3511ee1111b12eb18935db09a6473c574413cbf2a882e448037f1c810cb8e16f8eeeb814ae057bbbbbcc726d5ee2e756d959001e29cdf
+AUX apachetop-0.12.6-gcc41.patch 243 SHA256 dcdb6b52b45079c06141bf6f28f5b925db78f5574e97a8bcdc41938643058669 SHA512 5aeff6bb7b08d792fc02526eb0c10491d217c11c157670d6b8380db4a748ca63c8c35dc8fb58851c6188ef2bd8da811a11fa556c3b3db513f77f3b785f927123 WHIRLPOOL e7fe9b6c4637729ca9dba18eaf872e4299f5753aa7eb57990c8f69c37cdb9b221adeaa0b91170ef5485797643164c4e0f8c9c27ace2f666a476116202098446a
+AUX apachetop-0.12.6-maxpathlen.patch 1577 SHA256 9c85eb8461946aa40afb5eab05075276688f829856919469408c64bb44329d25 SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36 WHIRLPOOL a813ba6c246c915531a7b626bcc819c00f9c90af51e00277c3f270fc050c1d7da1c594396d6bbdf3d183353d7bf9706b8da1c8fe1f1d9f866a5286d06251546f
+DIST apachetop-0.12.6.tar.gz 126930 SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a WHIRLPOOL 8b23d825b26c0ce43d1536edb3e6b613d9773c93cd62d02b84e479b9d1b0e89ef0f03b09b3e0cf3616fd3f05f2304b19c261c87e78c623bdabedfecbb5a5e8ae
+EBUILD apachetop-0.12.6-r1.ebuild 998 SHA256 0f154dc3f208fd7cc0b7d9860bb8248f0e80d291436c4a2242ca42e64ff2cc95 SHA512 52a9927874a2aea63c19983df262a4e0ec701ccf5a45531d99b835e2be4c3007963c1862a648c4b3ba7860a9cafb5ea12e49c9d24a45643d7999dffdb5a13b58 WHIRLPOOL 9b12f750d250b47c71d4b662e488b53aa112b245b61f28d1763c22ebc22a77caf24b0ea5ff3bc7dbad26f29ab06363325b3cff709adb3102c194c3730850a22d
+EBUILD apachetop-0.12.6-r2.ebuild 796 SHA256 4efd8ba8c88ae719d952132bfe942b22add6b87d39516e438332c23b3f9a1ce9 SHA512 e9cfd9880a3ad4fd9b633dcc0aeab3fd967ed26cfb5854d2257a108a59d5fb5c64609edafb0b88389415a551551f435e8bdde50633369e788b29943595fd15b5 WHIRLPOOL 5762f3a04e2300f7e93c53a9375c185cc5848c1ced493b7e2405abf5d848d71ba91ee6d4ec09231040c0407b44e2fade29720a5b866abd1f1b45948b42e2b11d
+MISC ChangeLog 2552 SHA256 29cd328bc74499bcb43b8dcb736e73d9b56b31c0e28937612d4ab124f35ca6f2 SHA512 8d53081752a0ef128e34f895453a714105f69cc78ef451f21a044857cbea03ad844d5202e218dde2f26a763fe6072e9f7166ede3879143a7bf46e89e2a5f56a5 WHIRLPOOL b29dc27c1b92ffee08545d7feabbf96b9b74ce7f387ff61812b188e6e505195694826ac4b8f83f7af8d39e51e90539daf2e9e0fe2a4d727f9b135233373141b2
+MISC ChangeLog-2015 7372 SHA256 5ae0fdbd6a04f099ec4a4312db5a2cc966807157250b111e61a1a5c59acbeca4 SHA512 15baea07bdc2eb2a1569da30809a417a1f2a971222988e18c15feb5110b69567fba9ef168fc2e6adc3ccdeb11658ac5fa55c5ed1fde9150526ba819211705ce3 WHIRLPOOL 31e1fd4d1ee261661befd419664ff56ca0e3f948e3b2f48c8c705be0541327b6dc2c9f91e9e3297f9c3b25729914f4f83d295a6e7b3fbcb7b115d775643e4f17
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
new file mode 100644
index 000000000000..2b4638b436a1
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="http://www.webta.org/projects/apachetop"
+SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE="fam pcre adns"
+
+DEPEND="fam? ( virtual/fam )
+ pcre? ( dev-libs/libpcre )
+ adns? ( net-libs/adns )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc41.patch
+ epatch "${FILESDIR}"/${P}-configure.patch
+ epatch "${FILESDIR}"/${P}-maxpathlen.patch
+ epatch "${FILESDIR}"/${P}-ac_config_header.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-logfile=/var/log/apache2/access_log \
+ $(use_with fam) \
+ $(use_with pcre) \
+ $(use_with adns)
+}
+
+src_compile() {
+ emake || die "emake failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
new file mode 100644
index 000000000000..bb433b83e580
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="http://www.webta.org/projects/apachetop"
+SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE="fam pcre"
+
+RDEPEND="
+ fam? ( virtual/fam )
+ pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc41.patch
+ epatch "${FILESDIR}"/${P}-configure.patch
+ epatch "${FILESDIR}"/${P}-maxpathlen.patch
+ epatch "${FILESDIR}"/${P}-ac_config_header.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-logfile=/var/log/apache2/access_log \
+ --without-adns \
+ $(use_with fam) \
+ $(use_with pcre)
+}
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
new file mode 100644
index 000000000000..aabdb13d75f3
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
@@ -0,0 +1,12 @@
+diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
+--- apachetop-0.12.6.orig/configure.ac 2013-07-09 14:06:14.000000000 -0400
++++ apachetop-0.12.6/configure.ac 2013-07-09 14:07:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ #AC_CONFIG_MACRO_DIR(m4) # 2.58
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
+
+ # Add non-standard directories to the include path
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
new file mode 100644
index 000000000000..38a1fc7f6a1a
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
@@ -0,0 +1,101 @@
+Index: apachetop-0.12.6/configure.ac
+===================================================================
+--- apachetop-0.12.6.orig/configure.ac
++++ apachetop-0.12.6/configure.ac
+@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
+
+ # pcre {{{
+-AC_ARG_WITH(pcre,
+- [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
+- [
+- CPPFLAGS="$CPPFLAGS -I $withval/include"
+- LDFLAGS="$LDFLAGS -L $withval/lib"
+- ]
+-)
+-
+-AC_CHECK_HEADERS(pcre.h,
+- AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
+- AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
+-)
++AC_ARG_WITH([pcre],
++ [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)],
++ [case "${withval}" in
++ yes) with_pcre="/usr";;
++ no) with_pcre="no";;
++ *) with_pcre="/usr";;
++ esac],
++ [with_pcre="/usr"])
++
++if test x$with_pcre != xno; then
++ CPPFLAGS="$CPPFLAGS -I $withval/include"
++ LDFLAGS="$LDFLAGS -L $withval/lib"
++ AC_CHECK_HEADERS(pcre.h,
++ AC_SEARCH_LIBS([pcre_compile], [pcre]),
++ AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
++fi
+ # }}}
+
+ # fam {{{
+-AC_ARG_WITH(fam,
+- [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
+- [
+- CPPFLAGS="$CPPFLAGS -I $withval/include"
+- LDFLAGS="$LDFLAGS -L $withval/lib"
+- ]
+-)
+-
+-AC_CHECK_HEADERS(fam.h,
+- AC_SEARCH_LIBS([FAMOpen], [fam]) ,
+- AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
+-)
++AC_ARG_WITH([fam],
++ [ --with-fam=<path> prefix of fam installation (eg /usr/local)],
++ [case "${withval}" in
++ yes) with_fam="/usr";;
++ no) with_fam="no";;
++ *) with_fam="/usr";;
++ esac],
++ [with_fam="/usr"])
++
++if test x$with_fam != xno; then
++ CPPFLAGS="$CPPFLAGS -I $with_fam/include"
++ LDFLAGS="$LDFLAGS -L $with_fam/lib"
++ AC_CHECK_HEADERS(fam.h,
++ AC_SEARCH_LIBS([FAMOpen], [fam]),
++ AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
++fi
+ # }}}
+
+ # adns {{{
+-AC_ARG_WITH(adns,
+- [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
+- [
+- CPPFLAGS="$CPPFLAGS -I $withval/include"
+- LDFLAGS="$LDFLAGS -L $withval/lib"
+- ]
+-)
+-
+-AC_CHECK_HEADERS(adns.h,
+- AC_SEARCH_LIBS([adns_submit], [adns]) ,
+- AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
+-)
++AC_ARG_WITH([adns],
++ [ --with-adns=<path> prefix of adns installation (eg /usr/local)],
++ [case "${withval}" in
++ yes) with_adns="/usr";;
++ no) with_adns="no";;
++ *) with_adns="/usr";;
++ esac],
++ [with_adns="/usr"])
++
++if test x$with_adns != xno; then
++ CPPFLAGS="$CPPFLAGS -I $with_adns/include"
++ LDFLAGS="$LDFLAGS -L $with_adns/lib"
++ AC_CHECK_HEADERS(adns.h,
++ AC_SEARCH_LIBS([adns_submit], [adns]),
++ AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
++fi
+ # }}}
+
+ # --with-logfile {{{
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
new file mode 100644
index 000000000000..566c9226a3f7
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -0,0 +1,13 @@
+--- src/resolver.h
++++ src/resolver.h
+@@ -10,8 +10,8 @@
+ class Resolver
+ {
+ public:
+- Resolver::Resolver(void);
+- Resolver::~Resolver(void);
++ Resolver(void);
++ ~Resolver(void);
+ int add_request(char *request, enum resolver_action act);
+
+
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
new file mode 100644
index 000000000000..b648b07cbfc5
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
@@ -0,0 +1,39 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
+adds some includes in order to have a real change to get MAXPATHLEN defined with
+a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
+buffer overflow.
+
+See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
+for more information. This patch should solve the mentioned bug report and should
+be sane enough to get included by upstream of apachetop for the next release. It
+is important to run autoheader before ./configure to get these changes activated.
+
+--- apachetop-0.12.6/configure.ac 2005-10-27 18:39:25.000000000 +0200
++++ apachetop-0.12.6/configure.ac.maxpathlen 2008-06-21 16:00:38.000000000 +0200
+@@ -34,7 +34,8 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
+- string.h strings.h sys/socket.h time.h sys/time.h])
++ string.h strings.h sys/socket.h time.h sys/time.h \
++ limits.h sys/param.h])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ #AC_HEADER_STDBOOL # not in 2.53?
+--- apachetop-0.12.6/src/apachetop.h 2005-10-15 18:10:01.000000000 +0200
++++ apachetop-0.12.6/src/apachetop.h.maxpatlen 2008-06-21 16:02:00.000000000 +0200
+@@ -89,8 +89,12 @@
+ #define getMIN(a,b) (a < b ? a : b)
+ #define getMAX(a,b) (a > b ? a : b)
+
+-#ifndef MAXPATHLEN
+-# define MAXPATHLEN 128
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++
++#if HAVE_LIMITS_H
++# include <limits.h>
+ #endif
+
+ /* upon startup, each input file is put into an element of this array,
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-admin/apachetop/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-admin/apg/Manifest b/app-admin/apg/Manifest
new file mode 100644
index 000000000000..f57d4b4a8663
--- /dev/null
+++ b/app-admin/apg/Manifest
@@ -0,0 +1,8 @@
+AUX apg-2.3.0b-cracklib.patch 925 SHA256 fbe7c7761187b358164bc768ab57475d2662bf855d79f285af92de15e007b3da SHA512 19477c54c22d2fff712a8a5822bfa11fbf42a55a27a18eb9d6bdbe38e3c388342bc36f596d4c2e03cfbdb9c4a4c6a35b519b48e909602332e063e41c906889eb WHIRLPOOL 9828271de5f5837180b879d78a2a60da07fc285b773669c650a81dd3a7552ddacadc7cc02b2797966065b1ab99b147ae8e3f91412b7c14de4ca18c861aa028d9
+AUX apg-2.3.0b-crypt_password.patch 836 SHA256 7d2946a8b67bebf3f53bcea86164b9259596b2625f5dd6302d49acebd3defa03 SHA512 3696ea5cf3ebadd22daf589ee708e1472e6f0d7e569cc479b1ea4e59743a31aa484a254e4c02d908996faab624999db76e443f74dccd2117fdab44e1e7fb8580 WHIRLPOOL 351334be1ed3c50031ec1fed7692a83543c6622fa987e55a9e0001b5a0a62dded902bc333c073d53ccc7d39ba9d578adecdb9f772e4a42de21c7f5f38b1ed157
+AUX apg-glibc-2.4.patch 261 SHA256 2d9e4deff463ba2419fea45d9942309b6d7ae5e3b32ceb835715bc98791e23cb SHA512 c7a3f388b5132d21caf6d45ad0c987bb9511a9fc4edd9e7f75739c270438d436159603b4eeb554bbc8cafce3329d01b66d11ab6e75f43b8bd2de57a31bd73bf5 WHIRLPOOL a4413d709f2b6badece96d9723cc5f65503b1418b8498880cec90f34a360e0227e129eccd80f35af1f904b17e9e6bfb4cdf5809e8ef67e99bc96093aa9e8e563
+DIST apg-2.3.0b.tar.gz 109995 SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a WHIRLPOOL 519b9b9137db3e3009d91ca9ab0b0e782c4840aae7b32b3aed035aebdb9380091b82169c9c6bd37829464792dc686219b70403c88b029b713278e7bea7f105d8
+EBUILD apg-2.3.0b-r5.ebuild 1344 SHA256 1e67905ff871a89c2820231cc444b2ecc33e8d1139b4a958540513dcc1dfa48d SHA512 69f23df5f60996446721ec5ad11b201fa97cf4a1c2c12e28da17ff855debcb349e293fbba174066aa91fac5f773fe69c1b45b46530bc853dcc4c474699c60cd3 WHIRLPOOL cd8468fcad373beff4443de2a4ab200d1e4e54ff1bfae4b2cb0bb07fa435841760492784c04f48cee1f1c8f2acaf92c64c11307493a62dfaf895c0922ff1f977
+MISC ChangeLog 2819 SHA256 6fd2e668bb1ab3b64d264276df4b6a58fa7f49719a1712a476a68a55d0d524bf SHA512 a748feaa39cccc7aacbcceda593eb266a2e791778ca908127f3fff5f559de0bd4655c1e80486b05b097f9afb8b3ccb72e7fb581323b64c731c4305a2ee10c969 WHIRLPOOL 05f1029cda4981ef33a48df021ad67f204b6379b4a24f2acaf7b5c0d69000e8385b0e6933df7a0429b2c3dc3bed3c496391ded35394b29a7bd83563454d900b7
+MISC ChangeLog-2015 5419 SHA256 7d9454f457f19f065530cc6d62463cf57dd24c61a25bf9494ead6a48a9258d5a SHA512 6abb72a351fdea04d9876bbac07c632ea92b1ed2ee9a03ae60a8dea3efd80d31c2501d36201ea2658b27fca14a0f0c5f8cf3e46f47f1b4bb453674c4fcbeca5e WHIRLPOOL 6000b47aa29f508ee1bf83a3f3c5adc652cc566d8a00aefe3dfdb78e513653d693dc113fce672e7e0b2370e491d4a75bc510c753aa0de7352c5998d749e58f16
+MISC metadata.xml 567 SHA256 eda6da8ae50c2933dfb61a02ae4a71a4bbe760159338e80fb9adeac1571217a6 SHA512 28d632e93ed6231b81335957400be4c2c00e12ecc1f99d5b467f3821ab0e5c8db1ff376d6498e503dcb5c49144a5634146b5b6366e26c3ad6c3ddad1bda6e7bb WHIRLPOOL ca53c69d5d2355c0528b778ab0052aec71d055c90c1a6c809a75d03df67b478e49cd6e32f918eefe2e3e3e9744b9f5fc6e2abc285bebd8b61df3cee9cea6ed28
diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild b/app-admin/apg/apg-2.3.0b-r5.ebuild
new file mode 100644
index 000000000000..818202c48ce4
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ chmod -R 0700 "${S}"
+ if use cracklib; then
+ epatch "${FILESDIR}"/${P}-cracklib.patch
+ epatch "${FILESDIR}"/${PN}-glibc-2.4.patch
+ fi
+ epatch "${FILESDIR}"/${P}-crypt_password.patch
+}
+
+src_compile() {
+ sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
+ || die "Sed failed"
+ if [[ ${CHOST} == *-darwin* ]]; then
+ sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
+ || die "Sed failed"
+ fi
+
+ emake \
+ FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
+ CC="$(tc-getCC)" \
+ standalone || die "compile problem"
+ emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+ -C bfconvert || die "compile problem"
+}
+
+src_install() {
+ dobin apg apgbfm bfconvert/bfconvert || die
+ dodoc CHANGES INSTALL README THANKS TODO || die
+ cd doc
+ doman man/apg.1 man/apgbfm.1 || die
+ dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt || die
+}
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
new file mode 100644
index 000000000000..a1c34a14f5a0
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
@@ -0,0 +1,17 @@
+--- Makefile 2003-08-07 09:40:39.000000000 -0600
++++ Makefile.cracklib 2004-10-14 07:16:17.288530686 -0600
+@@ -44,10 +44,10 @@
+ # If you want to use cracklib for password quality check then you
+ # must uncomment the folowing 4 lines (you must not do this for WIN32)
+ #
+-#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
+-#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
+-#APG_CLIBS += -lcrack
++CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict"
++STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
++APG_CLIBS += -lcrack
+
+ ##################################################################
+ # Support for ANSI X9.17/SHA1 PRNG
diff --git a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
new file mode 100644
index 000000000000..93f3f152a2b4
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
@@ -0,0 +1,31 @@
+--- restrict.c 2007-03-09 13:48:27.000000000 +0300
++++ restrict.c 2007-03-09 13:49:31.000000000 +0300
+@@ -33,6 +33,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(APG_USE_CRACKLIB)
++#include <crack.h>
++#endif /* APG_USE_CRACKLIB */
+ #include "restrict.h"
+ extern struct sym smbl[94];
+ /*
+--- apg.c 2007-03-08 17:32:40.000000000 +0300
++++ apg.c 2007-03-08 17:34:07.000000000 +0300
+@@ -100,6 +100,7 @@
+ #else /* CLISERV */
+ #if defined(APG_USE_CRACKLIB)
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vkt"
++#include <crack.h>
+ #else /* CRACKLIB */
+ #define APG_PROGRAMM_OPTIONS "M:E:a:r:b:p:n:m:x:vt"
+ #endif /* CRACKLIB */
+@@ -709,7 +710,7 @@
+ */
+ char * crypt_passstring (const char *p)
+ {
+- char salt[10];
++ char salt[11];
+ gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
+ return (crypt(p, salt));
+ }
diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
new file mode 100644
index 000000000000..be90c6355e66
--- /dev/null
+++ b/app-admin/apg/files/apg-glibc-2.4.patch
@@ -0,0 +1,11 @@
+--- restrict.h.orig 2006-03-26 03:33:50.168661936 +0400
++++ restrict.h 2006-03-26 03:34:10.427582112 +0400
+@@ -33,6 +33,8 @@
+ #ifndef APG_RESTRICT_H
+ #define APG_RESTRICT_H 1
+
++#define uint32_t int
++
+ #if defined(APG_USE_CRACKLIB)
+ #include <packer.h>
+ #endif
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
new file mode 100644
index 000000000000..f0530d94fe8d
--- /dev/null
+++ b/app-admin/apg/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>DuPol@gmx.de</email>
+ <name>Dustin Polke</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+<longdescription>Another Password Generator. Generates random, pronouncable passwords with a variety of algorithms</longdescription>
+</pkgmetadata>
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
new file mode 100644
index 000000000000..8d962a4e5999
--- /dev/null
+++ b/app-admin/augeas/Manifest
@@ -0,0 +1,19 @@
+AUX augeas-0.10.0-gets.patch 548 SHA256 10b57fbb769625d8677bf07f400cf94589b15a2f5244fad35b4b18a36dbca58c SHA512 cde05c4905613be475a051aab93f7bf9d5733c44e6d946a82ae39423dd51f21c98485e41a000dd54c750b3c4fcb1cf6b64237ebd708bbc91d0d37c10f346ec21 WHIRLPOOL 974cd4e4993ec13334c06fdea8afb173d8cdb921de306184507e196bc227803c331a9ae0c3e7a99234c86b80e939d2ee900a041421f6d7bc29a1173c0649efbb
+AUX augeas-0.10.0-libxml2-pkgconfig.patch 635 SHA256 ee4aea080eca0e1de6b93fc7ffc9e4105bafc9625f67d77e3490ab43f58463db SHA512 69d8398e0a6dce8959af0a83ab3e3767be1a9c5dda9b3ba03e6305a79b05df04652f76ff087dd5e82a2d46af9d042df0937b2ec885ca39ca2a05ad4df1fb84be WHIRLPOOL 7db91af93c5bf6b62a0ba808a2f01325e93e5719a58ab8591da2f035001544907c56047151641973c9a542d3e04cbc67de1c2794abfa000b58c54c27889c1669
+AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460de491dad4f8142f35f6fdaf33b SHA512 42e1c1b9024aab5f6d425c9fe421a3d5a81fd2e47908ad489aa8ea5044006b6c664810c9f8a12ad355217d4614b653f2a34000cafa8985ddc42632306cfb04a8 WHIRLPOOL 2ed6d9c3537eea7e3de425fc1084ac1b803c4ddf19d9fee7e26ea3796dac43d623a1a6d9f6487537fcf33e242bd35e2e4018ede2b9ddb5d24c24373e079c0455
+AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
+AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d
+AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188
+DIST augeas-1.7.0.tar.gz 2156168 SHA256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 SHA512 d2a5580ffa69c0229cfae85261cf7740b268ceac35f076aef6a7e8631497e5726530adfdb85f715ebb102f28af98861b4fa29d7e3eaa37a5dafff8eaf817befb WHIRLPOOL 29a8aca382592a4492e0d5153525fe26998729f1a7a482dede5275af712dce49ee08f700549dc8f96790ec6031a0a32e5017e059cf4feea0067f1424b80021d5
+DIST augeas-1.8.0.tar.gz 2164146 SHA256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 SHA512 bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c WHIRLPOOL 5f5dffac092bc241bc81b853ce05dd57530aab54e83668007e67dd29ca95583d7dfaebae75f96a822d5231d6bfd16aca30dc17b5b4d7ee6c2096fb9b917a4536
+DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
+DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568
+EBUILD augeas-1.7.0-r1.ebuild 1170 SHA256 0432c3bdfd73a440ce3873616a9d6a9d48a0687cfb1c75f1a0d866abc29f4faa SHA512 9062ded3c443b8dac190875bb5da2f4cc34f7ff0d1104a98c9099874a891e954eae42e09747cdde53ae7bd3af8a82090d4b3739405945e387d8ddd6621fb09df WHIRLPOOL 0493638832f0513c44c26727c0134285cbbbe106a9e57db4b8e4372159ad887dc4830b1eebc447715aa24257382bd642552c28deb589cd40bcae5965af6df1ce
+EBUILD augeas-1.7.0.ebuild 1115 SHA256 2761bed4c806366633eb5edee079a21b9418967b78701b5c11c2a3d6d0c8dcd9 SHA512 0e4dc7451ce05186ff17d922680663cde318714d0e5b41bd3e32d01c75cc58f8cb212a942fd5a415b447f4f9248e850f51a18a5033f05e44e1e85ac9c82ffd13 WHIRLPOOL c94314c26316db85e98e5698efcb16000052e1d243d7036e541de54875b92167a8ebeb2666cf5ad3580da56f1372ea809ded873519a72e9834d4ac3a86421b74
+EBUILD augeas-1.8.0-r1.ebuild 1037 SHA256 79964179da157f1a2e18f8b6c87b3a14644c750115a8dcd0abf684e7ed4b45a2 SHA512 74c1fa2664b4181b3dfbc09303e2d67a6a02e05583dd908b440671f16cd419641f1a4d7c0c21f076a1838c6ff1e5018af4a3eb80847bf889aff68b56aec86d17 WHIRLPOOL 15f4e28d89e832831af92f5b9e364af2dc224bd7d75b5f5239a8864fcff460a74c7fe289c9eda8aadd63d6a2e56335b373f4afd24058e2b439bb2c336349e053
+EBUILD augeas-1.8.0.ebuild 962 SHA256 50da0692da3b7e89743e6c2a174d9575368f3889d711c0f6bbea74f7fff56238 SHA512 af15f06ecdb8f98214e2d99923cfaa57e7154c9b1995a59e9c1fd52940a65cd817ed2e277d302d3ad8680a5755393fe9e0dc8a3defa03626f351fec0dd6908d6 WHIRLPOOL c999185e2a597931fc805417089e51c6225ca0016262184b602441be35be4ca8bfa7e9c8a9b1ddac182f44954768d4aebe6e4ad92a5625f29896259ccdac7973
+EBUILD augeas-1.8.1.ebuild 1001 SHA256 710e3968949e419325da3f8c1fac68f911c3e7ec3b7e0f1e42bf87e2e0f29da0 SHA512 be32c8020994a750511da6da39518b9ec493bbc1802ca8767a1b4b191c29cb628831c7a551425270cff84f5d952b8cc963d47d4393dd150028a028387939fbd1 WHIRLPOOL a9904b3643f766bedd565d34fe7ff10324cf6aa77b57944682428471a37353dc201fe39ce84c02d55283dcb1038371389f129fbfed46f3bb690aa1591280fdb3
+EBUILD augeas-1.9.0.ebuild 1007 SHA256 2c7fa7d3ef04a292e16b1338da985f3bbcb2bc77f1203a362994033769c6959b SHA512 2cbfcc1006e5330d61667fcc4c01f12b7220ff9602f0b3933fd291cc1f054950554631d1e86cbfd577101ad07672bd81aff9e074cab41e96379d9e60df53e2db WHIRLPOOL df9a3056ae5580b9a5100c8930966c53340f9b0f39c6f0ab6c3ec2e3f63b665529ae5458e73c0ad36d8882315624e41939f407b183a233577ff034cd854c6a60
+MISC ChangeLog 5096 SHA256 a43458b42603d43012d5331d5e373c03b92a75c3b88b9177d1238bf283bf17e1 SHA512 bf7e92ebbb1d714c13995ff12020d08d990a359c2772269d39869dba387e98b37caa4802ea14a09540ac0166b0a5d43dcef83961bfd74f2e2dcbdc1332995340 WHIRLPOOL a724244353b9c7cbb239cdb9e18c04fcbfa27e0c40990c3ee58c21389b8ecb7c3ac960ab2ed8861da2902be95d6cb1b062f0a2ee02ebdbba58dc87b9bbd9af75
+MISC ChangeLog-2015 7867 SHA256 2179c62fc1afc98a4902b960d3b945c6107fb5c7c12588bf81063d81f9d386cd SHA512 1467fb11d900332b57f356b58c470f7fcba3ff8b17a16b744cdef519922c561099a2c5c4e7c0dd0763c2333e548c8fb8428eec644944c241a639055788d35daa WHIRLPOOL bf03260b28195b879bafe06f584f824c24b9c353f9544baeb559f9f30dd20212ded555245b03e4ef16088bb7f249ee23485f4829920a37ace2d54d0e3ca04c6c
+MISC metadata.xml 693 SHA256 555de5a52dca8c4c99b3d03a5d62bf4c266e38a1ab1bb83d12efc105660a5f9a SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436 WHIRLPOOL d9cd4eb749649994fabba2e927139fa3d7a64cd515082996bcd0e2baf59d4dd6ceb1224c8f2424ad72f5da72cb6fec6e4f6ae62e6f2b2b15a4e4dbfa4fff7142
diff --git a/app-admin/augeas/augeas-1.7.0-r1.ebuild b/app-admin/augeas/augeas-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..f3291efef372
--- /dev/null
+++ b/app-admin/augeas/augeas-1.7.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+ "${FILESDIR}/cve-2017-7555.patch"
+)
+
+#PATCHES=(
+# "${FILESDIR}"/${P}-gets.patch
+# "${FILESDIR}"/${P}-test.patch
+# "${FILESDIR}"/${P}-test2.patch
+# "${FILESDIR}"/${P}-libxml2-pkgconfig.patch
+# )
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs=( --without-selinux )
+ autotools-utils_src_configure
+}
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.7.0.ebuild b/app-admin/augeas/augeas-1.7.0.ebuild
new file mode 100644
index 000000000000..2cdf509377f1
--- /dev/null
+++ b/app-admin/augeas/augeas-1.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+#PATCHES=(
+# "${FILESDIR}"/${P}-gets.patch
+# "${FILESDIR}"/${P}-test.patch
+# "${FILESDIR}"/${P}-test2.patch
+# "${FILESDIR}"/${P}-libxml2-pkgconfig.patch
+# )
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs=( --without-selinux )
+ autotools-utils_src_configure
+}
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.0-r1.ebuild b/app-admin/augeas/augeas-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..3d268f6e33cf
--- /dev/null
+++ b/app-admin/augeas/augeas-1.8.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+ "${FILESDIR}/cve-2017-7555.patch"
+)
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ default
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs="--without-selinux
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)"
+ eautoreconf
+ econf ${myeconfargs}
+ default
+}
diff --git a/app-admin/augeas/augeas-1.8.0.ebuild b/app-admin/augeas/augeas-1.8.0.ebuild
new file mode 100644
index 000000000000..a2f7b89a9d9b
--- /dev/null
+++ b/app-admin/augeas/augeas-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs=( --without-selinux )
+ autotools-utils_src_configure
+}
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.1.ebuild b/app-admin/augeas/augeas-1.8.1.ebuild
new file mode 100644
index 000000000000..846c917c6019
--- /dev/null
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ default
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs="--without-selinux
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)"
+ eautoreconf
+ econf ${myeconfargs}
+ default
+}
diff --git a/app-admin/augeas/augeas-1.9.0.ebuild b/app-admin/augeas/augeas-1.9.0.ebuild
new file mode 100644
index 000000000000..1caae80ecb1a
--- /dev/null
+++ b/app-admin/augeas/augeas-1.9.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ default
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs="--without-selinux
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)"
+ eautoreconf
+ econf ${myeconfargs}
+ default
+}
diff --git a/app-admin/augeas/files/augeas-0.10.0-gets.patch b/app-admin/augeas/files/augeas-0.10.0-gets.patch
new file mode 100644
index 000000000000..5f754955be6c
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-gets.patch
@@ -0,0 +1,15 @@
+ gnulib/lib/stdio.in.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h
+index 9091497..fa7e3fb 100644
+--- a/gnulib/lib/stdio.in.h
++++ b/gnulib/lib/stdio.in.h
+@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
new file mode 100644
index 000000000000..aaa418670154
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch
@@ -0,0 +1,24 @@
+From b41deef293841da50a236023bad486ea3f57e4dc Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 3 Dec 2011 14:21:50 +0000
+Subject: [PATCH] pkg-config: Augeas requires libxml2.
+
+---
+ augeas.pc.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/augeas.pc.in b/augeas.pc.in
+index c97847d..9e166db 100644
+--- a/augeas.pc.in
++++ b/augeas.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: augeas
+ Version: @VERSION@
+ Description: Augeas configuration editing library
+-Requires:
++Requires.private: libxml-2.0
+ Libs: -L${libdir} -laugeas @LIBS@
+ Cflags: -I${includedir}
+--
+1.7.6
+
diff --git a/app-admin/augeas/files/augeas-0.10.0-test.patch b/app-admin/augeas/files/augeas-0.10.0-test.patch
new file mode 100644
index 000000000000..e2630014f29a
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-test.patch
@@ -0,0 +1,56 @@
+From 075f8d35497fb36d9193e5364c055049c66fa5eb Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lubo.rintel@gooddata.com>
+Date: Mon, 9 Jan 2012 18:52:11 +0100
+Subject: [PATCH 1/2] Allow JSON number literals to be followed by whitespace
+
+Add a test case.
+
+Fixes https://fedorahosted.org/augeas/ticket/247
+---
+ AUTHORS | 1 +
+ lenses/json.aug | 2 +-
+ lenses/tests/test_json.aug | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index df63f95..e7870f2 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -44,6 +44,7 @@ Contributions by:
+ Bill Pemberton <wfp5p@virginia.edu>
+ Alan Pevec <apevec@redhat.com>
+ Robin Lee Powell <rlpowell@digitalkingdom.org>
++ Lubomir Rintel <lubo.rintel@gooddata.com>
+ Roman Rakus <rrakus@redhat.com>
+ Satoru SATOH <satoru.satoh@gmail.com>
+ Nicolas Valcárcel Scerpella <nvalcarcel@ubuntu.com>
+diff --git a/lenses/json.aug b/lenses/json.aug
+index c22ad90..6ceab09 100644
+--- a/lenses/json.aug
++++ b/lenses/json.aug
+@@ -29,7 +29,7 @@ let str_store =
+ let q = del "\"" "\"" in
+ q . store /[^"]*/ . q . ws (* " Emacs, relax *)
+
+-let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ ]
++let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ . ws ]
+ let str = [ label "string" . str_store ]
+
+ let const (r:regexp) = [ label "const" . store r . ws ]
+diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
+index 0bcd25d..d8b7fa8 100644
+--- a/lenses/tests/test_json.aug
++++ b/lenses/tests/test_json.aug
+@@ -8,6 +8,9 @@ test lns get "true" = { "const" = "true" }
+
+ test lns get "3.141" = { "number" = "3.141" }
+
++test lns get "{ \"key\" : 666 }" =
++ { "dict" { "entry" = "key" { "number" = "666" } } }
++
+ test lns get "[true, 0, \"yo\"]" =
+ { "array" { "const" = "true" } { "number" = "0" } { "string" = "yo" } }
+
+--
+1.7.7.5
+
diff --git a/app-admin/augeas/files/augeas-0.10.0-test2.patch b/app-admin/augeas/files/augeas-0.10.0-test2.patch
new file mode 100644
index 000000000000..743ccfdce1fc
--- /dev/null
+++ b/app-admin/augeas/files/augeas-0.10.0-test2.patch
@@ -0,0 +1,49 @@
+From 100a7b38222a63c6435a72b4974b55f39a28989e Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lubo.rintel@gooddata.com>
+Date: Mon, 9 Jan 2012 19:24:41 +0100
+Subject: [PATCH 2/2] Correctly parse empty object and arrays in JSON
+
+Add a test case.
+Fix from David Lutterkort <lutter@redhat.com>.
+
+https://fedorahosted.org/augeas/ticket/248
+---
+ lenses/json.aug | 4 ++--
+ lenses/tests/test_json.aug | 5 +++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/lenses/json.aug b/lenses/json.aug
+index 6ceab09..2645806 100644
+--- a/lenses/json.aug
++++ b/lenses/json.aug
+@@ -37,9 +37,9 @@ let const (r:regexp) = [ label "const" . store r . ws ]
+ let value0 = str | number | const /true|false|null/
+
+ let fix_value (value:lens) =
+- let array = [ label "array" . lbrack . Build.opt_list value comma . rbrack ] in
++ let array = [ label "array" . lbrack . (Build.opt_list value comma)? . rbrack ] in
+ let pair = [ label "entry" . str_store . colon . value ] in
+- let obj = [ label "dict" . lbrace . Build.opt_list pair comma . rbrace ] in
++ let obj = [ label "dict" . lbrace . (Build.opt_list pair comma)? . rbrace ] in
+ (str | number | obj | array | const /true|false|null/)
+
+ (* Typecheck finitely deep nesting *)
+diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
+index d8b7fa8..aec7d4c 100644
+--- a/lenses/tests/test_json.aug
++++ b/lenses/tests/test_json.aug
+@@ -30,6 +30,11 @@ test lns get "{ \"0\": true, \"1\":false }" =
+ test lns get "{\"menu\": \"entry one\"}" =
+ { "dict" { "entry" = "menu" { "string" = "entry one" } } }
+
++test lns get "[ ]" =
++ { "array" }
++
++test lns get "{}" =
++ { "dict" }
+
+ let s = "{\"menu\": {
+ \"id\": \"file\",
+--
+1.7.7.5
+
diff --git a/app-admin/augeas/files/cve-2017-7555.patch b/app-admin/augeas/files/cve-2017-7555.patch
new file mode 100644
index 000000000000..aaacdc2674c0
--- /dev/null
+++ b/app-admin/augeas/files/cve-2017-7555.patch
@@ -0,0 +1,159 @@
+From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001
+From: David Lutterkort <lutter@watzmann.net>
+Date: Fri, 4 Aug 2017 17:13:52 -0700
+Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing
+ whitespace in names
+
+When a name ended in whitespace, we incorrectly assumed it was always ok to
+trim that whitespace. That is not true if that whitespace is escaped,
+i.e. if the path expression is something like '/x\ '. In that case, the
+name really needs to be literally 'x ', i.e., we can not trim that
+whitespace.
+
+The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
+because we assume that '\' is always followed by a character inside the
+string, when we removed the escaping '\', we would read beyond the end of
+the intermediate string result; if we were lucky, that would lead to a
+crash, otherwise we'd continue with junk.
+
+We now make sure that escaped whitespace at the end of a string does not
+get stripped, avoiding all these headaches.
+
+Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
+---
+ src/pathx.c | 27 +++++++++++++++++++------
+ tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 80 insertions(+), 6 deletions(-)
+
+diff --git a/src/pathx.c b/src/pathx.c
+index d292cb30..9a2f9c76 100644
+--- a/src/pathx.c
++++ b/src/pathx.c
+@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) {
+ return 0;
+ }
+
++/* Return true if POS is preceded by an odd number of backslashes, i.e., if
++ * POS is escaped. Stop the search when we get to START */
++static bool backslash_escaped(const char *pos, const char *start) {
++ bool result=false;
++ while (pos-- > start && *pos == '\\') {
++ result = !result;
++ }
++ return result;
++}
++
+ /*
+ * NameNoWS ::= [^][|/\= \t\n] | \\.
+ * NameWS ::= [^][|/\=] | \\.
+@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) {
+ const char *s = state->pos;
+ char *result;
+
++ /* Advance state->pos until it points to the first character that is
++ * not part of a name. */
+ while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) {
+- /* This is a hack: since we allow spaces in names, we need to avoid
+- * gobbling up stuff that is in follow(Name), e.g. 'or' so that
+- * things like [name1 or name2] still work.
+- */
++ /* Since we allow spaces in names, we need to avoid gobbling up
++ * stuff that is in follow(Name), e.g. 'or' so that things like
++ * [name1 or name2] still work. In other words, we'll parse 'x frob
++ * y' as one name, but for 'x or y', we consider 'x' a name in its
++ * own right. */
+ if (STREQLEN(state->pos, " or ", strlen(" or ")) ||
+ STREQLEN(state->pos, " and ", strlen(" and ")))
+ break;
+@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) {
+ state->pos += 1;
+ }
+
+- /* Strip trailing white space */
++ /* Strip trailing white space. Make sure we respect escaped whitespace
++ * and don't strip it as in "x\\ " */
+ if (state->pos > s) {
+ state->pos -= 1;
+- while (isspace(*state->pos) && state->pos >= s)
++ while (isspace(*state->pos) && state->pos > s
++ && !backslash_escaped(state->pos, s))
+ state->pos -= 1;
+ state->pos += 1;
+ }
+diff --git a/tests/test-xpath.c b/tests/test-xpath.c
+index 3e418e5f..82986474 100644
+--- a/tests/test-xpath.c
++++ b/tests/test-xpath.c
+@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) {
+ return -1;
+ }
+
++static int test_trailing_ws_in_name(struct augeas *aug) {
++ int r;
++
++ printf("%-30s ... ", "trailing_ws_in_name");
++
++ /* We used to incorrectly lop escaped whitespace off the end of a
++ * name. Make sure that we really create a tree node with label 'x '
++ * with the below set, and look for it in a number of ways to ensure we
++ * are not lopping off trailing whitespace. */
++ r = aug_set(aug, "/ws\\ ", "1");
++ if (r < 0) {
++ fprintf(stderr, "failed to set '/ws ': %d\n", r);
++ goto fail;
++ }
++ /* We did not create a node with label 'ws' */
++ r = aug_get(aug, "/ws", NULL);
++ if (r != 0) {
++ fprintf(stderr, "created '/ws' instead: %d\n", r);
++ goto fail;
++ }
++
++ /* We did not create a node with label 'ws\t' (this also checks that we
++ * don't create something like 'ws\\' by dropping the last whitespace
++ * character. */
++ r = aug_get(aug, "/ws\\\t", NULL);
++ if (r != 0) {
++ fprintf(stderr, "found '/ws\\t': %d\n", r);
++ goto fail;
++ }
++
++ /* But we did create 'ws ' */
++ r = aug_get(aug, "/ws\\ ", NULL);
++ if (r != 1) {
++ fprintf(stderr, "could not find '/ws ': %d\n", r);
++ goto fail;
++ }
++
++ /* If the whitespace is preceded by an even number of '\\' chars,
++ * whitespace must be stripped */
++ r = aug_set(aug, "/nows\\\\ ", "1");
++ if (r < 0) {
++ fprintf(stderr, "set of '/nows' failed: %d\n", r);
++ goto fail;
++ }
++ r = aug_get(aug, "/nows\\\\", NULL);
++ if (r != 1) {
++ fprintf(stderr, "could not get '/nows\\'\n");
++ goto fail;
++ }
++ printf("PASS\n");
++ return 0;
++ fail:
++ printf("FAIL\n");
++ return -1;
++}
++
+ static int run_tests(struct test *tests, int argc, char **argv) {
+ char *lensdir;
+ struct augeas *aug = NULL;
+@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) {
+
+ if (test_wrong_regexp_flag(aug) < 0)
+ result = EXIT_FAILURE;
++
++ if (test_trailing_ws_in_name(aug) < 0)
++ result = EXIT_FAILURE;
+ }
+ aug_close(aug);
+ free(lensdir);
diff --git a/app-admin/augeas/files/cve-bunch-of-them-symlink.patch b/app-admin/augeas/files/cve-bunch-of-them-symlink.patch
new file mode 100644
index 000000000000..3bd1d95ae42d
--- /dev/null
+++ b/app-admin/augeas/files/cve-bunch-of-them-symlink.patch
@@ -0,0 +1,76 @@
+From 051c73a9a7ffe9e525f6f0a1b8f5198ff8cc6752 Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal@redhat.com>
+Date: Sat, 11 Aug 2012 20:39:14 +0100
+Subject: [PATCH] Fix regression in permissions of created files
+
+Commit 16387744 changed temporary file creation to use mkstemp, resulting in
+new files being created with 0600 permissions. For brand new files created
+through Augeas, their permissions stayed at 0600 rather than being set by the
+umask as before.
+
+ * src/transform.c (transform_save): chmod after creating new files to
+ permissions implied by the umask
+---
+ src/transform.c | 10 ++++++++++
+ tests/test-preserve.sh | 15 ++++++++++++++-
+ 2 files changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/src/transform.c b/src/transform.c
+index a3acd10..1ca3d5f 100644
+--- a/src/transform.c
++++ b/src/transform.c
+@@ -1096,6 +1096,16 @@ int transform_save(struct augeas *aug, struct tree *xfm,
+ err_status = "xfer_attrs";
+ goto done;
+ }
++ } else {
++ /* Since mkstemp is used, the temp file will have secure permissions
++ * instead of those implied by umask, so change them for new files */
++ mode_t curumsk = umask(022);
++ umask(curumsk);
++
++ if (fchmod(fileno(fp), 0666 - curumsk) < 0) {
++ err_status = "create_chmod";
++ return -1;
++ }
+ }
+
+ if (tree != NULL)
+diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh
+index 042dab9..9719ac6 100755
+--- a/tests/test-preserve.sh
++++ b/tests/test-preserve.sh
+@@ -59,9 +59,12 @@ if [ $selinux = yes -a xetc_t != "x$act_con" ] ; then
+ exit 1
+ fi
+
+-# Check that we create new files without error
++# Check that we create new files without error and with permissions implied
++# from the umask
+ init_dirs
+
++oldumask=$(umask)
++umask 0002
+ $AUGTOOL > /dev/null <<EOF
+ set /files/etc/hosts/1/ipaddr 127.0.0.1
+ set /files/etc/hosts/1/canonical host.example.com
+@@ -71,6 +74,16 @@ if [ $? != 0 ] ; then
+ echo "augtool failed on new file"
+ exit 1
+ fi
++if [ ! -e $hosts ]; then
++ echo "augtool didn't create new /etc/hosts file"
++ exit 1
++fi
++act_mode=$(ls -l $hosts | cut -b 1-10)
++if [ x-rw-rw-r-- != "x$act_mode" ] ; then
++ echo "Expected mode 0664 due to $(umask) umask but got $act_mode"
++ exit 1
++fi
++umask $oldumask
+
+ # Check that we create new files without error when backups are requested
+ init_dirs
+--
+1.8.5.1
+
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
new file mode 100644
index 000000000000..2b1c8d903c2b
--- /dev/null
+++ b/app-admin/augeas/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>prometheanfire@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+A library for programmatically editing configuration files. Augeas parses
+configuration files into a tree structure, which it exposes through its
+public API. Changes made through the API are written back to the initially
+read files.
+
+The transformation works very hard to preserve comments and formatting
+details. It is controlled by ``lens'' definitions that describe the file
+format and the transformation into a tree.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
new file mode 100644
index 000000000000..5137ed4882f3
--- /dev/null
+++ b/app-admin/authbind/Manifest
@@ -0,0 +1,6 @@
+AUX authbind-2.1.1-respect-flags.patch 808 SHA256 675d15902e9c7de3ec83c5ff79d4161fa96d58fd4ba788a58862856b21e4b904 SHA512 5c22805ee442cfa76e59e11a7614acaddfc6c38a316c290e147a159a221baf3ca44b44135bf4862031faacbc1c913c97a8a95f000ffcd33688021ece7df19750 WHIRLPOOL dc481f30197f285b0b4dd5689bcc4925eb84f126b76fe206d431b57859707ed5b21e8c9fad554a340b8c22d9599dc614202ca4cbf15e3693273e99f0095b6f73
+DIST authbind_2.1.1.tar.gz 14407 SHA256 65b26b83b7ca5aa713524e0aff439f71a0ba8970913768457a22239540a9c73a SHA512 f3a45fcf1d8d6e6762bc1cef7a1b89f211e4af56c68b4c6c5e508a2f7ee039499b8b2f11ce8aeb94822d20377d309035760fa7b58aabaa4e87417ca25811c812 WHIRLPOOL 55098ccd252073403ef88546559bb5fcb268daed06501e82e1b79ab0ce63ea4eaff7335fb40a9d07342947a41e14a1432b53d082f1d8bca9d61bd8b17cabe0d1
+EBUILD authbind-2.1.1.ebuild 1179 SHA256 822ed1c54f483944ffd30d30fbf5a8af7b5468207d8b8f746a197ca5f50590c4 SHA512 777f23b0e2d3999a73f8262659d92a45c9f99d51e439650bdf50a124288afccdd153de74f97c4b1253cea9029a785f3342ba2c495f6d67a52ebe727504293fce WHIRLPOOL eb088bb786423fbea83136ada01001b2f10c7d1cc8843e213ef24ef71b3370da4001edeb51b4aecbf5285375177eb6d1e3f5948601f777d1f417c93b2e41d1a0
+MISC ChangeLog 2223 SHA256 174e0cb13f7152cef1c782fea0b8b404554940daa1b914d7abb27af08d8c758c SHA512 87080de355da2cea17064d8f862ff35a15dcad67f3471cd7e9dddb4608e26d9a957a51a57037b94fef52a49dd8f204ee7f83e41b887fc6fbe13e0fa5b159e225 WHIRLPOOL daf519a1dec170749578c113a2dbd088a2ad147e2cf7136ca23c4e1c0e8c777263f3dcf7b5d17605f34cce33299bbc2bc8031464be2d6371ef4ff21be78a9c7a
+MISC ChangeLog-2015 434 SHA256 1617823b07078d088e7cf5c115ef22d6d3ad5ec9d88687d288539ee2272147c4 SHA512 524b68827cb8f460094262ce07d9a99ef702b490fb5f518dde5195c7153d8a5ed2ad1f2cd95b4aad7f0cbfe2d0bc21ece5ebdc72396ff6cff3fe48fdd6f26566 WHIRLPOOL 402bf1368d16d478e6fc66ebf3969828b7d847fec3020132d497f96258e1cfc233bd658520dc575fecd6ac88173b9bddfa847b4bc17c30918cdb1acf8230c6c9
+MISC metadata.xml 250 SHA256 e950c68e7a4e72f8096556d6bb21fea300438999061af252e040672516b06351 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343 WHIRLPOOL 7804a583de98e5ebb9478b76dd2a78071f8fe6973d88692ae4ec9107dd1dd7c54fd11baf66339a9ad4267da708ffaae3d8b1d0bf332db2d5db9feac46b6856f1
diff --git a/app-admin/authbind/authbind-2.1.1.ebuild b/app-admin/authbind/authbind-2.1.1.ebuild
new file mode 100644
index 000000000000..c7a9890aa7ce
--- /dev/null
+++ b/app-admin/authbind/authbind-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Bind sockets to privileged ports without root"
+HOMEPAGE="http://www.chiark.greenend.org.uk/ucgi/~ian/git/authbind.git/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-respect-flags.patch"
+}
+
+src_configure() {
+ sed -i \
+ -e "s|^prefix=.*|prefix=/usr|" \
+ -e "s|^lib_dir=.*|lib_dir=\$(prefix)/$(get_libdir)|" \
+ -e "s|^libexec_dir=.*|libexec_dir=\$(prefix)/libexec/authbind|" \
+ -e "s|^SHARED_LDFLAGS=.*|SHARED_LDFLAGS=$(raw-ldflags)|" \
+ Makefile || die "sed failed"
+
+ sed -i \
+ -e 's|/usr/lib|/usr/libexec|' \
+ authbind-helper.8 || die "sed failed"
+}
+
+src_install() {
+ dobin authbind
+ doman authbind.1 authbind-helper.8
+
+ ln -s libauthbind.so.* libauthbind.so.$(awk -F= '/MAJOR=/ { print $2 }' < Makefile)
+ dolib.so libauthbind.so*
+
+ exeinto /usr/libexec/authbind
+ exeopts -m4755
+ doexe helper
+
+ keepdir /etc/authbind/by{addr,port,uid}
+
+ dodoc debian/changelog
+}
diff --git a/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
new file mode 100644
index 000000000000..2a9eb5f6b84c
--- /dev/null
+++ b/app-admin/authbind/files/authbind-2.1.1-respect-flags.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index c1eed73..932ea60 100644
+--- a/Makefile
++++ b/Makefile
+@@ -34,10 +34,9 @@ INSTALL_PROGRAM ?= install -o root -g root -m 755 -s
+ INSTALL_DIR ?= install -o root -g root -m 755 -d
+ STRIP ?= strip
+
+-OPTIMISE= -O2
+-LDFLAGS= -g
+ LIBS= -ldl -lc
+-CFLAGS= -g $(OPTIMISE) \
++SHARED_LDFLAGS=
++CFLAGS+= \
+ -Wall -Wwrite-strings -Wpointer-arith -Wimplicit \
+ -Wnested-externs -Wmissing-prototypes -Wstrict-prototypes
+ CPPFLAGS= -DMAJOR_VER='"$(MAJOR)"' -DMINOR_VER='"$(MINOR)"' \
+@@ -82,7 +81,7 @@ helper: helper.o
+ helper.o authbind.o: authbind.h
+
+ $(LIBTARGET): libauthbind.o
+- ld -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
++ $(LD) $(SHARED_LDFLAGS) -shared -soname $(LIBCANON) -o $@ $< $(LIBS)
+
+ clean distclean:
+ rm -f $(TARGETS) *.o *~ ./#*# *.bak *.new core
diff --git a/app-admin/authbind/metadata.xml b/app-admin/authbind/metadata.xml
new file mode 100644
index 000000000000..5c23291b5215
--- /dev/null
+++ b/app-admin/authbind/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>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-as-tools/Manifest b/app-admin/aws-as-tools/Manifest
new file mode 100644
index 000000000000..6b93097fa41d
--- /dev/null
+++ b/app-admin/aws-as-tools/Manifest
@@ -0,0 +1,5 @@
+DIST AutoScaling-1.0.49.1.zip 12387808 SHA256 8273186a025c465ca3b69523c50f114dc6c2cececb2c9e8b8d6c6eb886dd97a3 SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed WHIRLPOOL 99c6daa8d5cfa00d26cc43c03406824897e960b1d13d49540a4e8f829d8abba18bd15f1e63a67f9e408973eb74af59ed3769f2aad806496ed163bcbd13f1df1d
+EBUILD aws-as-tools-1.0.49.1.ebuild 1727 SHA256 783c0095536fe4d3e0b21925627ffa864684ad10a88e994f0f9dab09b9cc4364 SHA512 62d8cc6ecab9d676e563642c2acbc6d3a89758d45c0aec9014d5a5c710ea9616405096ece2ab8c6f96df7ec4ee8122795e6916a07eca13790f9667aa6492b7c0 WHIRLPOOL 0ee847738e7f0ea715acabbfda2bdcd8eb89247cf772518a1df2416148302d07ca8a9637075db4abeec3619908346038480c5c651b640a362041cf192cde448f
+MISC ChangeLog 2716 SHA256 fa82d37e5c357de2a77a382040021dd819c4f9448c9ee506c07a75b1c848f98e SHA512 f29f38f1e71ed631a5c94017d0389c4119bb782e5adceea033f960a044c753b04295a396eb9a4398aaf0437df003ce98531fd1fc410c68cccd1a91d33b14755d WHIRLPOOL da06b0e6575221a3c410e392fb059d8513385f4ef52ed1c3258a9ddce50ab194d6c4fbe93b307ad39a81797c8e63f3149af2615cdd20747a8278dab7886ec234
+MISC ChangeLog-2015 476 SHA256 4f5e28ae2e531fe23bd35c97bf6a794a7ed5f443583baa2d285844202abc5ee9 SHA512 0f066a4e2bcd84a54ac389aa2749896085ce6a982e60e33b52309eda572819eb50334ccf49fc3fd628a77446abdea39a0067165ea7c1eb8283a37e20e5fb6de6 WHIRLPOOL 2be79fd679dad6d704e517bd20f1b6f539171a609567e855d1449bca8d262339c075420e3710bdab967d47a4ba4decfc9cbc1a329cf61189af98759bd94d3c84
+MISC metadata.xml 456 SHA256 7a4c38c99f18a4aaa5929fa65d9b943134b95f7a207c4bf41991b1c26cc9380e SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8 WHIRLPOOL 832b7ad5979eacbdb07d1d635397656cd3310cb2f0b307c314735b0c6cdd11e577eb37175e52cc656f0b02c3af0cab52400ae002025d7230ab3f67cdba6cc976
diff --git a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
new file mode 100644
index 000000000000..38450b0e2f07
--- /dev/null
+++ b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="The API tools serve as the client interface to the Auto Scaling web service"
+HOMEPAGE="http://aws.amazon.com/developertools/2535"
+# SRC_URI="http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip"
+SRC_URI="mirror://sabayon/app-admin/AutoScaling-1.0.49.1.zip"
+
+S="${WORKDIR}/AutoScaling-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ find . -name '*.cmd' -delete || die
+ rm bin/as-cmd-2009-05-15
+ rm bin/service-2009-05-15
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_AUTO_SCALING_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "THIRDPARTYLICENSE.TXT"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
new file mode 100644
index 000000000000..efd934a2bf23
--- /dev/null
+++ b/app-admin/aws-as-tools/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>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-cw-tools/Manifest b/app-admin/aws-cw-tools/Manifest
new file mode 100644
index 000000000000..079b2d2ae0a9
--- /dev/null
+++ b/app-admin/aws-cw-tools/Manifest
@@ -0,0 +1,5 @@
+DIST CloudWatch-1.0.12.1.zip 6156651 SHA256 9dfec389bda10600b68ed9a77a16fd0a9c4279421e1de2848c65c35a20e4b50e SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec WHIRLPOOL 572dbc99d25f021d08efb2668ee582d83d55bcf8d68e18902dfd507e80083eb4de2562b8a0f0b7f5cf83ff30d6080f399f49de6e2a060eef37a0ac78eb7de006
+EBUILD aws-cw-tools-1.0.12.1.ebuild 1671 SHA256 39b98ca36c254c2c7687c757331a1f80ce75e12768813301b00afb2397adcc41 SHA512 8cdfae8dec09e84c76e0b29bf308ac7d59ddf29b5978c24a515ef83671d964410d2aae8a7fef7d960780f865303998bddc94f161826847ad4c38373a79ca1209 WHIRLPOOL 02bfadfe5c7ca645cf940cc032d61d9c43d45b0b7a12651bb47add3d08da903aa76b4c740a090d9fa596505b9ff550a1f620535039cb1c6f620f0c2f1412a927
+MISC ChangeLog 2716 SHA256 21ad5cd87366c33153781162ee91e2b68ea2c8f16158a90e94f400df15d20a1b SHA512 fd194a5a06f5395982a9970e8b590df7dec5d980164fa0e094425298c5883de59b72daa91be5e8897f1ab01cff6da7df668dc840eb42f4c0e178a1c18fcfa17b WHIRLPOOL d05c558b9814e65eb92b6eb3ee3317bcb5fbde9113061357e47f6749c864ab04ae82d449bfd61e1ad7a327ab09b8c7878275688f27a933a20053f76a77aeec33
+MISC ChangeLog-2015 476 SHA256 d38f9c9666d2a3ce7b9df1d25db6956a87591cb2c7916b9c4a1cb37dd64270a0 SHA512 a9cda0356df49e941efaae0cc12d39c7b2b04a55913cf12ffe5b4f416a6dd4ba49c90b4fee7dc9b00acb46102b3aebaa62010aa11e99d27c824675c6861dbf40 WHIRLPOOL 56a39303b5b8b434ba89a073b2d21cb42d44a5cc9ebe7d80c1fe04dc2fe01682bb9eabed9066526aa41e5119bbe67713043b962f96a440d410abc434f2485b09
+MISC metadata.xml 456 SHA256 7a4c38c99f18a4aaa5929fa65d9b943134b95f7a207c4bf41991b1c26cc9380e SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8 WHIRLPOOL 832b7ad5979eacbdb07d1d635397656cd3310cb2f0b307c314735b0c6cdd11e577eb37175e52cc656f0b02c3af0cab52400ae002025d7230ab3f67cdba6cc976
diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
new file mode 100644
index 000000000000..cef181338339
--- /dev/null
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
+HOMEPAGE="http://aws.amazon.com/developertools/2534"
+# SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
+SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
+
+S="${WORKDIR}/CloudWatch-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack ${A}
+ cd "$S"
+ find . -name '*.cmd' -delete || die
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_CLOUDWATCH_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "THIRDPARTYLICENSE.TXT"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml
new file mode 100644
index 000000000000..efd934a2bf23
--- /dev/null
+++ b/app-admin/aws-cw-tools/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>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
new file mode 100644
index 000000000000..dfa6ec2c8419
--- /dev/null
+++ b/app-admin/aws-elb-tools/Manifest
@@ -0,0 +1,6 @@
+DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 SHA256 4b1f25de9be87ae1340426de58d966712b86baadd947ee9014d03784bcc0b5a7 SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725 WHIRLPOOL b7b4d0eb103c845c887525dd33b4308ee1553b46d3d709db1231cbd972824bc99264f4f48c1229620cb27ba75ae53b8e2255fd75fc1f5c0cf8473a74b95de4a9
+EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1597 SHA256 b23f93c894dcfab4b4f883604648c8b454735d3b94f919e3304fce3020dc1fa5 SHA512 e6713f7b785b47814b20b7bb27c5c87183f30ebca7622de0de778fa9dcb716a69c5a54f177ada999b266a8df081fdf8aab1fcbfe08d8225acd111572c1c04d19 WHIRLPOOL 618ef6b0b156b77976c9373be2995c52b3c5cf97f5b75fc6dcd7c057560afe938d7a94307782c8375a293198175fb9aa208bfb00a4939d7781231ad8e077e4dc
+EBUILD aws-elb-tools-1.0.15.1.ebuild 1611 SHA256 00fe3593c434f5425a5746d6c94ea5696a706a95857df564912fc64827ace832 SHA512 5cf3b2bd5ff8c580d3adf1d144a01402cf55487ebd62ec25e9e2aaffacf32106eaa2e70b6be46a9bd6a125f8580ef2c295992651d410619f80a127f949b9ca0e WHIRLPOOL a98a4e608dd337b625892f9dc13dfe3bcdc6154bb539cb2963b970e21ba1bd1fbbad5f69b46de1ed21eb61d34cc8dc47c719729916e065add6304a6f7e22bfa5
+MISC ChangeLog 2762 SHA256 0b54e91a9e6102942bc7c7bdd9161aee755ff3642acc8b25b8e6368a41893353 SHA512 82eff7e5e02d4672adf918605f89a19d0d45e41dbf3ea3288f5a3d2b9e04d2c3858f7109c902feb3f50215f75254c8c0ac74c0adacd9ee4056b7c9658bbb4239 WHIRLPOOL 4133aff9b8c77122abdd9b2c2d395a48496ba0c39d16a2d70d1279c83f461f732bad4c932e9b6bd35d010e9b04e23d7bf2ca5e000cc5c601dfe02575b5a8fd67
+MISC ChangeLog-2015 571 SHA256 84c0ff2a410153309e037782397d838c058c09c255ef7e2478652c649cff6df8 SHA512 b34a63403d3863331c7240858f964f58aab0c790a6bba348b8babba62fc3f868b5b645c135f99d622e62fb1b1bd42c6393dd67aec7ce85f0cf3f3550f56a59cc WHIRLPOOL f13597f216feacd6d3eba67a2399fffcd0e0f08b9ba818481cf3ab60f5789a32f7966fc63140d2397b01aeb46117b936184ff0ab429898ce8f9848c12e1f2bbc
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
new file mode 100644
index 000000000000..c1738a3ffad9
--- /dev/null
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service"
+HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
+SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
+
+S="${WORKDIR}/ElasticLoadBalancing-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_prepare() {
+ default
+ find . -name '*.cmd' -delete || die
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_ELB_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "THIRDPARTYLICENSE.TXT"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
new file mode 100644
index 000000000000..23ee15e13fe6
--- /dev/null
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service"
+HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
+SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
+
+S="${WORKDIR}/ElasticLoadBalancing-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack ${A}
+ cd "$S"
+ find . -name '*.cmd' -delete || die
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_ELB_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "THIRDPARTYLICENSE.TXT"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-elb-tools/metadata.xml b/app-admin/aws-elb-tools/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/aws-elb-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-admin/aws-iam-tools/Manifest b/app-admin/aws-iam-tools/Manifest
new file mode 100644
index 000000000000..ee46282b47d7
--- /dev/null
+++ b/app-admin/aws-iam-tools/Manifest
@@ -0,0 +1,5 @@
+DIST IAMCli-1.3.0.zip 3957057 SHA256 4878b19d889dab063d09f724b342b67fb872843ac60c1105a77cf2f6610908d1 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c WHIRLPOOL b228ce1cf048eed4e1cd9679510184321657a47491d8215b624db37345cadebf3f61325556e52e65fea8f622cbc611f0a126f92e9061d51e7486589c9829374f
+EBUILD aws-iam-tools-1.3.0.ebuild 1623 SHA256 b899c8e94d785cdaadd3df3e569f0ad560e90511645905a79c4a6d647561f05a SHA512 db74dd4808fa98ba9b80a661d6da4a9a967e77b1aa98cd5fcaa4e5078eb0f97431596b8f30cb9d27cc4256808d14c712a0fc5f2219594bc46f3551e7b1536cbc WHIRLPOOL 7d7b67bb35606a5fd91342acee9cd3a9c8f243cd1364f0233cc3e3684e9426ee1bd1562f8821110849ba50aa7be7e7d741c0a3dfc5a8250932b4ef0965eabddd
+MISC ChangeLog 2713 SHA256 9a59bf47886229ba4442be9cb5a05f9a649932162b00344bf4451b2a3f16cdb2 SHA512 f3b6d70d8fb4474f69bb48f4c0b03207cda801a449de3d53a2311f727d4b4e41243ca5d16ec5eabcefaa50dbb56d1d4fe193a92bb483aa1501f8233ef71eb9b6 WHIRLPOOL 2b9bf9025a832e7a5646c2da405b7d1e72e5bfb4c42b0b7ee996303ab895c434cddf718ce614d108e302cb718fbe3f8b23106bbd0d07d74ed72bb5c22f67693b
+MISC ChangeLog-2015 474 SHA256 52c0b1b32cc3b042243b971c3f91b8f9c70de635cc12630eba15e4890b6d4ef2 SHA512 500c892b1563490e736df2c4b73f80a93f5de263ecbcb811e369b18854211efdc65b67189857eb290f2d94e317ca03524b50339023093617429159b941fa321c WHIRLPOOL 0421182596d5243ee82599da1dd51167a89343fa56f0bc5fe0767d654dfd9131b7a39b6144a47711a6370968ef199a415859cc37cd744efb31892207708d196b
+MISC metadata.xml 456 SHA256 7a4c38c99f18a4aaa5929fa65d9b943134b95f7a207c4bf41991b1c26cc9380e SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8 WHIRLPOOL 832b7ad5979eacbdb07d1d635397656cd3310cb2f0b307c314735b0c6cdd11e577eb37175e52cc656f0b02c3af0cab52400ae002025d7230ab3f67cdba6cc976
diff --git a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
new file mode 100644
index 000000000000..e70c4d29a090
--- /dev/null
+++ b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="The Command Line Interface for the AWS Identity and Access Management Service"
+HOMEPAGE="http://aws.amazon.com/developertools/AWS-Identity-and-Access-Management/4143"
+SRC_URI="mirror://sabayon/${CATEGORY}/IAMCli-${PV}.zip"
+
+S="${WORKDIR}/IAMCli-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack ${A}
+ cd "${WORKDIR}/IAMCli-${PV}"
+ find . -name '*.cmd' -delete || die
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_IAM_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "LICENSE.txt"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
new file mode 100644
index 000000000000..efd934a2bf23
--- /dev/null
+++ b/app-admin/aws-iam-tools/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>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-rds-tools/Manifest b/app-admin/aws-rds-tools/Manifest
new file mode 100644
index 000000000000..873fc2cd34b6
--- /dev/null
+++ b/app-admin/aws-rds-tools/Manifest
@@ -0,0 +1,5 @@
+DIST RDSCli-1.6.001.zip 6291974 SHA256 2261aa6b89b7e22eefde751eeb7060f864efd64b494fdf43e5b8e9d2a1391087 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963 WHIRLPOOL 8e73ff6cfa3ce5f32ad79f73e5e295f725f6adc75997bcd3a76b52a76de631a7eb2e3bd504ad6190785b7bf713951340ef7adb0e417fb5027c4cf974dcab43bd
+EBUILD aws-rds-tools-1.6.001.ebuild 1567 SHA256 fe28e96fc6a465d16557608c7af19f2b9277841443e71c40d5d764720a5cd0a9 SHA512 f42e7bdb03c95d5833a3181369bc97dfca1ef2458bcd0faa124b8a33609852b8d52985361620dbe9bc3c20aa3441e652416799014cbe78cdbfe35506372449ad WHIRLPOOL 8127fbd6919128711665746b281632084933a16e08c7371fa55aacb0f4e1b1a0401cda06ece21f841fe37caca1ed6cfb77396ad063a4ad70600220dad356ca6c
+MISC ChangeLog 2717 SHA256 00369eaec38625e543d918f191dbe0d0828add0a89d0078305b3a0d9b53538e1 SHA512 b2d638ff068094903c3cdca33676c7f4ec456a69f41db06ac569decdca8ccc43cc6cbe10ef227115817922a97da1915217b5800eda2316a6276ab10f4c81cf1c WHIRLPOOL 1c7de012012b71d0281d93513a6c4740711d781eb271ce83f5ce173eb38ae06e0b0de58d7150f0f618de055da95f1de942de9a92f38fe5c727157eb89e85156a
+MISC ChangeLog-2015 478 SHA256 2d59171439703869676a6cf0addf29cc52898beb85ca8d2542604e83da3537b8 SHA512 5b9aa7601a867ba92e0d829f9bdc5a703cb3f4298e980447fe3d83efdbd069639ab490706dfd8862247801ba3ade5989d7a058c0f0566f98545b1dda06a9bf64 WHIRLPOOL aad25875282b9208da9f3074a0ccd01c367f54cd9622c56abbb1abfc17267e6bd93f5187757a3c1d39451e71b52d0b52c3ad00af14819f6242e820a8ffbb4c41
+MISC metadata.xml 456 SHA256 7a4c38c99f18a4aaa5929fa65d9b943134b95f7a207c4bf41991b1c26cc9380e SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8 WHIRLPOOL 832b7ad5979eacbdb07d1d635397656cd3310cb2f0b307c314735b0c6cdd11e577eb37175e52cc656f0b02c3af0cab52400ae002025d7230ab3f67cdba6cc976
diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
new file mode 100644
index 000000000000..4d0cfb2e1d01
--- /dev/null
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="The Command Line Toolkit for the Amazon Relational Database Service"
+HOMEPAGE="http://aws.amazon.com/developertools/2928"
+SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
+
+S="${WORKDIR}/RDSCli-${PV}"
+
+LICENSE="Amazon"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/jre"
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack ${A}
+ cd "$S"
+ find . -name '*.cmd' -delete || die
+}
+
+src_install() {
+ dodir /opt/${PN}
+ insinto /opt/${PN}/lib
+ doins -r "${S}"/lib/*
+ exeinto /opt/${PN}/bin
+ doexe "${S}"/bin/*
+
+ dodir /etc/env.d
+ cat - > "${T}"/99${PN} <<EOF
+AWS_RDS_HOME=/opt/${PN}
+PATH=/opt/${PN}/bin
+ROOTPATH=/opt/${PN}/bin
+EOF
+ doenvd "${T}"/99${PN}
+
+ dodoc "THIRDPARTYLICENSE.TXT"
+}
+
+pkg_postinst() {
+ ewarn "Remember to run: env-update && source /etc/profile if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)"
+ elog
+ elog "You need to put the following in your ~/.bashrc replacing the"
+ elog "values with the full path to your AWS credentials file."
+ elog
+ elog " export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
+ elog
+ elog "It should contains two lines: the first line lists the AWS Account's"
+ elog "AWS Access Key ID, and the second line lists the AWS Account's"
+ elog "Secret Access Key. For example:"
+ elog
+ elog " AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
+ elog " AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
+}
diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml
new file mode 100644
index 000000000000..efd934a2bf23
--- /dev/null
+++ b/app-admin/aws-rds-tools/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>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
new file mode 100644
index 000000000000..2de5e5b71e63
--- /dev/null
+++ b/app-admin/bastille/Manifest
@@ -0,0 +1,10 @@
+AUX bastille-3.0.9-openrc.patch 650 SHA256 6d7423d686f3f53785ae7ceca4521676956acadec85fa519b4aeb7793c985f66 SHA512 fe880f40185d129fef192a5a4e98e891691087958382d7ac8fa05612fea7f24d8116f0787796b1a1a1dab31d54d1bef52a59cdcf3213feae384e7c838a9801cf WHIRLPOOL 2e3df0d2706f309e786f33cec45cb3db8f60e7de0078ead3655e8d04cb302d5387829a7ee389a998c3ea25bf3ebf76185b25c4c5230b41f455ea24863f1c45c2
+AUX bastille-3.0.9-perl.patch 1049 SHA256 c7c6e711fef165698681f65f070f903d2f1b746554b9acdf34897491d65daf01 SHA512 23446f6ca65fa4b164b6dd688eb31a957cf76ce5017c4b74b4bcf402091811e1b2b51a55957c6bf6de5b7f6b7f58a9f651c7f85b760b5d270ec9280eab405dfd WHIRLPOOL 4331f1ba82fff3b2b9612cf70d38bf830d9ac7550656d960d63df51111fa2f44c30c2792d5eb192c9fa70d1eb20bf21bfd129d5b4946dab75d839efac37f87eb
+AUX bastille-3.0.9-renamewidgets.patch 2015 SHA256 00a8a6aa7b966a5603c9dc50e9976d29786b1527e0f49bf955c35b6663df6c13 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92 WHIRLPOOL 468740ef61427adaecb96d3b991d732031c879dd1f3bb77d0fa94d8b4e0e1533bfb2952ab9ee17aba1a03f07e8ab4714b1cf49c0eafb19119b42e767b587661b
+DIST Bastille-3.0.9.tar.bz2 319045 SHA256 1fd66ef724441a36459d5f937ce76c3bb9f7ccc9584d318a916ff59f709fc02d SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0 WHIRLPOOL 5e2044814844d6779dcdd9d8154696502936a73fd599f630c18ff218b32c75edb094a3c3b50ec496d6db05a0569f3df08f423f65f86ca4de98bca3888aac48b6
+DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 SHA256 91773f8fda6aa67dd87c4451f04ed525965c7408590281b960a3e717ff57880c SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f WHIRLPOOL 624d539d140b540e29e453d178afd23f6ba8d8f1584309852eee2f73c179f1d8e5eb907ddaddc939c4b47a5581400956c7c5a17fb9c039ed54cda49d22144c00
+EBUILD bastille-3.0.9-r1.ebuild 1526 SHA256 4aa7a235dd2cffd91e75a97e78b028708e4dccdc2956d6a7914aaf5c5dad1f11 SHA512 0230bf041a3845924250baf7046b0c3ec76daa36c47768075a57f792925ad5af958e6a912b88e0ac087d7f8dffd0d1c81651965861ceefd01698177dd605f728 WHIRLPOOL 29756e71e50af8de1a0c4cb6311979261a9bf81badbe5ec5ba753e5b012805e3c78f92716ec442589572090466a26eb6e9bd3c0c34b41e72e08b0ec52928a40b
+EBUILD bastille-3.0.9-r2.ebuild 1713 SHA256 a7b4de231b258d5224f289f216f5880aff262304c7eb15c60c50d483417776b9 SHA512 42259f52dd049db2686deffa101cdaf71d2ad29321a057b4c2e7578f369199d9d2bdf53ffa04d83deaa81629dca535870e905680f91f5ffba290daef69f874aa WHIRLPOOL 97edc2d6c1a535f488bb7739b8e7b8951cbf0cd66629518d464c05d5851d8d8a4cab8597661b496454698b6f366930735194b996f0f400f3b4b454b173b525b4
+MISC ChangeLog 2624 SHA256 ecb0135898dd8de952349b2d65f822f97a8ecb09433528d5aefa0efac6c01e92 SHA512 f95fe96d97e076d41cc0f6cb21cafe4c5f90ecf384cbe36817a4e86c9fe6a82ced0ed4b850b6ac606eae170778c0c4685f79171699f1f70461b0f59d9d257394 WHIRLPOOL 9422e5d69bb427ad42f6c86653ca3b243f6dd63728bfc2a6da5a5d468fe464741bec4f03b7c8e20014541250ac750d3acc187bb5a3271e022c00802bc112784c
+MISC ChangeLog-2015 5640 SHA256 fbd827d467654d643d6e91221c4474c1cc8c56929de91b5f116976395a93bde9 SHA512 4b70e31e87f8bf68029ba670a1959044dfd32b771a652cece54771749cbf303f2e4896a513306bac10c49c71fdf20d20bbbb09f87e3bf193fe3c3f2c9c24d5d9 WHIRLPOOL 4917d59e55f3e1f1298092871be3fb654c9765c0a6fc5b313d57f27a7ae4a5fe04824655dc4d2e98f13507da0d7b0a7153dfece249c482e5c4bc57da94264e50
+MISC metadata.xml 459 SHA256 0a87e2938efc01ed0f93300681c73ba472c2b72b457cc750e40104565c0e5651 SHA512 5c339c93e1aba939528018b1b4a6f21b3f87c93efc60471300064c85c9c0723474fcd5092d6367b02ac1d21564451b319f4ba6c261fa890def1e58a1647f4fc9 WHIRLPOOL 9e18b5108c1c09148a0d3de2fe49a0b33f3e343a86a668979b9d878851970b86b410d6496a0c246e91a5c340911ae9476d115c52737b7f8fc1cd671972f451d0
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..cfdc9cf09dcd
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+PATCHVER=0.2
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+ mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+RDEPEND="
+ net-firewall/iptables
+ app-admin/logrotate
+ dev-perl/Curses
+ net-firewall/psad
+ X? ( dev-perl/Tk )
+ virtual/logger
+"
+
+src_prepare() {
+ epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+ # make sure the Perl modules go into vendor dir
+ epatch "${FILESDIR}/${P}-perl.patch"
+ perl_set_version
+
+ cd "${S}"
+ chmod a+x Install.sh bastille-ipchains bastille-netfilter
+}
+
+src_install() {
+ perl_set_version
+ export VENDOR_LIB
+
+ cd "${S}"
+ DESTDIR="${D}" ./Install.sh
+
+ # Example configs
+ cd "${S}"
+ insinto /usr/share/Bastille
+ doins *.config
+
+ newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+ # Documentation
+ cd "${S}"
+ dodoc *.txt BUGS Change* README*
+ cd "${S}"/docs
+ doman *.1m
+}
+
+pkg_postinst() {
+ elog "Please be aware that when using the Server Lax, Server Moderate, or"
+ elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+ elog "to set any advanced network information, such as masquerading and"
+ elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
new file mode 100644
index 000000000000..0e2b22c76c1a
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-functions
+
+PATCHVER=0.2
+MY_PN=${PN/b/B}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}
+DESCRIPTION="Bastille-Linux is a security hardening tool"
+HOMEPAGE="http://bastille-linux.org/"
+SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
+ mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="X"
+
+RDEPEND="
+ net-firewall/iptables
+ app-admin/logrotate
+ dev-lang/perl:=
+ dev-perl/Curses
+ net-firewall/psad
+ X? ( dev-perl/Tk )
+ virtual/logger
+"
+
+PATCHES=(
+ "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
+
+ # make sure the Perl modules go into vendor dir
+ "${FILESDIR}/${P}-perl.patch"
+
+ # prevent file collision, bug 536292
+ "${FILESDIR}/${P}-renamewidgets.patch"
+
+ # openrc runscript rename
+ "${FILESDIR}/${P}-openrc.patch"
+)
+
+src_prepare() {
+ perl_set_version
+
+ default
+
+ cd "${S}" || die
+ chmod a+x Install.sh bastille-ipchains bastille-netfilter || die
+}
+
+src_install() {
+ perl_set_version
+ export VENDOR_LIB
+
+ cd "${S}" || die
+ DESTDIR="${D}" ./Install.sh || die
+
+ # Example configs
+ cd "${S}" || die
+ insinto /usr/share/Bastille
+ doins *.config
+
+ newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
+
+ # Documentation
+ cd "${S}" || die
+ dodoc *.txt BUGS Change* README*
+ cd "${S}"/docs || die
+ doman *.1m
+}
+
+pkg_postinst() {
+ elog "Please be aware that when using the Server Lax, Server Moderate, or"
+ elog "Server Paranoia configurations, you may need to use InteractiveBastille"
+ elog "to set any advanced network information, such as masquerading and"
+ elog "internal interfaces, if you plan to use them."
+}
diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
new file mode 100644
index 000000000000..08d0a04fa480
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
@@ -0,0 +1,12 @@
+diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init
+--- Bastille.orig/bastille-firewall.gentoo-init 2017-01-02 09:47:33.144433650 +0100
++++ Bastille/bastille-firewall.gentoo-init 2017-01-02 09:49:05.396431757 +0100
+@@ -1,6 +1,6 @@
+-#!/sbin/runscript
++#!/sbin/openrc-run
+ # Copyright 1999-2004 Gentoo Foundation
+-# Distributed under the terms of the GNU General Public License v2
++# Distributed under the terms of the GNU General Public License v2
+ # $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/files/bastille-3.0.2-firewall.init,v 1.1 2005/07/31 05:21:10 battousai Exp $
+
+ opts="start stop"
diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch
new file mode 100644
index 000000000000..ab109093bc14
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-perl.patch
@@ -0,0 +1,25 @@
+diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
+--- Bastille-gentoo-2/Install.sh 2014-12-09 23:05:55.674808824 +0100
++++ Bastille/Install.sh 2014-12-09 23:17:25.907847419 +0100
+@@ -3,7 +3,7 @@
+ umask 077
+
+ mkdir -p ${DESTDIR}/usr/sbin
+-mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
+ mkdir -p ${DESTDIR}/usr/lib/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille
+ mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
+@@ -13,9 +13,9 @@
+
+ cp AutomatedBastille ${DESTDIR}/usr/sbin/
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+-cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
+-cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
++cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
++cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
new file mode 100644
index 000000000000..2cf303a548dc
--- /dev/null
+++ b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
@@ -0,0 +1,48 @@
+diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille
+--- Bastille.orig/AutomatedBastille 2017-01-02 09:39:20.720443755 +0100
++++ Bastille/AutomatedBastille 2017-01-02 09:40:54.293441835 +0100
+@@ -77,7 +77,7 @@
+
+ # Use the Curses interface
+ use Curses;
+-use Curses::Widgets;
++use Curses::Widgets_Bastille;
+
+ # Hardcoded List of configurations -- to be replaced by list read from file
+ @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit");
+diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm
+--- Bastille.orig/Bastille_Curses.pm 2005-04-18 14:32:10.000000000 +0200
++++ Bastille/Bastille_Curses.pm 2017-01-02 09:41:24.470441216 +0100
+@@ -34,7 +34,7 @@
+ sub do_Bastille {
+
+ use Curses;
+- use Curses::Widgets;
++ use Curses::Widgets_Bastille;
+
+ # Number_Modules is the number of modules loaded in by Load_Questions
+ $Number_Modules=0;
+diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm
+--- Bastille.orig/Curses/Widgets.pm 2005-04-06 01:18:11.000000000 +0200
++++ Bastille/Curses/Widgets.pm 2017-01-02 09:42:31.145439848 +0100
+@@ -11,7 +11,7 @@
+ #
+ ########################################################################
+
+-package Curses::Widgets;
++package Curses::Widgets_Bastille;
+
+ use strict;
+ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+diff -ruN Bastille.orig/Install.sh Bastille/Install.sh
+--- Bastille.orig/Install.sh 2017-01-02 09:39:20.767443754 +0100
++++ Bastille/Install.sh 2017-01-02 09:41:05.537441604 +0100
+@@ -15,7 +15,7 @@
+ cp BastilleBackEnd ${DESTDIR}/usr/sbin
+ cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
+ cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
+-cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
++cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm
+ cp InteractiveBastille ${DESTDIR}/usr/sbin
+ # Questions.txt has been replaced by Modules.txt and Questions/
+ #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
new file mode 100644
index 000000000000..fb9c3ca6f9ff
--- /dev/null
+++ b/app-admin/bastille/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>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
+ <longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">bastille-linux</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
new file mode 100644
index 000000000000..a02fa58802c5
--- /dev/null
+++ b/app-admin/bcfg2/Manifest
@@ -0,0 +1,6 @@
+AUX bcfg2-server-1.2.0.rc 481 SHA256 a6c3cb71fd4d94cf77a691205c31c870b9d583eb54ee589bdae3c36f15d28a3d SHA512 06a0134018d2475ce116b9dbcceeedba00dc4392d7dbb3ef7bfb42294806476613ab596e08656cfbd30661cc700a9f4fa122d330c4ed48006c572658298fd65c WHIRLPOOL 52991d0fd9fcee28f0c2714343de64555f1430297ea59267527c3218c3955285fab7ea5e4b98d383ec8c768c43d70df5b246b68c4d8ad3fd1a5e707d5abbe4cf
+DIST bcfg2-1.2.4.tar.gz 1959767 SHA256 c874139508c7a1c31c224548ae53dc40fe54e091cc0c036cc9d9c382263d4d16 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9 WHIRLPOOL 4b87826149ef86e9e5f955c2f0b79351c6fd46b9a3c18f773e25e35d60424605bfc47125c9ed3ac3b5174017595d9a173a20b9b0fe9aa69da51e0bde1836da65
+EBUILD bcfg2-1.2.4-r1.ebuild 1603 SHA256 c807e486a9b493cfffa88c506ee173cfa05ca74b080ac560e4f391e8b1048fac SHA512 e2626067f2c0d515d0c89bdcb51735b667e94781807e242e6e52d8404b09c5a01dd518274f47b2dae8daaeb2ed374ef32a3997181aef98745e80f706c8dcf5ad WHIRLPOOL 5c7059e6fd35d326ad1f14e44101d959d13b701d923327f9581cea1a0546fbf5b15cafea38a2c50ffac715f16cd53f24584dfd0104a58e86cf6e642f4ceb9cde
+MISC ChangeLog 3633 SHA256 0963b0226ca46835846420d135625109a8d90018aae0473d5c85aa93ca52f931 SHA512 3de417b276d590a66a9ff3aedc580c5e6bb85cb0144b5d7eab9053490da090dafaba9e30949e4673d3352509de9dc9d894564682c47a5392ff90807ec7dd832d WHIRLPOOL f211a8800f6d0be86a4e517cace5663f4c2ca04e67e8b829a88dacae1da0c8708552f44bfcc2702175a1057aae65c95488bf180eab70da0119e219ca434ba186
+MISC ChangeLog-2015 5297 SHA256 ae7430ed03e2c3a05d63c41ca5fa4df563cfc5110accabc7e6282720e3b30583 SHA512 247bf8b798a1a2685294cb465b088af393dc03201e965a3f62791274d5c707bf6865a1d1b9a3c23ca808d548a9a1d238c3ed4dadd442b6318875698ec6aad7bd WHIRLPOOL 34d55c51a8ab0c3e9be49882d9e1a8b95da2a0e6e65c0fc518868e62837ccc0e3c6596dfcaa0113f55984dc45514ed7e91ed79fa3d0eeda7f3cf7ea89dae3241
+MISC metadata.xml 465 SHA256 f5c2d212f2ba0ca212750749329bd2b57a626f5a4f2960986c73bbae9b504acf SHA512 97d6a0be1c4b11585e0acbd0b9f150890d761ebbcf6ad4609c929ba1179a08682d84c366b4f5f48b18a577ae730cbfc204f1d39a2d1f6cef2dd1b2ea6e24b7eb WHIRLPOOL 6ef3bdea077a29abe62cd27c6b4b618845f7885e93f1bde55068407061a1abafd0c27f6d278ffa0afe94edbdf837a51edf74fd58a66193f05cce660e3b73e7f6
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..99526eb04d2b
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@@ -0,0 +1,66 @@
+# 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='ssl'
+
+inherit distutils-r1
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc cheetah genshi server"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="app-portage/gentoolkit[${PYTHON_USEDEP}]
+ cheetah? ( dev-python/cheetah[${PYTHON_USEDEP}] )
+ genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+ server? (
+ dev-libs/libgamin[python,${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ !kernel_linux? ( virtual/fam ) )"
+
+python_compile_all() {
+ if use doc; then
+ einfo "Building Bcfg2 documentation"
+ sphinx-build doc doc_output || die
+ fi
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --record=PY_SERVER_LIBS
+
+ if ! use server; then
+ rm -f "${ED%/}"/usr/bin/bcfg2-* || die
+ rm -f "${D%/}$(python_get_scriptdir)"/bcfg2-* || die
+ rm -rf "${ED%/}"/usr/share/bcfg2 || die
+ rm -rf "${ED%/}"/usr/share/man/man8 || die
+ else
+ newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+ fi
+
+ insinto /etc
+ doins examples/bcfg2.conf
+
+ if use doc; then
+ cd doc_output || die
+ docinto html
+ dodoc -r [a-z]* _images _static
+ fi
+}
+
+pkg_postinst () {
+ if use server; then
+ einfo "If this is a new installation, you probably need to run:"
+ einfo " bcfg2-admin init"
+ fi
+}
diff --git a/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
new file mode 100644
index 000000000000..f40248037079
--- /dev/null
+++ b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+#
+# bcfgd - bcfg configuration daemon
+#
+#
+
+depend () {
+ need net
+}
+
+start () {
+ ebegin "Starting bcfg2-server"
+ start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
+ --exec /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
+ eend $? "Failed to start bcfg2-server"
+}
+
+stop () {
+ ebegin "Stopping bcfg2-server"
+ start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
+ --signal INT
+ eend $? "Failed to stop bcfg2-server"
+}
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
new file mode 100644
index 000000000000..f46d2d0d99a9
--- /dev/null
+++ b/app-admin/bcfg2/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>
+<use>
+ <flag name="cheetah">Include dev-python/cheetah support</flag>
+ <flag name="genshi">Include dev-python/genshi support</flag>
+ <flag name="server">Installs scripts to be used on the server-side of this app</flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
new file mode 100644
index 000000000000..ff75d6765987
--- /dev/null
+++ b/app-admin/calamares/Manifest
@@ -0,0 +1,8 @@
+AUX calamares-pkexec 43 SHA256 1a9c278c085bcb7cb3b1027bf6ad19d153492667730afd2b94c8736387355168 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb WHIRLPOOL bda196e8adb3b9207e9f98677dff5a4664504c114ab72bd0879d8518b74b95b558a2c90bcc612dd6f570b04c9f21fd5b46a51d55dd0f73b4fa288b3482d61f4d
+DIST calamares-3.1.4.tar.gz 4958385 SHA256 8255eb9b001b9b1271771c1796eb8217be78299c0a4e7f20e432b3dd4f5d371f SHA512 d3ced4222e21e6e9ab18fb90d4d591b1b59b5fd44841e56e41b2902d00f33a910e0ae287a6777c5d71eb08757cfca31d9210f6eabd00b3dd1dc6377413b54bb2 WHIRLPOOL 622122d9092bb4fff3fa40b0a08d5d71780da962c3fedd2d3c2336ff00242b25f2ba524b6ebdce48155ce0a9729a830b03d9aa3ad4c86bde3d3c26ab83574393
+DIST calamares-3.1.5.tar.gz 2266110 SHA256 02bd3c10e06ac207cdee0ee29f8d20bfe48eba491800e3eab704e1d294736260 SHA512 92e29668ddab880b76319fbf4eeffea21bfa0bd5b8807cb5a2c2786eafe4921f442a9a5773243fafe5942a346d46b89285e9472d4c8da70b70979a049923df06 WHIRLPOOL 74b396551aee5c7831b05a0c40df56f047bf6bd1fb0c9e3e51b2791696b9e19eb1db78128c1167a668d0d4e412cddbb819c807dfb52cc8bea667307921752a80
+EBUILD calamares-3.1.4.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+EBUILD calamares-3.1.5.ebuild 1974 SHA256 e085c918ef2eabc105c18edd8ccc071e76b71a48f384a969cb185def6ccbc754 SHA512 e6b308f8fe540fc520d4f071e6276e924dfbff7c0176a3b27bd0ca9ebf400ffdcbf54483cbcdcc2eaca11bf72463ceb80505262f5dfa06c4c02f519d645c8b38 WHIRLPOOL c7a51d470b9c62172866746df925699bdc96323f07a2e85d291d5eeb37d36f7b253e8dde2aeebb1d676efde79c71467731507f7198a10b82323637fc0b768d5f
+MISC ChangeLog 7327 SHA256 06876264cef6e8962030c803f3add9300544f649cd1b76266580629be569e897 SHA512 66c97585da7e7083117bd87828614f7f003e87ef90fd5f232153b7de58bb44573dacb648ebd697b92765ac081b84667601c636c3d33b33c5293a8e5887e5a5b7 WHIRLPOOL 6a131253a3cd20cd043be6c32be5acd737c7e74760efca0237a06f514e9a58c92e18703fd20ad47ccf5d8b5137eea7cdf1f05b72087f7ff485114ee2e57c7182
+MISC ChangeLog-2015 671 SHA256 0e30b76881788f8c37df34e842750d456934309aa7e72026870766986f94f978 SHA512 707ea2c09d816d98ffce58fe26b62d85cfdabe4b8967208fc4e870cc12162381a335646be30a9bdfb16f17a90f359f3168dd9bf0d85513368f8707de06a935d2 WHIRLPOOL ccef8a153f1546f1ffc2f5a4433f87703715e86555445add9d75542550ecf62b9074117977fc3761c85b5205bbef3b168a8032069826b4335d756694fdd26faa
+MISC metadata.xml 1055 SHA256 8fb8c7c1b36c5350743885f9e922cbfdc8e2396f5b955abc5651c7a140da08ed SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f WHIRLPOOL 30ffb01457383c8d69cfea217c66d93123cf17a15a9553101013d64b6328f1f9b51ec42e3e5215aa0b71241355364bbccace3ea32baa23b072c32a76d7c6113d
diff --git a/app-admin/calamares/calamares-3.1.4.ebuild b/app-admin/calamares/calamares-3.1.4.ebuild
new file mode 100644
index 000000000000..780fcfe4fd0f
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt[qt5(+)]
+ >=sys-libs/kpmcore-3.0.3:5=
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ >=sys-block/parted-3.0
+ || ( sys-boot/grub:2 sys-boot/systemd-boot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ virtual/udev
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+src_prepare() {
+ python_setup
+ export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+ PYTHON_LIBS="$(python_get_LIBS)"
+
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWEBVIEW_FORCE_WEBKIT=OFF
+ -DWITH_PYTHONQT=$(usex pythonqt)
+ )
+
+ kde5_src_configure
+ sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+ sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+ kde5_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/calamares-3.1.5.ebuild b/app-admin/calamares/calamares-3.1.5.ebuild
new file mode 100644
index 000000000000..780fcfe4fd0f
--- /dev/null
+++ b/app-admin/calamares/calamares-3.1.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt[qt5(+)]
+ >=sys-libs/kpmcore-3.0.3:5=
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ >=sys-block/parted-3.0
+ || ( sys-boot/grub:2 sys-boot/systemd-boot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ virtual/udev
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+src_prepare() {
+ python_setup
+ export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+ PYTHON_LIBS="$(python_get_LIBS)"
+
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWEBVIEW_FORCE_WEBKIT=OFF
+ -DWITH_PYTHONQT=$(usex pythonqt)
+ )
+
+ kde5_src_configure
+ sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
+ sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
+}
+
+src_install() {
+ kde5_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
new file mode 100644
index 000000000000..3300d3b70c61
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,2 @@
+#!/bin/sh
+pkexec "/usr/bin/calamares" "$@"
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
new file mode 100644
index 000000000000..bc9aeb32994b
--- /dev/null
+++ b/app-admin/calamares/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>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ </maintainer>
+ <longdescription>
+ Calamares is a distribution-independent system installer, with an
+ advanced partitioning feature for both manual and automated
+ partitioning operations. It is the first installer with an automated
+ “Replace Partition” option, which makes it easy to reuse a partition
+ over and over for distribution testing. Calamares is designed to be
+ customizable by distribution maintainers without need for cumbersome
+ patching, thanks to third party branding and external modules support.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">calamares/calamares</remote-id>
+ </upstream>
+ <use>
+ <flag name="pythonqt">Enable PythonQt-based module interface</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
new file mode 100644
index 000000000000..5f39fed35cd2
--- /dev/null
+++ b/app-admin/cancd/Manifest
@@ -0,0 +1,11 @@
+AUX cancd-0.1.0-build.patch 262 SHA256 10be31f427940224cecd5b90de94dfd9b0a76368c57a8354b44f4c3905c8d192 SHA512 cbc3d0bfcdb2abae08268a408d2d7f7bc5898bd07c744878a6d8996dea5ea4f9f308078f9fe05566ee8cd06b3a5e083163f50d69f6795b31952934a88d69c481 WHIRLPOOL a8cdce4f61d03d7a683065bd43422d25723685b75008abfd2c745b5d5bb56257007af26992276c829fa47336a959f75e0f628d3f0e91f8e556dc3c3ade135a6a
+AUX cancd-0.1.0-c-cleanup.patch 1648 SHA256 55628aa8e2fabd3aa26bc0023d46562a238047b2f7ad5c8485b88794655f93d7 SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e WHIRLPOOL fb55e5d1ab1a9971a8423d6dadadcaacfc24dc6a2f300e7c1b28173d5beccf04309f511299af5f64ea06f9f497ee35548cfd6744459afd7ef54ccfe1e5c1b7ca
+AUX cancd-conf.d 496 SHA256 45c9bc3267b5526435267786885ab77cd50ffc610866ec4bbceaf5c2795691f7 SHA512 95d7fdeec35b2b544b9c30ca3c45197195ae8180624971af1c876ad19bedc0e9045edbb8d5bb393ff8d4f2f96dd7258cdeeb30ba58f31326ebff14f21a9efae9 WHIRLPOOL 3d6a991b2519d2a4280edb4b48050c32e32a6df09854562295c8a9980af20fa7a142c6c31e2a2121197ecc0d489844233397cf0c48ba2edf88aa2970c8787ce4
+AUX cancd-init.d 514 SHA256 268e508d1e9267abfdc58fdead0b0ae7cb09d18962bb2615867d6478f5fc5e5f SHA512 27f46006a90814c41849bf03d45b100361ce49ac83d498e2244db13827620a254140aefee14059a722b08446c62124d25fb029080cc246aea34287a838b31c64 WHIRLPOOL bdce93c36111269ef2937fead25aa54edb92669a9f6dae374c4099874ba1e6d2018d77fbfad63e25183fbfa324fa16348732bfa6d96ce625305db2d220173dfc
+AUX netconsole-conf.d 751 SHA256 8b3fd9af2d20cb17de51a1c6a116bb74bc44a0faceb9b24b41d03ef8b203848a SHA512 7095ec6b8595865fc084b39f027efa0818c1348b8bfc8bfbea8d7d05c767f57a8357ae2eb07f13f073143911451e0fa005e1623ec9865076e4350f442cb8648b WHIRLPOOL c83bc58afc721a12a425d99e2c71216581ce80ce49deddbd52b39ad150854b6a581edd7b174e5cb88b89c639b23ee9ae8b18eef3d81ea3101c4fb9e91c2cebd9
+AUX netconsole-init.d 1503 SHA256 67f9d006099ef571f7b61a0bd8d041483a95965e247d2f0383438e79c59562e7 SHA512 33005e692fce59d567e399fca58b81b740cb381ce897f689af7e33785ccd1991506be1af2c09de8f96b6eb3996c5be16c212daee03d304b1fff7095b2ae1491d WHIRLPOOL bb5765788b9399a2ecfc0adb0a22a06d847f1e2892ec8511e629ad6658d1a279acc3c3359e60334c1252ec28351516999fb5be1866798063868c05884e55652f
+DIST cancd-0.1.0.tar.gz 7634 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb WHIRLPOOL 84e1b6461bc5ae40b01c71112fed9999e590a7cbed54da6850131bd475eafb6ab7830a418a6fc46bf217645ed73aec080af6d4117a9ea97f1b48dad92cc93caf
+EBUILD cancd-0.1.0-r3.ebuild 1197 SHA256 5677dbce1d6e471db4f6b150e4f67155f8107d8a64ae61d48bdb18583f57ed6d SHA512 4258be990c471d8d5a3df2c735b19c3333bd17be8d878bde92839216df8350220b463f97e5b92753ef9af866e40ed0b6d53df3f0e8c30e52bb71721ec72add1c WHIRLPOOL 799d658cfd6ef8392c5d05b76b503f672b36963112608bba9159558bc8ce9c717250502340fb7abd05d85144d6707a9b4a3330d4b0c8c984743ccf5b9843f432
+MISC ChangeLog 2519 SHA256 0b8906428250ea05427d8218592b464abdb091eed69834dc7b8d3837dabaa3a8 SHA512 8c076932082c239d7cd534f59f4bdc2f4cd9a7cae18363de884ee329c0983ce59e023de1be147da251d65e5fd78a875ca52435d8be36771aebc155d53ff072cb WHIRLPOOL 9c029c72a286d62a244b94214152fce462d55908eacd8b41342c34dda5bf78f0aaa14bd38ad322e9ef1432e22d9fe34ee0ed1dc13bafa64ecfebc7b951487cc2
+MISC ChangeLog-2015 2061 SHA256 1b848e877c78beb772ecb284002d0f3c2b36948363e81f5fba443ab849f75339 SHA512 3da179ae869f61ada233d301ee3f28dc48224abc4d4150127032f6da6151b023404fd95d2bfc6eb8173087a56ed58845513e2abc80c6ab6af2bc4d481996062f WHIRLPOOL 708712fd64d55b771efcc3ab8311f7d8ee0d83b78febe1f8af86677c06c6586caab6732864262d0756fc27dcbbd3663971da127e4a49b8743834469d3e6f5567
+MISC metadata.xml 268 SHA256 972faf76e6638f2159ef3c7dafdcfef26d582070e6f0064d9136d1c6b2bee905 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850 WHIRLPOOL 759c32dcdde671d2fda0269ee9326f6d0f0e44966f767ac7becc40e6efb5429237b683cb23867d76a8d13dde79fe257e090ef890761b20f9792172a90369296d
diff --git a/app-admin/cancd/cancd-0.1.0-r3.ebuild b/app-admin/cancd/cancd-0.1.0-r3.ebuild
new file mode 100644
index 000000000000..6ad37a6163ff
--- /dev/null
+++ b/app-admin/cancd/cancd-0.1.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="the CA NetConsole Daemon receives output from the Linux netconsole driver"
+HOMEPAGE="http://oss.oracle.com/projects/cancd/"
+SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch #246734
+ epatch "${FILESDIR}"/${P}-c-cleanup.patch
+ # slight makefile cleanup
+ sed -i \
+ -e '/^CFLAGS/s,-g,,' \
+ -e '/^CFLAGS/s,-O2,-Wall -W -Wextra -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wredundant-decls -Wunreachable-code -Wlong-long,' \
+ -e '/rm cancd cancd.o/s,rm,rm -f,' \
+ Makefile || die
+}
+
+src_install() {
+ dosbin cancd
+ newinitd "${FILESDIR}"/cancd-init.d cancd
+ newconfd "${FILESDIR}"/cancd-conf.d cancd
+ newinitd "${FILESDIR}"/netconsole-init.d netconsole
+ newconfd "${FILESDIR}"/netconsole-conf.d netconsole
+ keepdir /var/crash
+ fowners adm:nobody /var/crash
+ fperms 700 /var/crash
+}
diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build.patch
new file mode 100644
index 000000000000..b1c99b1cd565
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-build.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/246734
+
+--- cancd.c
++++ cancd.c
+@@ -36,6 +36,7 @@
+ #include <libgen.h>
+ #include <getopt.h>
+ #include <stdarg.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
diff --git a/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
new file mode 100644
index 000000000000..47defb3e43b2
--- /dev/null
+++ b/app-admin/cancd/files/cancd-0.1.0-c-cleanup.patch
@@ -0,0 +1,65 @@
+diff -Nuar --exclude '*~' --exclude '*.orig' --exclude Makefile cancd-0.1.0/cancd.c cancd-0.1.0.new/cancd.c
+--- cancd-0.1.0/cancd.c 2005-08-18 11:47:48.000000000 -0700
++++ cancd-0.1.0.new/cancd.c 2006-03-17 17:09:46.402025517 -0800
+@@ -199,7 +199,7 @@
+ char *path;
+ };
+
+-static int make_tree(const char *path, int mode)
++static int make_tree(const char *path, mode_t mode)
+ {
+ struct stat stat_buf;
+ char *ptr, *tmp;
+@@ -319,7 +319,7 @@
+ static int open_socket()
+ {
+ int rc;
+- struct sockaddr_in servaddr = {0, };
++ struct sockaddr_in servaddr;
+
+ sock_fd = socket(PF_INET, SOCK_DGRAM, 0);
+ if (sock_fd < 0)
+@@ -438,7 +438,7 @@
+ int rc;
+ static int block = 1;
+
+- rc = recvfrom(sock_fd, buf, bufsize, 0,
++ rc = recvfrom(fd, buf, bufsize, 0,
+ (struct sockaddr *)from, fromlen);
+ if (rc < 0)
+ {
+@@ -569,7 +569,7 @@
+
+ static int valid_format()
+ {
+- struct in_addr addr = {0, };
++ struct in_addr addr;
+ char *name;
+ int rc;
+
+@@ -599,9 +599,11 @@
+ exit(rc);
+ }
+
++/*
+ extern char *optarg;
+ extern int optopt;
+ extern int opterr;
++*/
+ static int parse_options(int argc, char *argv[])
+ {
+ int c;
+@@ -641,11 +643,11 @@
+ optarg);
+ print_usage(-EINVAL);
+ }
+- log_prefix = optarg;
++ log_prefix = strdup(optarg);
+ break;
+
+ case 'o':
+- log_format = optarg;
++ log_format = strdup(optarg);
+ if (!log_format || !*log_format || !valid_format())
+ {
+ fprintf(stderr,
diff --git a/app-admin/cancd/files/cancd-conf.d b/app-admin/cancd/files/cancd-conf.d
new file mode 100644
index 000000000000..7b4dd27383c0
--- /dev/null
+++ b/app-admin/cancd/files/cancd-conf.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# user to run as, root strongly discouraged
+# user should have /bin/false for a shell
+# but file access into /var
+CHUID='adm:nobody'
+
+# port to listen on
+CANCD_PORT=6667
+
+# directory to output to
+CRASH_DIR=/var/crash
+
+# one file per minute, one dir per host/date
+#CRASH_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
+# one file per day, one dir per host
+CRASH_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-init.d b/app-admin/cancd/files/cancd-init.d
new file mode 100644
index 000000000000..eb0d34e1a2ee
--- /dev/null
+++ b/app-admin/cancd/files/cancd-init.d
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ mkdir -p ${CRASH_DIR}
+ chown ${CHUID} ${CRASH_DIR}
+ chmod 700 ${CRASH_DIR}
+ ebegin "Starting cancd"
+ start-stop-daemon --start --quiet --user ${CHUID} --exec /usr/sbin/cancd -- -p ${CANCD_PORT} -l "${CRASH_DIR}" -o "${CRASH_FORMAT}"
+ eend ${?}
+}
+
+stop() {
+ ebegin "Stopping cancd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/cancd
+ eend ${?}
+}
diff --git a/app-admin/cancd/files/netconsole-conf.d b/app-admin/cancd/files/netconsole-conf.d
new file mode 100644
index 000000000000..aad2fc797172
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-conf.d
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# required!
+TGT_IP=''
+
+DEVICE=eth0
+
+SRC_IP=''
+# will default to first address on $DEVICE
+# must be specified if the device does not have an IP at init time
+SRC_PORT=6665 # default
+
+# note that cancd daemon uses 6667 as default
+# but netconsole.txt says 6666 is the default
+TGT_PORT=6667
+
+# if you want to broadcast, specify 'broadcast' here.
+# it's a security hole on an untrusted network.
+TGT_MAC=''
+
+LOGLEVEL='1'
+# LOGLEVEL are the kernel console logging levels
+# [0..7] = EMERG,ALERT,CRIT,ERR,WARNING,NOTICE,INFO,DEBUG
+# 1 means only kernel panics are reported (default)
+# this affects all console logging
+# see syslog(2) for more info
diff --git a/app-admin/cancd/files/netconsole-init.d b/app-admin/cancd/files/netconsole-init.d
new file mode 100644
index 000000000000..dfb28eb9eac0
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-init.d
@@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ checkconfig || return 1
+ if [ -z "${TGT_MAC}" ]; then
+ LC_ALL=C /bin/ping -nq -c 3 "${TGT_IP}" -I "${DEVICE}" 1>/dev/null 2>/dev/null
+ ret=$?
+ # ping worked, try arp
+ if [ $ret -eq 0 ]; then
+ TGT_MAC="$(LC_ALL=C arp -an -i ${DEVICE} ${TGT_IP} |egrep -v 'incomplete|no match' | awk '{print $4}')"
+ fi
+ elif [ "${TGT_MAC}" = "broadcast" ]; then
+ TGT_MAC=''
+ fi
+ ebegin "Starting netconsole ${SRC_IP}:${SRC_PORT}(${DEVICE}) -> ${TGT_IP}:${TGT_PORT} ${TGT_MAC}"
+ # else we use the MAC that we are given
+ modprobe netconsole netconsole=${SRC_PORT}@${SRC_IP}/${DEVICE},${TGT_PORT}@${TGT_IP}/${TGT_MAC}
+ ret=$?
+ [ $ret -eq 0 ] && dmesg -n ${LOGLEVEL}
+ eend $ret
+}
+
+stop() {
+ ebegin "Stopping netconsole"
+ modprobe -r netconsole
+ eend $?
+}
+
+checkconfig() {
+ # kernel uses 15 internally
+ if [ "$LOGLEVEL" -lt 0 -o "${LOGLEVEL}" -gt 15 ]; then
+ eerror "Invalid kernel console loglevel."
+ return 1
+ fi
+
+ if [ "$SRC_PORT" -le 0 ]; then
+ eerror "Invalid source port."
+ return 1
+ fi
+
+ LC_ALL=C ifconfig "${DEVICE}" 1>/dev/null 2>/dev/null
+ ret=$?
+
+ if [ -z "${DEVICE}" -o "${ret}" -gt 0 ]; then
+ eerror "Source device invalid."
+ return 1
+ fi
+
+ if [ "$TGT_PORT" -le 0 ]; then
+ eerror "Invalid target port."
+ return 1
+ fi
+
+ if [ -z "$TGT_IP" ]; then
+ eerror "Unspecified target address."
+ return 1
+ fi
+
+ return 0
+}
+# vim: ts=4 sw=4 sts=4:
diff --git a/app-admin/cancd/metadata.xml b/app-admin/cancd/metadata.xml
new file mode 100644
index 000000000000..a4e0d354f696
--- /dev/null
+++ b/app-admin/cancd/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-admin/ccze/Manifest b/app-admin/ccze/Manifest
new file mode 100644
index 000000000000..19df783cf995
--- /dev/null
+++ b/app-admin/ccze/Manifest
@@ -0,0 +1,10 @@
+AUX ccze-0.2.1-tinfo.patch 369 SHA256 0d39f8d775bbba749ab2a3fbd6813744fc9e36b8d1a3470e8a7c4734010182cf SHA512 8dd3d7a66807782fef49119e380eec9230d4d0708ef8b20cb9606740015f96f024b22967fae348bc59b3334a3b110dc1cacc8792a9a3402ddfdf600ccd71a62d WHIRLPOOL 08cada088cc6b28ec451db288af0a2cff6376806983064fccbf31d892a1ccd4086e05b87090a161fc985a395d13e917d0d15061ec660612bd858bf687f296af5
+AUX ccze-fbsd.patch 531 SHA256 38707e4cc95fabdcc4a89d07f5bc7f5c4ef723674ae43e481800ab7d112a04d4 SHA512 c94926f907b054b84df8c1887183fc44024d4a4b4e9cb4a91ce34adf25857cc30d9572673a3869fa1affacda047fa30f9d73ba198cdebecf40ae86b5fc9dceec WHIRLPOOL dfcff266a8b70f2b8305c6f3e791d75e30df8321ab2a04b39438f6576a064508bcc7d33a9a714e2ddb715981ad06c39b983d43c4cdc35f983e7baf4fd25de24d
+AUX ccze-ldflags.patch 424 SHA256 68cd44dd51f43d690760b809f962b74195a5f919719c7c34bfcb30cf6ce8d687 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07 WHIRLPOOL 52bac605ae70d46a0fadd6e524283a41fcd57a04ba57da2b89ab330a12118672af78334694d6e2fda6f2976f0308efa1fddf1fe63f3e17c480657cc333ad326b
+AUX ccze-segfault.patch 660 SHA256 69db1dbe844d21846b351ad5fa39714336db0372d25a96a096479dfe33da12d5 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900 WHIRLPOOL 15dd26f2c8acdf7e277cdb95808e22ec0110f669c767ed92e25219f7cf6a14fac314cf4e855266d07002b31969690a1c250d575358aef87cea2352a3d445b987
+DIST ccze-0.2.1.tar.gz 139795 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7 WHIRLPOOL 93f8891c3a7885ca264f7269493893e6555865c89dee5cf5c890754f55db0ac60dce26d76318c8f838d7ee6ff6fe8e2454e9b4490ab607e496a5fdc0ef4f7685
+EBUILD ccze-0.2.1-r3.ebuild 946 SHA256 180b85dad48f64b953696aaf25b7468176d63c531717c0e504e5991dc2627336 SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59 WHIRLPOOL d2691d7ab51f0caf371f4cbf2b7c8fb9ea746cc6739129ef4988cbf66c722bbc27b11085bd07640489dbd3918edecd13b0b9c2b718632975ee1fad25a4668a5f
+EBUILD ccze-0.2.1-r4.ebuild 942 SHA256 93cdf41d7d0f6f588941bfcb77e9a4752d5d7d336443fa7ea9711ac12d236925 SHA512 89175fcd5e332bfca5bafa3106b0e39b0cd786038d748faaa745e13eafc4d2a69d5bc6a08d4302eb5e0acea84265cab67f69ea148470b56d659103815cb4dddd WHIRLPOOL eba511971c3d475e09981a58c3fbe9bc49f66d15d3cf482c9834796b8b7dc7c647cef7aac91650dc2c9b6dce306ad424c2c0ef1823f46a1515d80500c34d21e1
+MISC ChangeLog 2633 SHA256 1fc05940fec2b6336841568afe9543308e8d4146073e6381256ed84ff5236bfc SHA512 a8be866098fe28d9915e9fa50adc97861aee2271a2144c4d11feac8bd2d0104bf6b9dbf1c5c300468b0b8a0476d6a9736d15f6e82f41d40b6ea685ab33de7df9 WHIRLPOOL d16fabbe6efc6999781577b06a473ca6a127ccf94fb056e4818518952d7859562973825f68fa14ea0b63301ce115a1135e43ce750b41640c373c30c4960c2126
+MISC ChangeLog-2015 4131 SHA256 fa5be6c17c89031f666ae73f74cbe09cd227d0947961da65e823ce01266c75e4 SHA512 9cf521076e71a6058e0d4f6882cf5167b2f23bbfeedd59b689c4c03b40465362513a8f149f68c866926ddf45079d32a8bf7de443aac637e3b7c3f549ae3a99b2 WHIRLPOOL 5302e930b42b15a1331e324f1fdc05484b90422d7593189739b1d4fb6ab4bc5d12012548db52a9a44d5dc4eac402f8591919c4f0920a8134f5a2bc2f9083ddef
+MISC metadata.xml 492 SHA256 2f2375bd9bfefe338069ba07bebe6505704dc5b3706399dc56827a330722da7f SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8 WHIRLPOOL 36e2583ff602b39ae323f602cf96fe93d334d91470cf38c4826c4b3b5a235e92cf8a661d08f44d32c14f53371a06b49ec7378a72366a05ad2070697c90bc62e3
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..94fa5efed7b1
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+ sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+src_prepare() {
+
+ epatch "${FILESDIR}"/ccze-fbsd.patch
+ epatch "${FILESDIR}"/ccze-segfault.patch
+ epatch "${FILESDIR}"/ccze-ldflags.patch
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+
+ # GCC 4.x fixes
+ sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+ -i src/Makefile.in || die
+ sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+ -i configure.ac || die
+
+ eautoreconf
+
+ ht_fix_file Rules.mk.in
+
+ tc-export CC
+}
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
new file mode 100644
index 000000000000..e2677e5eeb1f
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+ sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+PATCHES=(
+ "${FILESDIR}"/ccze-fbsd.patch
+ "${FILESDIR}"/ccze-segfault.patch
+ "${FILESDIR}"/ccze-ldflags.patch
+ "${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+ default
+
+ # GCC 4.x fixes
+ sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+ -i src/Makefile.in || die
+ sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+ -i configure.ac || die
+
+ eautoreconf
+
+ ht_fix_file Rules.mk.in
+
+ tc-export CC
+}
diff --git a/app-admin/ccze/files/ccze-0.2.1-tinfo.patch b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
new file mode 100644
index 000000000000..d0d7550e3337
--- /dev/null
+++ b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,7 @@
+ strndup strstr])
+
+ AC_CHECK_LIB(ncurses, initscr, [], [AC_ERROR(NCurses library not found)])
++AC_SEARCH_LIBS(stdscr, tinfo,,[AC_ERROR([Cannot find a library providing stdscr])])
+ AC_CHECK_FUNC(dlopen, [], [AC_CHECK_LIB(dl, dlopen)])
+ AC_CHECK_FUNC(getopt_long, [], [AC_CHECK_LIB(gnugetopt, getopt_long)])
+
diff --git a/app-admin/ccze/files/ccze-fbsd.patch b/app-admin/ccze/files/ccze-fbsd.patch
new file mode 100644
index 000000000000..ae694e0e4423
--- /dev/null
+++ b/app-admin/ccze/files/ccze-fbsd.patch
@@ -0,0 +1,25 @@
+--- a/src/ccze-compat.h
++++ b/src/ccze-compat.h
+@@ -29,6 +29,11 @@
+ #include <stddef.h>
+ #include <stdio.h>
+
++# ifndef __error_t_defined
++typedef int error_t;
++# define __error_t_defined 1
++# endif
++
+ #ifndef HAVE_STRNDUP
+ char *strndup (const char *s, size_t size);
+ #endif
+--- a/src/ccze-compat.c
++++ b/src/ccze-compat.c
+@@ -275,7 +275,7 @@
+ char **valuep)
+ {
+ int i = getsubopt (optionp, tokens, valuep);
+-#if HAVE_SUBOPTARg
++#if HAVE_SUBOPTARG
+ if (!*valuep && suboptarg)
+ *valuep = strdup (suboptarg);
+ #endif
diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch
new file mode 100644
index 000000000000..4f8c8f207209
--- /dev/null
+++ b/app-admin/ccze/files/ccze-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -75,7 +75,7 @@
+ ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
+ ${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
+ ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c
+- ${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o
++ ${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o
+ ccze-builtins.c: Makefile
+ echo '#include <ccze.h>' >$@
+ echo '#include "ccze-private.h"' >>$@
diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch
new file mode 100644
index 000000000000..5bdd823e4120
--- /dev/null
+++ b/app-admin/ccze/files/ccze-segfault.patch
@@ -0,0 +1,29 @@
+--- a/src/ccze.c
++++ b/src/ccze.c
+@@ -209,7 +209,7 @@
+ }
+ break;
+ case 'a':
+- plugin = strtok (optarg, "=");
++ plugin = strtok (arg, "=");
+ value = strtok (NULL, "\n");
+ ccze_plugin_argv_set (plugin, value);
+ break;
+@@ -249,7 +249,7 @@
+ ccze_config.remfac = 1;
+ break;
+ case 'm':
+- subopts = optarg;
++ subopts = arg;
+ while (*subopts != '\0')
+ {
+ switch (getsubopt (&subopts, m_subopts, &value))
+@@ -273,7 +273,7 @@
+ }
+ break;
+ case 'o':
+- subopts = optarg;
++ subopts = arg;
+ while (*subopts != '\0')
+ {
+ switch (getsubopt (&subopts, o_subopts, &value))
diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml
new file mode 100644
index 000000000000..49a6829d2fd1
--- /dev/null
+++ b/app-admin/ccze/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>
+ CCZE is my C port of RASZi's colorize, with a set of bug fixes and enhancements.
+ It uses PCRE to do the matching, and NCurses for the output. The goal was to
+ create a log coloriser, that is fast and light on resources. Also, being extensible
+ via plug-ins is an important feature too.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
new file mode 100644
index 000000000000..e46a284f61e5
--- /dev/null
+++ b/app-admin/cdist/Manifest
@@ -0,0 +1,5 @@
+DIST cdist-4.6.1.tar.gz 454461 SHA256 3e4d9e45a59c1c823eb3bccd395ef47f1d8c91260846c394f32f0b66e348924d SHA512 f0c3759d00221fbd36d7662de6ccc57fc0070b8aee6a0d80e6bab6f41215c537a1cf1a6ec9fdebf81c45ad8126b8e730a14be8f1286d5baf5f4a5672611e31dc WHIRLPOOL 0c2412a08f54906244071979f3adb28e7da29c22ca947bc146aeac9e0b7c6aef2dce969b4d0ef4405c4110049ed873c15354dfd7f896c128cedaea26dbee02c1
+EBUILD cdist-4.6.1.ebuild 591 SHA256 1622306a0dc3eb1d1c35bc7cff8c78de8b09b30fa885a62ddf74ef13cad115e0 SHA512 907e534805f05739db8fa7ad9cfc4593a0b110742329cf66059eec0935ac08a1e99e46411bd961a6200018bda6b948ab6e6e0cc37da72f47642c4baa3aa090b1 WHIRLPOOL 885d7067acef8563ab0ad0c384993ce780195ef4f235e6b3c507cb0a04d593f4f7ce7224a13f62bba53a13d41660fa0531c16974cd93acee8a78a6f34705b8dc
+MISC ChangeLog 2998 SHA256 2e76480fca7c76ec3c24eee24a3922fcde1bdda72343e0ed0aa3e042c0274ebf SHA512 8cf7eda54645998be13a633ece43c9e514b68b1c55081326e9b2c250449d297a23c790b2ab5e25520bc31e5e39d828b9aa110a0f93c9368d71d84b40542ff867 WHIRLPOOL e1f7ca5900254a6325d64a3a0803bf459bc4a413a6d04a5a6b762179b76d3a160445cf5a56f1eaab886c9719f0ead6a51db2f6c1b95c6e68df5eddb8e3fef3e2
+MISC ChangeLog-2015 1766 SHA256 7008204431bd372743b2cc0171cfdec4291ffd64cacc19cc359db18d6000be56 SHA512 5814177dd091ddb360f9ef0d7c127ee79cd4c4af86f0196aecc2f9bbc55f7b36f4ced30a9900e94cce3ce07730c3ea730b4f4d45f343e2fa616db2bb0239ad2d WHIRLPOOL e2a5e22d89cf7f45bf0632e232d6ec68bf9a347d65c7dea9ac259e83043ff13203f6537d18c41181abaaedd3a2679bb3ea9ea0cc0be2868aa46aeb0e4cb2d371
+MISC metadata.xml 522 SHA256 46323abcb13cd8823b6e2387fe0508d5d6bffed9f29624f15fbef9535e21685d SHA512 0d46ed7274acabc48b93ee77a4324837165d9887b1016ab08a9e5d3edaafe5623bd17faf988f1f034b7add61cd47e3c79e9a112d234061fb8589acd6a995fc96 WHIRLPOOL 02286530bcde5a7e607aa2ab8c57997488d93cc0381c98801dc91e76fda6d8a82b2da393c479f0595b69e9f2b6071456d40d0d43e2e2dc2af7eb3c0c74c57da5
diff --git a/app-admin/cdist/cdist-4.6.1.ebuild b/app-admin/cdist/cdist-4.6.1.ebuild
new file mode 100644
index 000000000000..59661b8e4980
--- /dev/null
+++ b/app-admin/cdist/cdist-4.6.1.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=( python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="http://www.nico.schottelius.org/software/cdist/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+ use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+ distutils-r1_python_install_all
+
+ doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
new file mode 100644
index 000000000000..2bbfb75d6039
--- /dev/null
+++ b/app-admin/cdist/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>nerve@ipwar.ch</email>
+ <name>Daniel Heule</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">cdist</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
new file mode 100644
index 000000000000..4743ddc4adee
--- /dev/null
+++ b/app-admin/cgmanager/Manifest
@@ -0,0 +1,10 @@
+AUX cgmanager-0.39-make-pam-conditional.patch 1068 SHA256 ed638b63b6e893a664378f7ab22083410225639c8bda431c283c8c728cd8b745 SHA512 d7673d3189af0279f9b34a94f8fd7631ab3dea68df5df11cdaaa541e4978ebeaae8d0fc91f9cf331853cd96dab6d9b284adb469d409fb58f5bda262bf96fbfa2 WHIRLPOOL 3f00abbf764411860250471fa418c1d5e30419e3f4e58f76f25aa54d91587713163fa7e5bfbe2d1b3ae89f29cd2fa8fda6f8a16e816b315739a53e504af61440
+AUX cgmanager.initd-r1 331 SHA256 f162685428a6593630daf5d636c198caf4992843ced977dc6d7288b7559a062c SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948 WHIRLPOOL 769e94196151bf11b9ca0ec5a190b85b47860e75d65a4bb13f624fd80794ad656b60d99cc6b28a56273b79d89431cd3c625ad3386d3c861f3bf252ec7b182d11
+AUX cgproxy.initd-r1 661 SHA256 97220fa0af6dcaa9d2cb726620ee3de8e216e55bab37cea40e5ed010ed637e35 SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc WHIRLPOOL 46931abeeb41bc572f195e0848d42d189df6e001b86b244c9dac5a9f1615f52491c81c3823b9d03ad97e13b4f3ec578174b84ecac5e31d2e95dfd3414cb64993
+DIST cgmanager-0.39.tar.gz 437683 SHA256 9e65487fb4e4aa0a6acd87ba7f8f00b8007d8c52608aa6d411e72e6fe9445b7b SHA512 2adf2c639191fb681ffed083629d6ba93f6d5a3534d4dc00b2cff1917c3273febcb30ec7d524ee95ce4a1b8811d902a2ff1cdffe911a66850fb9f10750ef1801 WHIRLPOOL b57c0feb75543af7e7eadccd5287962034fa2c54883289822b54ed184873fb1b6e1eb6d9dcc952fcda2f3027d84fa517c2bfed22a855ede8e700c2298d5d210a
+DIST cgmanager-0.41.tar.gz 461805 SHA256 29b155befb3ac233d5d29dbca7c791c8138bab01bfa78ea4757ebb88ce23b458 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd WHIRLPOOL 4571c88415f24dbd3aae240e2427e27786538653602b4b6ba862eff1abd7fc8b2f97784ca5bced4481f738638030a5777f3d687ee5d115492d7a91ebf4985ab1
+EBUILD cgmanager-0.39.ebuild 1333 SHA256 f7c29d99bd193495480d437278b836dd78ebaee29fd19902299b0d3c80a40be6 SHA512 94bee732d5068fc8a7063f5a6dae65eb45a4d2d7e054e33554d756e8a2515bb660caf1effdd7feff8aefdac3efcefc0c4264e81d3fa03fee5c565e995eda693a WHIRLPOOL 4e0595eef76c5861a4d1d0dca834e2f11c2a6d7ed66a5bcac6b67f9e78a71dac9c526f00a2422c15b26cc00fd29d9d2d68a8f3e18fc6e4d8c8cbf859c2b6b46d
+EBUILD cgmanager-0.41.ebuild 1234 SHA256 ba7aba502daf07b38651a67fed5d75f17cb8f2752888e937cac59ebc48e678c6 SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41 WHIRLPOOL 80e26f9e4c718abd959a01a2f3e457486c95aa3830f0b7853a21560fd292376765b164112dd086e32701f55a95bf94367203653bf194bfa4e7c3ef90f7b565a4
+MISC ChangeLog 5834 SHA256 dec321c1c0ef10f9f7a0528aa31395ae91a1dde36d9edabf412010308bf27c5a SHA512 480524d8362e6adf849c8206c4c9fb31a58140bde59a8ccc21062c2859b5aa0b50800ac867254039a0f0586cac8a0da62e1b16d4f1287002a9386d5dd452be5b WHIRLPOOL 00c753a142763c2a6bfa73d200c40c0060c784333817ef0dd063de6e8cb7c31e26799df4655c25b520f7eb62f39bff689fd85f6a24c1611f983f65387d6e51ad
+MISC ChangeLog-2015 1411 SHA256 98ad80d5d71eeae2e4b1a74749e10ef94073e6cf3d2af6b3380c94cfcdec34aa SHA512 30ea6c095bc2d429288c1137b45acd298458c56f3669fbe580521c4ea11c8747697546fddf80efb7924e3d5cb5d038a60ae71718352f1b3ba748a4b6272041a0 WHIRLPOOL 7e63e060b71050272a5067e82e5a346013657b11ef507f94f1488fceddd499210a798e61133d8fd0b40a213151f6cb0d2e905eff9c49408afce57dc9936ce5ee
+MISC metadata.xml 370 SHA256 3753099ce6f024a17c07eae94614fa76e7b9d65074acd899c6f75efd12e23fef SHA512 eba74394c34246d7ca096cd81be0d41e4431cbb885331c9fdfde61e273a3f01bae0726dac514af8b96a4bf272961706a8845d84d802e216ce745793f930320dd WHIRLPOOL fbc1304412875311b999a5222af4d5d13da30410e4c404a6a9225b97609b49a0aa5aae37a23cb42a8287193e08777455efd1851567feff07b48702f0aaa1a112
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
new file mode 100644
index 000000000000..95c7b5cdff4f
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools pam
+
+DESCRIPTION="Control Group manager daemon"
+HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc64 x86"
+IUSE="pam selinux"
+
+RDEPEND="sys-libs/libnih[dbus]
+ sys-apps/dbus
+ selinux? ( sec-policy/selinux-cgmanager )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch_user
+
+ # systemd expects files in /sbin but we will have them in /usr/sbin
+ pushd config/init/systemd > /dev/null || die
+ sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
+ die "Failed to fix paths in systemd service files"
+ popd > /dev/null || die
+
+ # there is an automagic dep on pam
+ epatch "${FILESDIR}/${PN}-0.39-make-pam-conditional.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-distro=gentoo \
+ $(use_enable pam pam-module) \
+ --with-pamdir="$(getpam_mod_dir)" \
+ --with-init-script=systemd
+}
+
+src_install () {
+ default
+
+ # I see no reason to have the tests in the filesystem. Drop them
+ rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+}
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
new file mode 100644
index 000000000000..88b2a849915a
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam
+
+DESCRIPTION="Control Group manager daemon"
+HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="pam selinux"
+
+RDEPEND="sys-libs/libnih[dbus]
+ sys-apps/dbus
+ selinux? ( sec-policy/selinux-cgmanager )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ eapply_user
+
+ # systemd expects files in /sbin but we will have them in /usr/sbin
+ pushd config/init/systemd > /dev/null || die
+ sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
+ die "Failed to fix paths in systemd service files"
+ popd > /dev/null || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-distro=gentoo \
+ --with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
+ --with-init-script=systemd
+}
+
+src_install () {
+ default
+
+ # I see no reason to have the tests in the filesystem. Drop them
+ rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
new file mode 100644
index 000000000000..eed626f3e68c
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
@@ -0,0 +1,31 @@
+--- Makefile.am.old 2015-09-06 00:16:38.997836415 +0800
++++ Makefile.am 2015-09-06 01:05:00.376009752 +0800
+@@ -133,6 +133,7 @@
+ $(CCLD) -o tests/cgm-concurrent tests/cgm-concurrent.o \
+ $(NIH_LIBS) $(NIH_DBUS_LIBS) $(DBUS_LIBS) -lpthread -lcgmanager
+
++if HAVE_PAMMODULE
+ pam_LTLIBRARIES = pam_cgm.la
+ pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h
+ pam_cgm_la_CFLAGS = $(AM_CFLAGS)
+@@ -145,4 +146,6 @@
+ rm -f "$(DESTDIR)$(pamdir)/pam_cgm.a"
+ uninstall-local:
+ rm -f "$(DESTDIR)$(pamdir)/pam_cgm.so"
++endif
++
+ tests: TESTS_CGM_CONCURRENT TESTS_SCM TEST_NSTEST
+--- configure.ac.old 2015-09-06 00:55:48.262972928 +0800
++++ configure.ac 2015-09-06 01:04:19.683301852 +0800
+@@ -127,6 +127,11 @@
+
+ AS_AC_EXPAND(SBINDIR, "$sbindir")
+
++AC_ARG_ENABLE(pam-module,
++ [AS_HELP_STRING([--enable-pam-module],[build PAM module])],
++ , enable_pam_module=no)
++AM_CONDITIONAL([HAVE_PAMMODULE], [test "x$enable_pam_module" != "xno" ])
++
+ AC_ARG_WITH(
+ [pamdir],
+ [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])],
diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1
new file mode 100644
index 000000000000..6efc80b7155a
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Control Group manager daemon"
+pidfile="/run/cgmanager.pid"
+command="/usr/sbin/cgmanager"
+command_args="-m name=systemd"
+command_background="yes"
+retry="TERM/45"
+
+depend() {
+ before cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1
new file mode 100644
index 000000000000..ceb075254a3f
--- /dev/null
+++ b/app-admin/cgmanager/files/cgproxy.initd-r1
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Control Group manager proxy"
+pidfile="/run/cgproxy.pid"
+command="/usr/sbin/cgproxy"
+command_args="--daemon"
+command_background="yes"
+retry="TERM/45"
+NESTED="${NESTED:-no}"
+
+depend() {
+ after cgmanager
+}
+
+start_pre() {
+ if ! /usr/sbin/cgproxy --check-master; then
+ ewarn "cgmanager is not running"
+ return 1
+ fi
+ # cgproxy should only run on container unless on older kernel
+ if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
+ eerror "Too old kernel to support cgroup, please update to >3.8"
+ return 1
+ fi
+}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
new file mode 100644
index 000000000000..734f29efb788
--- /dev/null
+++ b/app-admin/cgmanager/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>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
new file mode 100644
index 000000000000..d586024c0d4c
--- /dev/null
+++ b/app-admin/checksec/Manifest
@@ -0,0 +1,11 @@
+AUX checksec-1.7.2-path.patch 510 SHA256 6a3ab23a8ffcb3f117b74bcbea4a2525cb4d3425636f38f622b27bce512e9c8c SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706 WHIRLPOOL c4dcaf9f2d0fe44a8a83351179e332c4e28cd4c06d005d48fd9fa977d11f205a7554b0266029cb0c8476f49c3d40ede793292fadf8c95ec505184ad2395f94ac
+DIST checksec-1.7.2.tar.gz 16717 SHA256 eb17f2162e7f563ba0f97d9cf15f92cf1ba2d360c8293a33d66573d5a48822a8 SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1 WHIRLPOOL 3abf206d666751b2449387848afb320185102ddc0f1685db2aa6f4e974a3349e1c4d9551565459d9070cac5218354af1919c5c70af6f0131b9443fcf24a72d35
+DIST checksec-1.7.3.tar.gz 49136 SHA256 d9bb3dd6be95a4d30d3ebe6adb8ae2aa64db0b9d2c475db00134a9596d555cbf SHA512 daf311cceb1a2132e87169b3c7a1254a2be418e7274ea9dda0aa7a1a6dbf72aa7531a7d157cd0a776fd7076e75db91ba5fc901fa94ab49d97f9ff7e4c2a56806 WHIRLPOOL 8be332a89727a6d397f5ba8a0e7032d85fce054ef68b83bd7d4460fc521b895eb37b7aa701ff84df6193bd0e032f5c5aa4e67d8823ee0854a1febf73febc10cf
+DIST checksec-1.7.4.tar.gz 51677 SHA256 ffa9b73b41f97d341fca5d46ebe93480110450bf37deb1126a29ea8548f854ae SHA512 ed14f5f8917983a10faa06a2659ccea3256799bc2a4a151ad06ca7b1a984b70673b4fd10191be7c97bbdf9e5def64161b00434b84130ae0464610afec8754e69 WHIRLPOOL ebaa662ed272489fef860650bb6ca094b6bbb992604235bbfbf4806a502dcd8393aff6ba5a1f20b43f4019209077c3d2aa6ef2e62180b4abbeb289c790267f08
+DIST checksec-1.7.5.tar.gz 51266 SHA256 7f863279edade48418adf1a4ed1899ff46c45aa7e148229369f15f8f5ca54e9e SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098 WHIRLPOOL e1e8d21bfb13377472116503d137d555f84810bdd036676b8d600cd99aef81ed52b8600b07bb3b0e6be450069185cf52aca5ad1f1064d7895dc3f11966426ded
+EBUILD checksec-1.7.2.ebuild 607 SHA256 54e66a39e01041829bcc590d929f4ac727251de02cc57fc401dd7d7c779af97c SHA512 58c91a1218b6660faf0b536f103412ae4cf7a28a5afab72221370d56b9f0630904a0f8e2231278a9f0d1655af17de1b6522617e71795f7e724450e55ec83a072 WHIRLPOOL 18e0eb95afd6ef696f038acd1a15f4d482064bd5b13140904c581b6a47f6d7b6d2ed8686dcaf90826627387ea2eed0e4fb6ccd4b1321ecf6a497a089256cad4a
+EBUILD checksec-1.7.3.ebuild 614 SHA256 35124a1d19eebc1795aff6822a66d6b8f6d6b052032d319271368d55dceef5c5 SHA512 4aaed544ea5ef48ca40f0972b37a7d54dbb2cd6e839fa2b76da661a0f376d87a92d1bf0cbdc54a08eb92349454e94e1b743352aebcccab83b7da783866320e4d WHIRLPOOL 1a76b0b2367c5872739b078e37cbcbee07dcd1cfe56f65bedfc54ec8fd23cee02c294bcb803b4a7158c57bbbd5b22e10e8a01fd29666e11a04b96a3b29fb3867
+EBUILD checksec-1.7.4.ebuild 763 SHA256 a4f5bca00bbf4b872971d29b5104dc81d22d7a478e96aa49b9eaf91657e01b1b SHA512 adac799af1ba012b1c16cdc3d9ceb4a7d69742cdb4550b30bae5d8abcc1df73166c4eff4340a7a60ef80c34c15a84f39bc722bf3e9bfdac884386853511583c0 WHIRLPOOL eda4a2081b27f2df1feabeb869b98511a230c69b0b8b378c3c464d193f8e3141b586e09be7df1f663dec91be4f04bdc8a147a74bb01aa72e88ef6ff83427c47b
+EBUILD checksec-1.7.5.ebuild 763 SHA256 a4f5bca00bbf4b872971d29b5104dc81d22d7a478e96aa49b9eaf91657e01b1b SHA512 adac799af1ba012b1c16cdc3d9ceb4a7d69742cdb4550b30bae5d8abcc1df73166c4eff4340a7a60ef80c34c15a84f39bc722bf3e9bfdac884386853511583c0 WHIRLPOOL eda4a2081b27f2df1feabeb869b98511a230c69b0b8b378c3c464d193f8e3141b586e09be7df1f663dec91be4f04bdc8a147a74bb01aa72e88ef6ff83427c47b
+MISC ChangeLog 1641 SHA256 402371d3ff958b8142f3c59e435b1f3d13cd95e35e71d7e6b054cf6a82cf79c8 SHA512 9f01a9104e5044d18a6f7ca7fcaca0ea93509d66282b59b0c75fd7b1b4e2b2dc5cc9e814e9dd5f1bf043dcd1594d202d079de9f533f3b8ca2adfad2bd4c5a931 WHIRLPOOL 372d3d4f5ac891cf63aa79644c4e197df7261f7508adda21ead3a684b3e78db978635da18a171d300204648ce66b5a73f7ef6aef4e3957857a4673dcfb5321c6
+MISC metadata.xml 334 SHA256 ec0cd6500f2cd469afbcb6786442ec708f991921413ffde574c7e6a6be504bc1 SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716 WHIRLPOOL 4413a04ac4d3e713bb49b806e21dbca415e272d287965f46a2d1d4bbb625510844cb9e5c31541197f8578e9171b10bbfad9496625f09365a5bdd0cb52247f820
diff --git a/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild
new file mode 100644
index 000000000000..8945352cbd14
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-path.patch
+}
+
+src_install() {
+ default
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-1.7.3.ebuild b/app-admin/checksec/checksec-1.7.3.ebuild
new file mode 100644
index 000000000000..e88dfd5d8fa1
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+}
+
+src_install() {
+ default
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-1.7.4.ebuild b/app-admin/checksec/checksec-1.7.4.ebuild
new file mode 100644
index 000000000000..eda9b9a0226d
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+ sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+ default
+
+ doman extras/man/*
+
+ insinto /usr/share/zsh/site-functions
+ doins extras/zsh/_${PN}
+
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
new file mode 100644
index 000000000000..eda9b9a0226d
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
+ sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+}
+
+src_install() {
+ default
+
+ doman extras/man/*
+
+ insinto /usr/share/zsh/site-functions
+ doins extras/zsh/_${PN}
+
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/files/checksec-1.7.2-path.patch b/app-admin/checksec/files/checksec-1.7.2-path.patch
new file mode 100644
index 000000000000..aa048b079d53
--- /dev/null
+++ b/app-admin/checksec/files/checksec-1.7.2-path.patch
@@ -0,0 +1,24 @@
+From 2065e51b255b5f9c014a0db35ffe5ce9ea946693 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 6 Jan 2016 17:28:36 +0100
+Subject: [PATCH] Extend ${PATH} so that sysctl is found
+
+---
+ checksec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/checksec b/checksec
+index 3660e82..0ac685f 100755
+--- a/checksec
++++ b/checksec
+@@ -59,6 +59,7 @@
+
+ #set global lang to C
+ export LC_ALL="C"
++export PATH="${PATH}:/usr/sbin/" # for sysctl
+
+ # global vars
+ debug=false
+--
+2.7.0
+
diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
new file mode 100644
index 000000000000..5d7a81f67440
--- /dev/null
+++ b/app-admin/checksec/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">slimm609/checksec.sh</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
new file mode 100644
index 000000000000..4c6a25b32b94
--- /dev/null
+++ b/app-admin/chroot_safe/Manifest
@@ -0,0 +1,6 @@
+AUX chroot_safe-1.4-ldflags.patch 399 SHA256 eb0f6af6b3565104c2fae3ec7138ff6587104af3a112b358398277f9ab2d28d4 SHA512 f5e3114b5d553f95d1b885d1ff43aee4d3cfb2d15a5d519818ff2f4c36fe099cdd27e6bd578dbf7ce957c38d8b329fd786f0efb22d0785197706e19892da2753 WHIRLPOOL 5757f4606751a7754a919496964b2f1c16eb2390ab2bb5a953a7252e52db4c12da510eac5df0f48282a513bddc93568d2687256d7a58606e982f6c87c60cb312
+DIST chroot_safe-1.4.tgz 25886 SHA256 dcdd299e0275838531bbc53de3bb5ecd70f99d0af5fa328e8de761b4de4623bf SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61 WHIRLPOOL 749e5924d233e1818330692f1a693e4e41bfb7eca732c97a49c17f69513212a84a2b02feb38f7224c0086a42d547680721712ae92f7776b048a69b77c906f4d9
+EBUILD chroot_safe-1.4.ebuild 783 SHA256 c6a22754dac98a699054133dccb4fc996d3b2998f2e00bb13a4aeea5abbe9883 SHA512 f5977571dfaf1f7e63cdd6d75bd7ba01986856e75bb73dcc49f0da6d08f9a127cfe56cb286026f3f504956994e238fa53cf571400f4fdcba2116b9935c455364 WHIRLPOOL 6a1f77712e25afaed0df775d6788b60bab9a1d0685b7811407f448e84effdc5a325907bc741c44c129582849111e4f68c0d9bb73d3d4fc27865ab612543cebcd
+MISC ChangeLog 2569 SHA256 ef322f35c74d1ff220474c2a46f0511b45e363da957a927a4ef193756a73ed38 SHA512 f488946b8c06057ab04a692ae7098c908d5c8c1091202bd1e582a3e161136ddc71f954eeecb2313add80c7c58f089a78b0068c3085837f59907eda69ec37330e WHIRLPOOL 4241ab13931a03a635628b7fa10b257cfd10ee5c5e6014d45cf98a5894c1f9eba3d858a24af889488f4e18a8a9ea1f6c7b2ccf51ff5dea347137a3b49296a33e
+MISC ChangeLog-2015 2018 SHA256 1083ee99265e7147e07a4bf43734b9fadab7387b9433650b98968d7132d6934a SHA512 03291cc29912c901c0c24704c5546a4da3f32560300c25c047262f060c1f099dcb645a1376b7b2acc6fff85a5a01f8ef42f8d64253060b1ad6a6ee53e6776ba2 WHIRLPOOL 4496c81519cab0e76cfa2edd0909ad40404ad04a8e00276034cc396ca3d1548a0fb79ec573045544c5234c846e799466482e8f28ceea57086b90f2b279bc3383
+MISC metadata.xml 247 SHA256 7b9ad3d03ac30d1af7471c82d68f3326668cde9f3229309d9e13b6c855b41be6 SHA512 c46fc3160d29be2ce0948b1503ce44ead81dc76a264e183dc667be4e4f9bce0e235c94c2ebd06934b63cc7575aa8d5f27a528bb79185d35a138c7e0ec6dd1e3c WHIRLPOOL 2e4305dd0416c3428cbb0ee0de6ca1f4cd42defff16fabb624c9720d3021ae1f67f01c323cdac15cc1a31a12efe31f966875f62ddfc1c7ed07db3a83a4cf4b07
diff --git a/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
new file mode 100644
index 000000000000..210b10565d66
--- /dev/null
+++ b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="a tool to chroot any dynamically linked application in a safe and sane manner"
+HOMEPAGE="http://chrootsafe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN//_}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_configure() {
+ econf --libexecdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_compile() {
+ emake CPPFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+ dolib.so chroot_safe.so
+ dosbin chroot_safe
+ sed -i -e "s:/chroot_safe::" "${ED}"/usr/sbin/chroot_safe \
+ || die "sed chroot_safe failed"
+ doman chroot_safe.1
+ dodoc CHANGES.txt
+}
diff --git a/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
new file mode 100644
index 000000000000..e9e94580ac42
--- /dev/null
+++ b/app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index ce69ab7..e8542b5 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -12,7 +12,7 @@ install=@INSTALL@
+ all: chroot_safe.so
+
+ chroot_safe.so: chroot_safe.cpp Makefile
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(DEFINES) $(SOFLAGS) -o chroot_safe.so $<
+
+ clean:
+ rm -f *.o *.so *~
diff --git a/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
new file mode 100644
index 000000000000..7c5fd5d3ecad
--- /dev/null
+++ b/app-admin/chroot_safe/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">chrootsafe</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/chrootuid/Manifest b/app-admin/chrootuid/Manifest
new file mode 100644
index 000000000000..01af1c386186
--- /dev/null
+++ b/app-admin/chrootuid/Manifest
@@ -0,0 +1,6 @@
+DIST chrootuid1.3.tar.gz 5439 SHA256 93dd1af0220bce0c0265c9f810a89f7fae56b34b7077397f8ea2dcb54ec169b3 SHA512 55ccc60e6010910466e700f9d0f2f666bc16ab72af3fbc1115916b4e005684d9ad28bc0b8b1cba3804ca68384c3b0fbe137114623eba70241eb8653325382a1f WHIRLPOOL 74345cb020589f0af4b99b3c3a55b38a7d10e6fd81801e80da70347e038c703641d0904add57f90cb7c1c557aec9796193a77210c976c2b9ccd3ea6dc89f62e0
+EBUILD chrootuid-1.3-r1.ebuild 623 SHA256 c6131d40813a4453984aceb5abd9d9aae18fa615373dba5095856b4a77b612b2 SHA512 a31cc38602064d125b9ef6060d9a1d9ea15728501b4a36ed45b2e282d4be159e3632df1d6fa3747e5596321ee753de7864d3732b51e25628ba3040b21e29d76f WHIRLPOOL 60e8c0b862ac4da58b34fd92e2e45dc332441943a3bc24b8c77766028f5824945e37a18626020c1e2c72cda4590843fa61f63cfea49a470a47200bd4b0f5b04b
+EBUILD chrootuid-1.3.ebuild 612 SHA256 20d742ba6e32ff163fa41f503fd7a508228118545d24a28c797e0bba382c7e65 SHA512 f7d9614890643a445c194e704dd72b4ac59ceadba15e4df53cb6a5e7b46eebbf40b785ffb371e6ae07be0a6f09b575646d1bf570592f7101d3a0d8dddeb7f23b WHIRLPOOL 6c0fcac40a073914c8a95f9e0966f0bb07b3d549851ff849f2445cac4d28f5b7b6753808ab6bcc7ac3e98ca3e8609b3bcb246faa4149c9b52958de3f3e3b2326
+MISC ChangeLog 2237 SHA256 d72e008b51586d8f8b6169a746996a68d18e6c492f84cb4e9a2612ad9a49ed36 SHA512 7d9f4e3d851b564825314187bccc635fa7be88a6ceef63dc29af42e1b49b086dd5103d71cfbd16d3c19266f6586e1049c8d5a272c31a8ac808dbb9372124f375 WHIRLPOOL 64e0fda45850d014bef1631723a6bc549f7eb4d4f630d2e9da5138297a06e4caff99de0fdbf6c498b838002e53f67cb0db0ed629328eeda09deb135da4f2a7d2
+MISC ChangeLog-2015 2216 SHA256 aea5dfa4108b194d0fa6cc63241315ea2f8f686c4f2fe0a868417574484b6476 SHA512 259bc368de4ce7b6b10a93d5aeb0562292feb1017e464cdf784ee47aad9145ed002032e04e1266dac8c29738eda26c671bd136ceaba4c0ee759c984b64d83da5 WHIRLPOOL 11beb5a345789a324372567213e3dcd6bfa26e18da1f578cf04f4a9047b67e85ad2205f4848c44572af4afd1826a73a0e41dbc8123b9cbc62875c6a82a115f53
+MISC metadata.xml 222 SHA256 8154ba4e9eae0a386590551ab65d4008e950560a663151405e5ee8c1fa073e12 SHA512 a92bf1c4f983f2c7c834060538f86818a43cd13c06fda425d628a50b3f890fa3e6c36640a449df57af495ac39c3baf3560a4555cacd32c71f3dde533a992556a WHIRLPOOL 362f8b1970ea2f9b52b03d281cad8bd3d1c0ee89d053ab562245c68f2bd8142eb5d759d097d0258ee24745065c96665ecae7795e103c040f1261fea5c9d2e9a5
diff --git a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
new file mode 100644
index 000000000000..4c7913e04081
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="Run a network service at low privilege level and restricted file system access"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dobin chrootuid
+ doman chrootuid.1
+ dodoc README chrootuid_license
+}
diff --git a/app-admin/chrootuid/chrootuid-1.3.ebuild b/app-admin/chrootuid/chrootuid-1.3.ebuild
new file mode 100644
index 000000000000..c2c45d72e5c0
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="Run a network service at low privilege level and restricted file system access"
+HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ia64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin chrootuid
+ doman chrootuid.1
+ dodoc README chrootuid_license
+}
diff --git a/app-admin/chrootuid/metadata.xml b/app-admin/chrootuid/metadata.xml
new file mode 100644
index 000000000000..75fc762a7ae6
--- /dev/null
+++ b/app-admin/chrootuid/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>hattya@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
new file mode 100644
index 000000000000..c7a1990529e9
--- /dev/null
+++ b/app-admin/chrpath/Manifest
@@ -0,0 +1,8 @@
+AUX chrpath-0.13-multilib.patch 4129 SHA256 332b779882707da6558965eccf1ab220781124ff9b879da5023d2efb90b86434 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3 WHIRLPOOL a4fc4f3ea617d930cf3afedc78cdc2c6add3647c2ef53bfd7721deaff8007f5e6ec8fdc6325319286ebe3be39926c3576421b0f1d4229ed9f763763aef2d2403
+AUX chrpath-0.13-testsuite-1.patch 575 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c WHIRLPOOL 8fe7b3892ab4b7a31292dc70a69c620add39e1b826b2612233a171186f7f70022a5d3d19caef921a93888542f3e7e0b5b2034b5874742294ce34393bd7f0a400
+AUX chrpath-keepgoing.patch 1041 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c WHIRLPOOL 672b65fb60207d4b9325ab2a5a8f8c35ac2082d8cddd3ec03e631558dc0cebc9b1edcfef637b8e85fa8a1a8943e210ad8df234b96f88b1bcae5008365ee434d1
+DIST chrpath-0.13.tar.gz 125129 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e WHIRLPOOL 7bd658095647ef13bbad2e07e14ea3d3b7d3de7bb71c272465701a5430a76ce33639a641f8964194c8a78c181401522d175181da6c73336392e5f8444d43f1e8
+EBUILD chrpath-0.13-r2.ebuild 1209 SHA256 cceb51a70587372303b8bc191eda25064ea2b61565ef44f65a23bd37522969fb SHA512 1731e466cf0a5906ee25e0f0dba89c992a59f3ad553b1a67a3f2d1b912e5eccac256d14e4cb60701e50648b03be7db1db2d6d32317c69d1193f83d39dac369cd WHIRLPOOL 719eb2690c545ca9be8f9e8c570a1fed5cd3a77db902a62ad96187a9f42821759a019d9edeb43fc054e6bc5a83ddd5f339206a1816a8e960b9d1cc9aaf419b2b
+MISC ChangeLog 2541 SHA256 fdf1e927e10a6da5574a2de6df619e179d8b3f53b2834c7037843c1b9388e646 SHA512 6c5f7aac2e1079a1027fef7277b6243d2014a2c6bb30d6cc4bfc7d2e67843e4c84c6c5dc217ebc60df97159c847a775169ee3ea45b2e22588d8bf2b358fc7e10 WHIRLPOOL 1868e8cb4a7c99c914bc1271c9e9bf770f2d8c0bcea35875742b9af124bfec02bb579b69d4ace90ff25d959f75b8caddfb7aa917a20b2f646ce64165ac84026d
+MISC ChangeLog-2015 4765 SHA256 00098156f3972943bf4094fa78d2554701509df903f89d246ddb9dafbeea8c9c SHA512 5bf27a7fc83e9c9f0cabc489cc5e40e9fed3185a9d4aade1e34bcb4417fad3224452287ee2a5f07c166535fda30497edd00d2c9c187f89a5735af1def9858aa9 WHIRLPOOL 380b6d05543fc0ef267ddae7147cddb58af6aa5dc531b854275173c03679c3de12e855d91a2674ec77a09deaa83850803f786a86957a38f82005c8559ac0e9af
+MISC metadata.xml 325 SHA256 c75790b17f16edac1b8b08913fc42a7e4aeedd3fe039a06530183e12d7acc2e8 SHA512 bc84447080d9969bb04b15981db6ef6cc35d7a38a796085a7397f5bf2f629ea97785828f895aeb8296e87977d40991a4dd5ffec9cf4ae2393f267afa8d3768c8 WHIRLPOOL eab64c461c6c3b85091d87a422381ac3248355ba730b64ccabefe2a53bb4b0658741b908e3cc083b5c4bfa4c447bce3315f1719226c3a72323876c3727921894
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
new file mode 100644
index 000000000000..fe4a867ea648
--- /dev/null
+++ b/app-admin/chrpath/chrpath-0.13-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 eutils autotools
+
+DESCRIPTION="chrpath can modify the rpath and runpath of ELF executables"
+HOMEPAGE="http://directory.fsf.org/project/chrpath/"
+# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
+SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-multilib.patch
+ epatch "${FILESDIR}"/${PN}-keepgoing.patch
+ epatch "${FILESDIR}"/${P}-testsuite-1.patch
+ # disable installing redundant docs in the wrong dir
+ sed -i -e '/doc_DATA/d' Makefile.am || die
+ # fix for automake-1.13, #467538
+ sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc ChangeLog AUTHORS NEWS README
+ use static-libs || find "${D}" -name "*.la" -exec rm '{}' +
+}
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
new file mode 100644
index 000000000000..e7db0a124053
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
@@ -0,0 +1,160 @@
+Index: chrpath-0.13/Makefile.am
+===================================================================
+--- chrpath-0.13.orig/Makefile.am
++++ chrpath-0.13/Makefile.am
+@@ -12,12 +12,19 @@ debs:
+ fakeroot debian/rules binary
+
+ chrpath_SOURCES = \
+- chrpath.c \
+- killrpath.c \
+ main.c \
+- elf.c \
+ protos.h
+
++chrpath_LDADD = $(LDLIBS)
++
++lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
++libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
++libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4
++libchrpath32_la_LDFLAGS = -avoid-version
++libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
++libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8
++libchrpath64_la_LDFLAGS = -avoid-version
++
+ EXTRA_DIST = ChangeLog.usermap $(man_MANS)
+
+ CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
+Index: chrpath-0.13/configure.ac
+===================================================================
+--- chrpath-0.13.orig/configure.ac
++++ chrpath-0.13/configure.ac
+@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+
+ dnl Checks for libraries.
+
+@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_BIGENDIAN
+-AC_CHECK_SIZEOF(void *)
+
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(getopt_long)
+
++dnl See if we need -ldl on this platform for dlopen
++LDLIBS=
++save_LIBS="$LIBS"
++LIBS=
++AC_SEARCH_LIBS([dlopen], [dl])
++LDLIBS=${LIBS}
++LIBS="${save_LIBS}"
++AC_SUBST([LDLIBS])
++
+ if eval "test x$GCC = xyes"; then
+ for flag in \
+ -ansi \
+Index: chrpath-0.13/main.c
+===================================================================
+--- chrpath-0.13.orig/main.c
++++ chrpath-0.13/main.c
+@@ -12,13 +12,19 @@
+ # include "config.h"
+ #endif
+
++#include <dlfcn.h>
++#include <elf.h>
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #endif
+-#include "protos.h"
++
++typedef int (*killrpath_t)(const char *filename);
++typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert);
+
+ #ifdef HAVE_GETOPT_LONG
+ # define GETOPT_LONG getopt_long
+@@ -61,6 +67,30 @@ usage(char *progname)
+ printf("\n");
+ }
+
++static unsigned
++elf_class(const char *filename)
++{
++ Elf32_Ehdr ehdr;
++ int fd;
++
++ fd = open(filename, O_RDONLY);
++ if (fd == -1)
++ return 0;
++ if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
++ {
++ close(fd);
++ return 0;
++ }
++ close(fd);
++ if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
++ || (ehdr.e_ident[EI_VERSION] != EV_CURRENT))
++ {
++ fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename);
++ return 0;
++ }
++ return ehdr.e_ident[EI_CLASS];
++}
++
+ int
+ main(int argc, char * const argv[])
+ {
+@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
+ #ifdef HAVE_GETOPT_LONG
+ int option_index = 0;
+ #endif /* HAVE_GETOPT_LONG */
++ void* dll[2];
++ killrpath_t killrpath[2];
++ chrpath_t chrpath[2];
+
+ if (argc < 2)
+ {
+@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
+ }
+ } while (-1 != opt);
+
++ dll[0] = dlopen("libchrpath32.so", RTLD_LAZY);
++ killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath");
++ chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath");
++
++ dll[1] = dlopen("libchrpath64.so", RTLD_LAZY);
++ killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath");
++ chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath");
++
+ while (optind < argc && (!retval || keep_going))
+ {
++ const char* program = argv[optind++];
++ unsigned eclass = elf_class(program);
++ if (!eclass)
++ {
++ retval = 1;
++ continue;
++ }
+ if (remove)
+- retval |= killrpath(argv[optind++]);
++ retval |= killrpath[eclass - ELFCLASS32](program);
+ else
+ /* list by default, replace if path is set */
+- retval |= chrpath(argv[optind++], newpath, convert);
++ retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert);
+ }
+
++ dlclose(dll[0]);
++ dlclose(dll[1]);
+ return retval;
+ }
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
new file mode 100644
index 000000000000..1a30ce1eb94a
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
+Date: 2010-04-04
+Initial Package Version: 0.13
+Origin: me
+Upstream Status: unknown
+Description: make the testsuite run with the new mltilib design
+
+diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
+--- chrpath-0.13.orig/testsuite/runtest.sh 2010-04-04 09:02:21.859114159 +0000
++++ chrpath-0.13/testsuite/runtest.sh 2010-04-04 09:42:08.762112560 +0000
+@@ -2,6 +2,8 @@
+
+ set -x
+
++export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
++
+ CHRPATH=../chrpath
+
+ retval=0
diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch
new file mode 100644
index 000000000000..d8f6965729ff
--- /dev/null
+++ b/app-admin/chrpath/files/chrpath-keepgoing.patch
@@ -0,0 +1,20 @@
+--- chrpath-0.13/main.c.orig 2006-02-27 20:21:06.000000000 +0100
++++ chrpath-0.13/main.c 2006-02-27 21:07:16.027641500 +0100
+@@ -57,6 +57,7 @@
+ printf(" -r <path>|--replace <path> Replace current rpath/runpath setting\n");
+ printf(" with the path given\n");
+ printf(" -l|--list List the current rpath/runpath (default)\n");
++ printf(" -k|--keepgoing Continue as much as possible after an error.\n");
+ printf(" -h|--help Show this usage information.\n");
+ #ifndef HAVE_GETOPT_LONG
+ printf("\n *** The long options are not available on this platform");
+--- chrpath-0.13/chrpath.1.orig 2004-09-19 10:35:44.000000000 +0200
++++ chrpath-0.13/chrpath.1 2006-02-28 10:06:28.187060500 +0100
+@@ -22,6 +22,7 @@
+ [ \fB-r\fP \fI<path>\fP |\ \fB--replace\fP \fI<path>\fP ]
+ [ \fB-c\fP | \fB--convert\fP ]
+ [ \fB-l\fP | \fB--list\fP ]
++[ \fB-k\fP | \fB--keepgoing\fP ]
+ [ \fB-h\fP | \fB--help\fP ]
+ \fI<program>\fP [ \fI<program>\fP ... ]
+ .SH DESCRIPTION
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
new file mode 100644
index 000000000000..ec89a074cbfa
--- /dev/null
+++ b/app-admin/chrpath/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>grobian@gentoo.org</email>
+ </maintainer>
+<maintainer type="project">
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
new file mode 100644
index 000000000000..df8399b90a10
--- /dev/null
+++ b/app-admin/cli53/Manifest
@@ -0,0 +1,5 @@
+DIST cli53-0.8.9.tar.gz 4372517 SHA256 c3b17d5b445d9bbfe3caf9552d4c0bbec649fd630e8eb13cbb5bc49522b02d73 SHA512 14db2d69feaa5af9e82c77b6c837be55a5d97e438eb6efbb71857fa1630ec1aa5ec77648d0979ce69ca8fcf72478b55c55c12a5e5dbac20415e656fd9c8d0beb WHIRLPOOL 2606a227142211e06096467143106e5657ecc5f2072a3450dbf41af440bfe3dbdf1d385a55accb38c625e42501e3077926e2bee0265affac66b7c0d6f7413b76
+EBUILD cli53-0.8.9.ebuild 673 SHA256 e98676dd1e446cbd73204600450b89cf69331a57b70cff7afc7b142f0f81e3aa SHA512 d4935cf863dd45b05d1c099af76943c6b79bb5ce6830d7c9b730e49cc0ed4e0169037291e9f193b445f4b5d58bd86f0b0441a6ea92bbe1d150ac3b2d01a03590 WHIRLPOOL 27081b5da3e557c7148d9f3d7034e70ff5f288cf5ae1beeb71c113648ff43183823b6a53b6771f5e692df6c8e7b49beffa38847ebd9fb637fca52aa876a591ef
+EBUILD cli53-9999.ebuild 673 SHA256 aeda60a22da719c5c5083c16d23f93c3fc19110354fe32bb0d8793d51eb33111 SHA512 0fe48f48ede9500a63bbeb03f4da47aaa4235fb0fa2c29519b3860adda4c37a5a0e97587d5825ae75d97fedcef4fce5837662c7ccd88b2f6be9c3011cd73b201 WHIRLPOOL cdaec886a9b050dcf760c3d92a07bf21aa9fb24102d9a5aaebda7c7ec369440f30dc5d64f3b7dcaa775a7ad23baabeddaaad94cf90e372f5b8585d40cc34b457
+MISC ChangeLog 2842 SHA256 d57c8f789553012233b74a4849cddb3699b7de309f8ce322f4ebfd8ef8b3841f SHA512 89f809f5927c29eab9a47d1d3d839e3d82064271997d027408e8c088aa20fae69496a7f72ae8c54d3b24afdb2f5a2ab46a91747ee5b6b200568938403cd3b80c WHIRLPOOL d13ecabc30fbc2cb6aabfd6de05c370ddcebcb14e92ea15dcb8896da4647845f3ae5b107a59ad0d004f09a4f25a33965f5f1c24b77d3a3cfe740ad188935ae73
+MISC metadata.xml 325 SHA256 11d45cb41bf54f43a37769bdcb2bc8621092428a80815cc2c218b8ac5ab77213 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6 WHIRLPOOL 3cb26e2bfbf60c0071dbdc14c584ce175be9e06fcb8248e73d707c6d54516b02a13de1e928a88d49e8c097929924d8017aaf4191f5859455104b324d194c8d37
diff --git a/app-admin/cli53/cli53-0.8.9.ebuild b/app-admin/cli53/cli53-0.8.9.ebuild
new file mode 100644
index 000000000000..c2d625e1fc6d
--- /dev/null
+++ b/app-admin/cli53/cli53-0.8.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ inherit golang-vcs
+else
+ inherit golang-vcs-snapshot
+ SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+ dobin cli53
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
new file mode 100644
index 000000000000..6b40b7aa8485
--- /dev/null
+++ b/app-admin/cli53/cli53-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ inherit golang-vcs
+else
+ inherit golang-vcs-snapshot
+ SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Command line tool for Amazon Route 53"
+HOMEPAGE="https://github.com/barnybug/cli53"
+
+LICENSE="MIT"
+SLOT="0"
+
+EGO_PN="github.com/barnybug/cli53"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}" emake build
+}
+
+src_test() {
+ GOPATH="${WORKDIR}/${P}" go test -v || die
+}
+
+src_install() {
+ dobin cli53
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/cli53/metadata.xml b/app-admin/cli53/metadata.xml
new file mode 100644
index 000000000000..236c772d21c3
--- /dev/null
+++ b/app-admin/cli53/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>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">barnybug/cli53</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/clog/Manifest b/app-admin/clog/Manifest
new file mode 100644
index 000000000000..37eb6702428c
--- /dev/null
+++ b/app-admin/clog/Manifest
@@ -0,0 +1,5 @@
+DIST clog-1.1.0.tar.gz 76267 SHA256 ff4ac19b2622d49b4fca0d44ee3659398f3486f54d77562650e45310c6a5d4f7 SHA512 e44449025a1eb7490152d467167a7417f8982caf14dbdf6b54cf83fd5f47cf037740d99ec322b74381052f96064a1f6e0f01fced9a2414644ad86eeab0ce448d WHIRLPOOL caeba7c0c6a676353cb41751dedc1f5ffc889849474a6fe91ad8160cd85e5fc352e01bf372ec7bfc239f895a6c6cd6682b8021baef1ce711e9c64c0b73baa3f0
+EBUILD clog-1.1.0.ebuild 840 SHA256 74e83f82968f84c5b9befe839585a149acf2012906d2d3ec63a132ddc963da96 SHA512 e4da4b432427d0c340006a2f8325a105beda4bd5493b20d781bf4606fd13ca5787add1868c3c8116d7d5029a1a19d8ee04a12a372a1ed221184cea7c645216be WHIRLPOOL 1cd4b771fdf3a0ec735df99aff07f587d06dbf1dabd999ae8082c851aedd9b11558c3fca2ebf0738d2d2448c7c0fb69b362247d0e92b4f5bdd2705785c22ab76
+MISC ChangeLog 2168 SHA256 ca0ce9be5ef130dcd4450eddacc79cfbca7b8015dc6ba7a92af2474cfe439b9d SHA512 ba7701b15d8c510bfbc6b65b0a73552f8c844af5ef7d6acf32425aff74fc68cdd29b8f5c88ab9f20a059f5c42652e4229a25fb93e36b196b6cf9fab55ec2b320 WHIRLPOOL 862cabc43b13e871aa851d57910a2ca99f68e63d40677b06c9279973a447624169b77816dff9dc96274f1b9272d691c822b9e94d92c8d2355d2b43c99438aa60
+MISC ChangeLog-2015 711 SHA256 ce2037281ed521aa42c4fb498bef445241012e530093464b6bcc8e89d2047dc3 SHA512 a1c4c359620ab0b50ab3cc53a9aa6ceac2183eb998601592b8d84a20f931286b2c73f8041542d0d6b5c7fed9cd78f148c7c55de4f606b1fe4462ceb6f4c50d1b WHIRLPOOL 82913b7daa7565d30298247f58443b85073d3fc18e805b1dc09be4d0387b8512252efd4a5607ef1c821eff4cbc09ed08b8783677651d3b050acf2a339424ffc7
+MISC metadata.xml 247 SHA256 4000b5a727313e5241d3d27df2268bc8d95766970e89bcd8757ed7773d4bb68e SHA512 f7f4f34a879fe0fee0e2054e2c47ed3348c773c96767475a8587272825b7af88a610f35ac2fe22fcba6d973acea82e073dcf3bb3abe0b6b9acbb2dc9c543db24 WHIRLPOOL 52599eaf20717f1ffb99687f400ba25bb7f5860b7bbc236164936c41ccf0b9c5eab4e4b3df3e847053ea477a8365f7be7d49de9135e95365fdc376ca70faee34
diff --git a/app-admin/clog/clog-1.1.0.ebuild b/app-admin/clog/clog-1.1.0.ebuild
new file mode 100644
index 000000000000..656fa519199d
--- /dev/null
+++ b/app-admin/clog/clog-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="https://git.tasktools.org/scm/ut/${PN}.git"
+[[ ${PV} == *9999* ]] && \
+ inherit git-2
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="A colorized log tail utility"
+HOMEPAGE="http://tasktools.org/projects/clog.html"
+[[ ${PV} == *9999* ]] || \
+ SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+ KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+src_prepare() {
+ # Use the correct directory locations
+ sed -i -e "s:/usr/local/share/doc/clog/rc:${EPREFIX}/usr/share/clog/rc:" \
+ doc/man/clog.1.in || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DTASK_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/app-admin/clog/metadata.xml b/app-admin/clog/metadata.xml
new file mode 100644
index 000000000000..143be88f0726
--- /dev/null
+++ b/app-admin/clog/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>alicef@gentoo.org</email>
+ <name>Alice Ferrazzi</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
new file mode 100644
index 000000000000..9cb5455631f5
--- /dev/null
+++ b/app-admin/clsync/Manifest
@@ -0,0 +1,11 @@
+AUX clsync.conf 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db
+AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce
+AUX clsync.initd 555 SHA256 f069ae391839cde8d9108f640967f53be237a05a8811ecc36ccac876076da1ce SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a WHIRLPOOL c39ee0c82a2ed50dea4053595907d08eddbe7c8506ac449a471180d7c17ba85908d888fd65d7d10a9429faff25fe7ad98b04d4bf7fae55350a9d53a9914520a0
+DIST clsync-0.4.1-20150524-v2.patch.xz 13632 SHA256 90a1ef820c83629c528e8c6fe4da5183caf60f8079c4de01a6d26945734c92f7 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9 WHIRLPOOL d22fc6a1f0a59514506377f26ab7d9c0f4faca0abab044f2ce2e61ffa973ff04b43da561a4dd5c69d99e21108baa71d77bb2ea524313661b3b2440ceddca56aa
+DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
+DIST clsync-0.4.2.tar.gz 256042 SHA256 1af63b86c1d0bd663311f2129792446dc8fc4def5559f76658b51b69a8d0c3bd SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200 WHIRLPOOL a59446337282cb63455b43bbbf17ad1213e39713d9c267ca5ee8785d863bc90e7b99e5938e4d5be02f3103a98b1bb5d5a628580160952d821e6caaad72fa2679
+EBUILD clsync-0.4.1.ebuild 3051 SHA256 f22a4b9ab0d2cb322be86004658a1815c8e9a29a6196080a233b936820a8e3b5 SHA512 db6893a5290741d7d42225875c145cc9b783fb722f7484b5393752c43e64f65b53287c3e4a3156f46013a3045514df997e3f49501f82795715f71601e2a49ca2 WHIRLPOOL 0989fe54d28dc8c144b7622c48d72fbc7d3526486b1c2e94d2c54084066ddf405bf4a91d6a2782bbf050b4097eca208476eb1e9174da6930ebaf7c54dd219664
+EBUILD clsync-0.4.2.ebuild 2793 SHA256 3b79c7be3de56a0d6294492e46f342c7757cda6b87b4fea317880c9119ba874c SHA512 380171a754b0d590a14c4977f811198168dbd7f47d735692d3df5766ebabbcf746126a54cb7b0181628ef787777db250f909230d662ab3badaa672c49236e191 WHIRLPOOL 733ed7e0d0148783522d30899ba86fc3691130fda08997f1c49b33a3ecc5cfad7a43e51c808682d5a31786436cbb0676aa62bf05db75fb997a8c4a2a0da3dbf9
+MISC ChangeLog 2962 SHA256 d5b62034717437020f5058b8c468fa4119252593547922410b37b6a71f7068ef SHA512 0c90e875b0a2c0cd589da8e55958227c3f30c55cb679496529a08f887e7828efd009551596a82cb5097be0f6ca9a78858793dd49683169b01591f864df5f1215 WHIRLPOOL ac8f5a7ed481e4fbf8e719164b01d9dd87360831af32f984b50da796fab012b0f4aa331dcffb650d9af091418bb360b2ca9f277fb4a390f6fb9d6eb7e606e882
+MISC ChangeLog-2015 1982 SHA256 e10340a7e895ac6a9aafd46e26d343af58e4b88b3c74d6998d851d179444877d SHA512 91ffbc4f2dd905d17c96d4354dbe6193f8ea99ed2205611135ba3e9b03d8f39b2cc0258a84a4646939aa87802b5707ca4aa3fe726cc89f77edad2d875d9d1957 WHIRLPOOL fc0d1176857a30ee64325a76f501db82d5b29283f62acd0d771e5482f48c89ff417202ef6e2f66a43093a79b65c5e9e302d571f00972c44ae4683380045b7b67
+MISC metadata.xml 1757 SHA256 8afe98dcdcfdd808cb18fc3dcdde28a8f6039c6e276f58d69cdf6914a3133df8 SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa WHIRLPOOL f91a987b0431d0062b908a59ee2dd550c601a9b62d57c35838f8cdbb3260a6dc85a81b240e3a70c5d8dd966a080ec2282fea0cf72b5c487b836acf1b4d693005
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
new file mode 100644
index 000000000000..c037951819d2
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"
+else
+ PVER="20150524-v2"
+ SRC_URI="
+ https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~bircoph/patches/${P}-${PVER}.patch.xz
+ "
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+ || ( gio inotify )
+ extra-debug? ( debug )
+ extra-hardened? ( hardened )
+ mhash? ( cluster )
+ seccomp? ( caps )
+"
+CDEPEND="
+ dev-libs/glib:2
+ cgroups? ( dev-libs/libcgroup )
+ mhash? ( app-crypt/mhash )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ ~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+ use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+ check_extra_config
+}
+
+src_prepare() {
+ # upstream fixes for 0.4.1
+ epatch "${WORKDIR}/${P}-${PVER}.patch"
+ eautoreconf
+}
+
+src_configure() {
+ local harden_level=0
+ use hardened && harden_level=1
+ use extra-hardened && harden_level=2
+
+ local debug_level=0
+ use debug && debug_level=1
+ use extra-debug && debug_level=2
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-socket-library \
+ --enable-clsync \
+ --enable-debug=${debug_level} \
+ --enable-paranoid=${harden_level} \
+ --without-bsm \
+ --without-kqueue \
+ $(use_enable caps capabilities) \
+ $(use_enable cluster) \
+ $(use_enable control-socket socket) \
+ $(use_enable highload-locks) \
+ $(use_enable namespaces unshare) \
+ $(use_enable seccomp) \
+ $(use_with cgroups libcgroup) \
+ $(use_with gio gio lib) \
+ $(use_with inotify inotify native) \
+ $(use_with mhash)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # docs go into clsync-docs
+ rm -rf "${ED}/usr/share/doc" || die
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ # filter rules and sync scripts are supposed to be here
+ keepdir "${EPREFIX}/etc/${PN}"
+ insinto "/etc/${PN}"
+ newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+ einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+ einfo "it doesn't copy data itself, so you need to install software to do actual"
+ einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+ einfo "is flexible enough to use any user tool, see manual page for details."
+ einfo
+ einfo "${PN} init script can be multiplexed, to use symlink init script to"
+ einfo "othername and use conf.d/othername to configure it."
+ einfo
+ einfo "If you're interested in improved security, enable"
+ einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
new file mode 100644
index 000000000000..d0e9c3ece979
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
+SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+ || ( gio inotify )
+ extra-debug? ( debug )
+ extra-hardened? ( hardened )
+ mhash? ( cluster )
+ seccomp? ( caps )
+"
+CDEPEND="
+ dev-libs/glib:2
+ cgroups? ( dev-libs/libcgroup )
+ mhash? ( app-crypt/mhash )
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ ~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+ use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+ check_extra_config
+}
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ local harden_level=0
+ use hardened && harden_level=1
+ use extra-hardened && harden_level=2
+
+ local debug_level=0
+ use debug && debug_level=1
+ use extra-debug && debug_level=2
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-socket-library \
+ --enable-clsync \
+ --enable-debug=${debug_level} \
+ --enable-paranoid=${harden_level} \
+ --without-bsm \
+ --without-kqueue \
+ $(use_enable caps capabilities) \
+ $(use_enable cluster) \
+ $(use_enable control-socket socket) \
+ $(use_enable highload-locks) \
+ $(use_enable namespaces unshare) \
+ $(use_enable seccomp) \
+ $(use_with cgroups libcgroup) \
+ $(use_with gio gio lib) \
+ $(use_with inotify inotify native) \
+ $(use_with mhash)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # docs go into clsync-docs
+ rm -rf "${ED}/usr/share/doc" || die
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ # filter rules and sync scripts are supposed to be here
+ keepdir "${EPREFIX}/etc/${PN}"
+ insinto "/etc/${PN}"
+ newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+ einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+ einfo "it doesn't copy data itself, so you need to install software to do actual"
+ einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+ einfo "is flexible enough to use any user tool, see manual page for details."
+ einfo
+ einfo "${PN} init script can be multiplexed, to use symlink init script to"
+ einfo "othername and use conf.d/othername to configure it."
+ einfo
+ einfo "If you're interested in improved security, enable"
+ einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/files/clsync.conf b/app-admin/clsync/files/clsync.conf
new file mode 100644
index 000000000000..91f38f17cd5c
--- /dev/null
+++ b/app-admin/clsync/files/clsync.conf
@@ -0,0 +1,18 @@
+# clsync system configuration file
+#
+# General recommendations:
+# 1. Put --dir-lists on tmpfs.
+# 2. Use --uid and --gid to drop privileges whenever possible.
+# 3. Keeep your clsync rules and sync scripts in /etc/clsync/.
+
+[default]
+# Put your options here, see clsync man pages for a list of valid options.
+# Also check examples directory (/usr/share/doc/clsync-*/examples).
+#
+#watch-dir = /what/dir/to/sync
+#sync-handler = /etc/clsync/action.sh
+#rules-dir = /etc/clsync/rules
+#lists-dir = /tmp/clsync
+#threading = safe
+#delay-sync = 5
+#delay-collect = 5
diff --git a/app-admin/clsync/files/clsync.confd b/app-admin/clsync/files/clsync.confd
new file mode 100644
index 000000000000..389f84e5d4b9
--- /dev/null
+++ b/app-admin/clsync/files/clsync.confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/clsync: config file for /etc/init.d/clsync
+
+# config file, default is /etc/clsync/clsync.conf.
+# to disable set to /dev/null
+#CLSYNC_CONF="/etc/clsync/clsync.conf"
+
+# clsync options, have precedence over config file,
+# see man clsync and $docdir/examples for details
+#CLSYNC_OPTS=""
+
+# Example of direct rsync usage:
+#CLSYNC_OPTS="--lists-dir /tmp/clsync --mode rsyncshell
+#--watch-dir /source/dir --sync-handler /usr/bin/rsync
+#--rules-file /etc/clsync/rules --distination-dir /destination/dir"
+
+# Change clsync nice level (default is unset)
+#CLSYNC_NICE="0"
+
+# Change clsync ionice level (default is unset)
+#CLSYNC_IONICE="2:7"
diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd
new file mode 100644
index 000000000000..28175a5fb696
--- /dev/null
+++ b/app-admin/clsync/files/clsync.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+[ -n "${CLSYNC_CONF}" ] && conffile="--config-file ${CLSYNC_CONF}"
+[ -n "${CLSYNC_NICE}" ] && cmd_nice="--nice ${CLSYNC_NICE}"
+[ -n "${CLSYNC_IONICE}" ] && cmd_ionice="--ionice ${CLSYNC_IONICE}"
+
+command="/usr/bin/clsync"
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="--background --output=syslog --pid-file=${pidfile} \
+${conffile} ${CLSYNC_OPTS}"
+start_stop_daemon_args="${cmd_nice} ${cmd_ionice}"
+
+depend() {
+ use net
+}
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
new file mode 100644
index 000000000000..9cbe60e8159c
--- /dev/null
+++ b/app-admin/clsync/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>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+ <longdescription>
+ Clsync recursively watches for source directory and executes external
+ program to sync the changes. Clsync is adapted to be used together with rsync.
+ This utility is much more lightweight than competitors and supports such
+ features as separate queue for big files, regex file filter, multi-threading
+ and multicast notifing clsync instances on another nodes to prevent loop
+ syncing. Clsync can use advanced features for isolation: capabilities, cgroups,
+ namespaces, seccomp, code hardening.
+</longdescription>
+ <use>
+ <flag name="cluster">Enable clustering support (allows master-master clsync on multiple hosts). Not fully implemented yet.</flag>
+ <flag name="control-socket">Enable AF_UNIX control socket support.</flag>
+ <flag name="cgroups">Use cgroups to limit /dev access.</flag>
+ <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag>
+ <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag>
+ <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag>
+ <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag>
+ <flag name="namespaces">Enable namespaces isolation.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">xaionaro/clsync</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
new file mode 100644
index 000000000000..4a38d0074b44
--- /dev/null
+++ b/app-admin/clustershell/Manifest
@@ -0,0 +1,8 @@
+DIST clustershell-1.6.tar.gz 950548 SHA256 ea119555ba9a4a8aa17d355345772263c20e2cc362140f55933ce217d7633e07 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02 WHIRLPOOL 889c250e6ef364dcab20960fb0fd84e6d8e00d8c185d40704b9a5845e4f45ea3fe074bdba5713aadb5cad04e11933b1d8a98fb7b80ec559682c699850c517975
+DIST clustershell-1.7.3.tar.gz 345447 SHA256 05724cf189aae4585576faa5183eb9be97bf2993b1d0049b9e0e2689f76661fc SHA512 acb8e8a5b4a576ee93fbe23a8d903bab813f4182b50d9cd752b3684c743e611d3ee3fcfde31818c0a92495a3ee7640094d4568a03fdbf543e398a1b741a978d4 WHIRLPOOL 6279f2afc57e3e7af9f76b952c4a56baf26ad1055e84e0b369591c9466aaa55636e8d4a6ffaccff8f2c478a29471b6b27fd8b63e4c53d5410f755769ceabe0ff
+EBUILD clustershell-1.6-r1.ebuild 953 SHA256 61ca4ec0b844dadac0c89143cf43be79a577f0928d78952a0eabf94bb938140b SHA512 cd8694812a01006f3f66a797bad01037e22d28a581c286fa0d22fb1ad44bf13ee3c44278d1c575b609854094aac2f928df62a38d82661157935ce96c15ad9269 WHIRLPOOL 7fe0873b48416c1906c417e9468cb851f10256e8dfcb21a75548358fb0453ce0272f9710a7ecae6b62bab8072cbdbdae82498642977bff7daeb8d215ab329a1a
+EBUILD clustershell-1.6.ebuild 886 SHA256 c7cc76adccb24f5aae0dfdb32773d7f995f7e1cbc83918284c67bc34181d2b96 SHA512 4a87ed707eb37cee226e8e8e432e9445398903cf4df8d2a66447383b60ce481e048de427b8d7fc8c5d27742ea6a8c526d444581dbe43e26b35eb5a1a703ddff5 WHIRLPOOL 4e79d056be9131e3b21ea3dbed030ceddc16c271c6f39adcafd384648f5e09d10a4a5566571b023f92784151f33cc450cb40b5803cffe5bca161b1b251ef3fe9
+EBUILD clustershell-1.7.3.ebuild 1178 SHA256 db8a166112c10a19c6771398d6140cd141b1256e571682fd8d9490bfca6dbe54 SHA512 acb24ccfff54f345d031380cf344db5a8e27b31ec294b299d226d71547df80b1bcc2670ee30f55e1bffaf1e204f7d3b30ad5a482731bad2f847ea162c4f0e4e7 WHIRLPOOL ee767a11fd5ae1b0d4febf9de637300ea2d5e1aa4c1f454bac4548d3d8bd5b64daa0b079bfb503b970bc1c973564e1079e23496381001b1b4dcebec26f0b0919
+MISC ChangeLog 3099 SHA256 c474eb41c9fce0590607f251658593709c25ba463de79f1ed619adb9739e66fa SHA512 91af5742e2efac4e0805f90f44dc56c62207c1e3681494dae56220c7e3ee3a6fdf2b12218ed447b85797ba9ddba18e93dd83d399448d57eb0025512e07668d58 WHIRLPOOL 90b8e2d7844aef2bdf493ec2dc2081258e258f53fb8f23f93fab204d2e9084baaf2d2b5aef5686e82effd541e131bf1c7775653fba56513542872315b8f1355b
+MISC ChangeLog-2015 1010 SHA256 d6f2d563f3642c4a121ae2a492e537c56b39d0bfbadf96c29f0564e2548128ce SHA512 ce5f2c1e83044a26fe5ecce6274ecc4fd36309b7855f4facdc9ba87e14ac91f57bc219a75d4cfe3797a93afe9e6b6581edd985de65d893a4b4f30db479aa24f3 WHIRLPOOL f23deff72f0f404e43e113f7cdee3b0b83b7fb00609e3b4436d760f0276768d5c862ecb2927d352da99e3ebf17ff5cd19ae78b3b98a7d719cfa734751faace0f
+MISC metadata.xml 257 SHA256 f803ef1a174879b88262a04080eaef99eb97ff56d03dcea0da09be4e6c047490 SHA512 a24cf6411331ed58ac1395d5f10e85530bbe2f7d9ca09121ac8e3ed3b518ad8b31ad50adb903404b41749c089bda33aa34bd28d8ba0da0b1f1b36620674e77be WHIRLPOOL e373e51151bef8dfe9f3100dc9156879e64d8274b11851e7959c6cb0006b3322851368507e9c7b283cb01094e448d53fcb28ea48beac0d2534d2c337b50be4fc
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
new file mode 100644
index 000000000000..faa5e3e63f9c
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+ distutils-r1_src_install
+
+ if use doc ; then
+ local i
+ for i in $(ls -I man "${S}"/doc) ; do
+ dodoc -r doc/${i}
+ done
+ fi
+
+ doman doc/man/man*/*
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+ einfo
+}
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
new file mode 100644
index 000000000000..6a13780d51c7
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+ distutils-r1_src_install
+
+ if use doc ; then
+ local i
+ for i in $(ls -I man "${S}"/doc) ; do
+ dodoc -r doc/${i}
+ done
+ fi
+
+ doman doc/man/man*/*
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+ einfo
+}
diff --git a/app-admin/clustershell/clustershell-1.7.3.ebuild b/app-admin/clustershell/clustershell-1.7.3.ebuild
new file mode 100644
index 000000000000..3756006e28cf
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.7.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: test phase
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+
+RESTRICT="test" # currently fail
+
+src_install() {
+ distutils-r1_src_install
+
+ if use doc ; then
+ local i
+ for i in $(ls -I man "${S}"/doc) ; do
+ dodoc -r doc/${i}
+ done
+ fi
+
+ doman doc/man/man*/*
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ cd tests || die
+ nosetests -sv --all-modules || die
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+ einfo
+}
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
new file mode 100644
index 000000000000..5d5942742693
--- /dev/null
+++ b/app-admin/clustershell/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">cea-hpc/clustershell</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
new file mode 100644
index 000000000000..b30e9b813a59
--- /dev/null
+++ b/app-admin/collectd/Manifest
@@ -0,0 +1,16 @@
+AUX collectd-5.6.0-gentoo.patch 4294 SHA256 ea50f196e0d8d8dcd8ca3b4146bf9cfd4d85ce19927b992891f7624f52e29663 SHA512 088f65e2d90c29092621693847f165be7024caa2237a2129dbffcedba3c1f93baa8169de9d3c2979c709219ec12ee0d3b6dd36586ede92062d1a14a28b8611c8 WHIRLPOOL 6352ff9bbd623e115b06db322c16304a2fbe1ab40314fa347d640602ebe468da85b92142c862d3caed58458805a49039ee2020ab1ce2d6ea34a6abc73449cdd1
+AUX collectd-5.6.2-CVE-2017-7401.patch 1823 SHA256 17d8b812d293e3e38ac43377af819194081cf2037b3fb09968eea4ddb6a2bfd9 SHA512 731fc3d8af2459425ff779325cf1dc9f633521ed539932cb8b254fc49cb5ab2ccae4350d197e479a333658cfc405f4dfcc0a7289bdb9f93e2341c64ee0c772e4 WHIRLPOOL 394676f40cb16ac1d881ae1368380795e55bb336643312ca672d99dffbca5eed821e18ee9589e34a837190bfae5765690f33ca9d010898b7ff215bd11614b241
+AUX collectd-5.6.2-issue2303.patch 1349 SHA256 f9a65c1e86dc48c57489c27ab44a0c85a7ec05af038227fd4048d1f0b0b2f137 SHA512 6d46020d2fad43e1e624c7058d5ea5962bdf647bcd8f4c282ea83a0c57d026408be5efea8190c301fc45e134cb6e52ba02c88c02a693204dc3a917a750813965 WHIRLPOOL 6e4c0ae57b65ce5a37edd4a430e652946d5880ef7aad4e51e1439e286affcae1ece080adc12f1f3d21335f86496dfbc81091b18a2276ea57b2c8ab921e33da44
+AUX collectd-5.7.2-issue-2443.patch 4628 SHA256 8abac0bacda3c85fba3ebc02c6035e213fdb2e84443e2e72758634ef6a72356c SHA512 16c7bc99a6401c96fb3b2cda5ad6e540024ae13d66268b4d5ada4c65c456a5dbd210ea58d116463381dbac953f9f8d4907d2185a24195a304e0f5a645829755e WHIRLPOOL 0e4e7b1d02487461cc2590c582ae200fb51e109c15907295d9cc12fa43eeadcc48287b76f7e4d9ccbda30cb2fbdb937fd4a42691b8e52566974820b381b06ca9
+AUX collectd.confd-r1 1742 SHA256 c3a13c3aeef9cb6f2b1d653ccf967149065b9d2da8747c5ba3978f15ddfebbb0 SHA512 31fc083a5c3a1e16246fc767c24d23d4b4763621ad2b2464f6d333fb3e327150caaf26905ab1c7aae5f6ec503882fc823e05fb272e2941af903f2b5b71aa788d WHIRLPOOL eaed22514009881a2d015bba22980419d5abe639d2cd3a7adc2f261ebf4f6ae273ccc4a88bff0e0d9381e774948c02f6e307b878516d770a76648de2ddb924c5
+AUX collectd.initd-r1 2118 SHA256 bdcef6edd1f4d8ee4bce28ac6bd0df28091e0dcfb22116be3834397cf5e8ce6f SHA512 556b0255e5d7ab93e934693431c02ef96d7a3a8df5ec6eb0c1e946f54eac822a1fbdf2a1784c617634cf60c2348681dc639b8c80cab041517a4ac39f18f6ae98 WHIRLPOOL af0b591f0a772d8c9950ede34cce7947167b2e1d839240cd10aa69d69183aea5d65cb56e4617f2439ace7d4a424272acbc0fea7ffe229f00563d49efd6381d19
+AUX collectd.logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
+DIST collectd-5.6.2.tar.bz2 1806969 SHA256 cc0b4118a91e5369409ced22d1d8a85c1a400098419414160c1839268ecad0c6 SHA512 81438e2e653649cf8a447f475b41844b7adb8ec436b43fb395ba9cf8b09b56a068633fe4b6c802d5cde3909d85a3af2542f5804005b3843f7936a37553911d61 WHIRLPOOL ab3a1d160418cf1a826ae7c3b8999b239d15f2f16d70e1305d185ddc79c307071cfd529214c9406fc9c85435a94775abbf2cdb807a2e2b6da8f666cc0550886a
+DIST collectd-5.7.1.tar.bz2 1797725 SHA256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 SHA512 f2edf4ecf3bbf5f4e10c797614a7ae39c18678601038574cec4f2ea6a8773444af4592e2872ed75a5afe5f746adaff2449df51443d98d2560a23722e46bef164 WHIRLPOOL fffb1371ec269f7683e160535f973758482a4eb65426748a4ef4c3bbe839608753aa5249d52a6c141e5d6a7042a68a56833be057051d7361b1ffb98c005744ef
+DIST collectd-5.7.2.tar.bz2 1798777 SHA256 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 SHA512 8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 WHIRLPOOL 438516cdd4440ff752fa7bd94c5edf4d469248d81ff43089c801fc31ac7983e8e47091fd3e1f2f554ff1d5e4bb11201ac03ba1f76d92123676c677626f68ffad
+EBUILD collectd-5.6.2-r4.ebuild 19011 SHA256 e08d974e85995265a8eefa991e6ac2e35a8ee9736c2603f687ea1a9ee4d517df SHA512 f1cd2201c3818aeedc5772fd0f69d183fcd8a2323e2e9bf166134b312f58e67de449bf5ea9467f5c504170f1ef732f28028a35c744456421266d32fee11dc30d WHIRLPOOL 01fccb28ae577a9b406ad069636dab118d33c8dcbcfb66c3234115addac92495ed23fc2f436e8491b00ee72109aee74b714e843a9650cf6476fa2bfbf89b34d0
+EBUILD collectd-5.7.1.ebuild 19241 SHA256 b43cc6ee363283d024810c4724fd789412108408af4be95179d35bc0498cf2a2 SHA512 ce269b50fcee8a79959afa14a125187da0640af4bc89644ddea9c05a4f7ea4179315e859523f919c83ba9166de73bf479f6cb46d07681d7833e85961f5ae9b1c WHIRLPOOL 0aa7aa802e9c5c5ea40af64c58cee4604c7b899bf3ba8cc7d45d0438a9208c8756d6af412cd3b697ddfc52e8e68f5a85dcc9d4966d7cae93b5a771d1b14c3ad7
+EBUILD collectd-5.7.2.ebuild 19195 SHA256 9f58c7dea58a8a8f7db766c8fc5e03b86ac2ff84d079dcb7d729ddfc40b93552 SHA512 c001961fd4a1f953632821af9b5ec208fe5337b02c545f42409d8912321432bfa84a17621c7ee61e21645de9f30937f14d1330e7c77b8906ec5bbd47102358de WHIRLPOOL 3992558b319229dddb9294ae2aef0b7714d2cb9306394e2548dab980194914cebb6aac4ff35aad4cbc6ea5654a38baa4a8b1e521eee32f4f4f3ca7ee8b526c93
+MISC ChangeLog 15115 SHA256 5037a0fd67041088add393ad209dba12d043e00f23e26557426a8b6373d80352 SHA512 3b8d233a2d7984cbf21914e795ca33d660762d131d683e3a9b2f69c1111c33d6aa279caa6771e0ce532a70423502db98eed79bd79af3fc2c49780bcc3a6a91ec WHIRLPOOL c0289cea1376ecfb871c4d6a18d99ff26ce6e0bdf1edf2861c3192f44c06447df4eb98e4356f859dab4c18589ebdf65d497fc4a7574989e9363c1679744d8b2f
+MISC ChangeLog-2015 14362 SHA256 1859e1b9ca3e7493396d72b51c984fdd2be019a1247e7005a41fe1a05f578894 SHA512 2434c3cfe30fbbcdc9a9e0e6d0f2c881d13e58d1bab2f47738ca0654a3a56b5d488ff1f542c1fd011e5349df810dcdc98c80559e91f39b4457ba626e633205dd WHIRLPOOL ce50c9de205ef7b86cd799d1d9f2bc4d0623fbfee511dd7e4a3a1f4d289eb567ff0026866c7b38428b285b88eabde060d77403db71f9455c865ae01c4c3623b9
+MISC metadata.xml 1515 SHA256 06633558aa34ad46d6950d0e4940979e079a98407bfc95d57a2b74a8d9062b56 SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5 WHIRLPOOL b32ef64ba98d900621c3a5afc5ece52a2a7173e99e0254c16aee8b1bb9ac3345dd7b49abf4630e71c70ccb2502622cd1418497e1091b6f608308c12e5721dd19
diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild b/app-admin/collectd/collectd-5.6.2-r4.ebuild
new file mode 100644
index 000000000000..58308c78b1dd
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -0,0 +1,532 @@
+# 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} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero: Requires aerotools-ng/libaquaero5
+# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
+# grpc: Requires libgrpc
+# lpar: Requires libperfstat (AIX only)
+# mic: Requires Intel Many Integrated Core Architecture API
+# (part of Intel's Xeon Phi software)
+# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf: Requires BSD packet filter
+# pinba: Requires MySQL Pinba engine (http://pinba.org/)
+# tape: Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms: Requires libxmms (v1)
+# zone: Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer grpc lpar mic
+ netapp pf pinba tape write_kafka write_mongodb write_riemann xmms
+ zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+ ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+ csv curl curl_json curl_xml dbi df disk dns drbd email entropy
+ ethstat exec fhcount filecount fscache gmond gps hddtemp interface
+ ipc ipmi iptables ipvs irq java lua load logfile log_logstash lvm
+ madwifi match_empty_counter match_hashed match_regex match_timediff
+ match_value mbmon md memcachec memcached memory modbus mqtt
+ multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email notify_nagios ntpd numa nut olsrd onewire openldap
+ openvpn oracle perl ping postgresql powerdns processes protocols
+ python python redis routeros rrdcached rrdtool sensors serial
+ sigrok smart snmp statsd swap syslog table tail tail_csv
+ target_notification target_replace target_scale target_set tcpconns
+ teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+ uptime users uuid varnish virt vmem vserver wireless write_graphite
+ write_http write_kafka write_log write_redis write_sensu write_tsdb
+ xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+ dev-libs/libgcrypt:=
+ dev-libs/libltdl:0=
+ perl? ( dev-lang/perl:=[ithreads] )
+ udev? ( virtual/udev )
+ xfs? ( sys-fs/xfsprogs )
+ collectd_plugins_amqp? ( net-libs/rabbitmq-c )
+ collectd_plugins_apache? ( net-misc/curl:0= )
+ collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_ceph? ( dev-libs/yajl:= )
+ collectd_plugins_curl? ( net-misc/curl:0= )
+ collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
+ collectd_plugins_log_logstash? ( dev-libs/yajl:= )
+ collectd_plugins_lua? ( dev-lang/lua:0= )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_modbus? ( dev-libs/libmodbus )
+ collectd_plugins_mqtt? ( app-misc/mosquitto )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl:0= )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp )
+ collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
+ collectd_plugins_openldap? ( net-nds/openldap )
+ collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= )
+ collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
+ collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_ping? ( net-libs/liboping )
+ collectd_plugins_postgresql? ( dev-db/postgresql:= )
+ collectd_plugins_python? ( ${PYTHON_DEPS} )
+ collectd_plugins_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_routeros? ( net-libs/librouteros )
+ collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
+ collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= )
+ collectd_plugins_sensors? ( sys-apps/lm_sensors )
+ collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
+ collectd_plugins_smart? ( dev-libs/libatasmart )
+ collectd_plugins_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= )
+ collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+ collectd_plugins_write_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
+
+ kernel_FreeBSD? (
+ collectd_plugins_disk? ( sys-libs/libstatgrab:= )
+ collectd_plugins_interface? ( sys-libs/libstatgrab:= )
+ collectd_plugins_load? ( sys-libs/libstatgrab:= )
+ collectd_plugins_memory? ( sys-libs/libstatgrab:= )
+ collectd_plugins_swap? ( sys-libs/libstatgrab:= )
+ collectd_plugins_users? ( sys-libs/libstatgrab:= )
+ )"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+ collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+ collectd_plugins_java? ( >=virtual/jdk-1.6 )
+ virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_java? ( >=virtual/jre-1.6 )
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )
+ !<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
+ collectd_plugins_smart? ( udev )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-5.6.2-CVE-2017-7401.patch
+ "${FILESDIR}"/${PN}-5.6.2-issue2303.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+# is emitted.
+collectd_plugin_kernel_linux() {
+ local multi_opt opt
+ if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+ if use collectd_plugins_${1}; then
+ for opt in ${2}; do
+ if linux_chkconfig_present ${opt}; then
+ return 0;
+ fi
+ done
+ multi_opt=${2//\ /\ or\ }
+ case ${3} in
+ (info)
+ elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (*)
+ die "function collectd_plugin_kernel_linux called with invalid third argument"
+ ;;
+ esac
+ fi
+ fi
+}
+
+collectd_linux_kernel_checks() {
+ if ! linux_chkconfig_present PROC_FS; then
+ ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+ fi
+
+ if ! linux_chkconfig_present SYSFS; then
+ ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+ fi
+
+ # battery.c: /proc/pmu/battery_%i
+ # battery.c: /proc/acpi/battery
+ collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+ # cgroups.c: /sys/fs/cgroup/
+ collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+ # cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+ collectd_plugin_kernel_linux cpufreq SYSFS warn
+ collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+ # drbd.c: /proc/drbd
+ collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+ # conntrack.c: /proc/sys/net/netfilter/*
+ collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+ # fscache.c: /proc/fs/fscache/stats
+ collectd_plugin_kernel_linux fscache FSCACHE warn
+
+ # nfs.c: /proc/net/rpc/nfs
+ # nfs.c: /proc/net/rpc/nfsd
+ collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+ # serial.c: /proc/tty/driver/serial
+ # serial.c: /proc/tty/driver/ttyS
+ collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+ # swap.c: /proc/meminfo
+ collectd_plugin_kernel_linux swap SWAP warn
+
+ # thermal.c: /proc/acpi/thermal_zone
+ # thermal.c: /sys/class/thermal
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # turbostat.c: /dev/cpu/%d/msr
+ collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+ # vmem.c: /proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # vserver.c: /proc/virtual
+ collectd_plugin_kernel_linux vserver VSERVER warn
+
+ # uuid.c: /sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c: /proc/net/wireless
+ collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+ # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+ collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ linux-info_pkg_setup
+
+ if linux_config_exists; then
+ einfo "Checking your linux kernel configuration:"
+ collectd_linux_kernel_checks
+ else
+ elog "Cannot find a linux kernel configuration. Continuing anyway."
+ fi
+ fi
+
+ if use collectd_plugins_java; then
+ java-pkg-opt-2_pkg_setup
+ fi
+
+ use collectd_plugins_python && python-single-r1_pkg_setup
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ default
+
+ # There's some strange prefix handling in the default config file, resulting in
+ # paths like "/usr/var/..."
+ sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ # Adjust upstream's systemd unit
+ # - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+ # - Add User=collectd to run collectd as user "collectd" per default
+ sed -i \
+ -e '/^EnvironmentFile=.*/d' \
+ -e '/^\[Service\]/aUser=collectd' \
+ contrib/systemd.${PN}.service || die
+
+ if use collectd_plugins_java; then
+ # Set javac -source and -target flags according to (R)DEPEND.
+ sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+ fi
+
+ ebegin "Removing bundled libltdl"
+ rm -rf libltdl || die
+ eend 0
+
+ eautoreconf
+}
+
+src_configure() {
+ # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+ # should work independent of the operating system.
+
+ local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
+ ethstat interface iptables ipvs irq ipc load memory md netlink nfs
+ numa processes serial swap tcpconns thermal turbostat users vmem
+ wireless zfc_arc"
+
+ local need_libstatgrab=0
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+ local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+ local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+ local myos_plugins=""
+ if use kernel_linux; then
+ einfo "Enabling Linux plugins."
+ myos_plugins=${linux_plugins}
+ elif use kernel_FreeBSD; then
+ einfo "Enabling FreeBSD plugins."
+ myos_plugins=${bsd_plugins}
+ elif use kernel_Darwin; then
+ einfo "Enabling Darwin plugins."
+ myos_plugins=${darwin_plugins}
+ fi
+
+ local myconf="--disable-werror"
+
+ # Do we debug?
+ myconf+=" $(use_enable debug)"
+
+ # udev support?
+ # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+ if use udev; then
+ myconf+=" --with-libudev"
+ else
+ myconf+=" --without-libudev"
+ fi
+
+ local plugin
+
+ # Disable what needs to be disabled.
+ for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+ myconf+=" --disable-${plugin}"
+ done
+
+ # Set enable/disable for each single plugin.
+ for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ if has ${plugin} ${osdependent_plugins}; then
+ # plugin is os-dependent ...
+ if has ${plugin} ${myos_plugins}; then
+ # ... and available in this os
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ # ... must we link against libstatgrab? Bug #541518
+ if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+ einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+ need_libstatgrab=1
+ fi
+ else
+ # ... and NOT available in this os
+ if use collectd_plugins_${plugin}; then
+ ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+ ewarn "kernel. Disabling it automatically."
+ fi
+ myconf+=" --disable-${plugin}"
+ fi
+ elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+ if use collectd_plugins_perl && ! use perl; then
+ ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+ myconf+= --disable-perl
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ done
+
+ if [ "${need_libstatgrab}" -eq 1 ]; then
+ myconf+=" --with-libstatgrab"
+ else
+ myconf+=" --without-libstatgrab"
+ fi
+
+ # JAVA_HOME is set by eclasses.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ # lots of libs are only needed for plugins, if they are disabled, also disable the lib
+ use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+ use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+ use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+ use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
+ use collectd_plugins_gps || myconf+=" --with-libgps=no"
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Python
+ if use collectd_plugins_python; then
+ myconf+=" --with-libpython=yes"
+ export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+ else
+ myconf+=" --with-libpython=no"
+ fi
+
+ # XFS support
+ myconf+=" $(use_enable xfs)"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+ $(use_enable static-libs static) \
+ --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D%/}" install
+
+ perl_delete_localpod
+
+ find "${ED}"usr/ -name "*.la" -delete || die
+
+ if use collectd_plugins_java; then
+ java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+ fi
+
+ fowners root:collectd /etc/collectd.conf
+ fperms u=rw,g=r,o= /etc/collectd.conf
+
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ if use contrib ; then
+ insinto /usr/share/doc/${PF}
+ doins -r contrib
+ fi
+
+ keepdir /var/lib/${PN}
+ fowners collectd:collectd /var/lib/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+ if use filecaps; then
+ local caps=()
+ use collectd_plugins_ceph && caps+=('CAP_DAC_OVERRIDE')
+ use collectd_plugins_exec && caps+=('CAP_SETUID' 'CAP_SETGID')
+ use collectd_plugins_iptables && caps+=('CAP_NET_ADMIN')
+ use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+ if use collectd_plugins_dns || use collectd_plugins_ping; then
+ caps+=('CAP_NET_RAW')
+ fi
+
+ if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+ caps+=('CAP_SYS_RAWIO')
+ fi
+
+ if [ ${#caps[@]} -gt 0 ]; then
+ local caps_str=$(IFS=","; echo "${caps[*]}")
+ fcaps ${caps_str} usr/sbin/collectd
+ elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+ elog " ${caps_str}+EP"
+ elog
+
+ local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+ if [[ -e "${systemd_unit}" ]]; then
+ caps_str="${caps[*]}"
+ sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+ die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+ elog "CapabilityBoundingSet in '${systemd_unit}'"
+ elog "updated to match capabilities set above."
+ elog
+ fi
+ fi
+ fi
+
+ elog "Note: Collectd is only the collector."
+ elog " You need to install 'data' sources (applications) locally or"
+ elog " remotely on your own."
+
+ elog
+ elog "Collectd is configured to run as unprivileged user by default."
+ elog "You may want to revisit the configuration."
+ elog
+
+ if use collectd_plugins_email; then
+ ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+ fi
+
+ if use collectd_plugins_smart; then
+ elog ""
+ elog "If you are using smart plugin and don't run collectd as root make sure"
+ elog "that the collectd user is allowed to access the disk you want to monitor"
+ elog "(can be done via udev rule for example) and that collectd has the required"
+ elog "capabilities set (which is the default when package was emerged with"
+ elog "'filecaps' USE flag set)."
+ fi
+
+ if use contrib; then
+ elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+ elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+ fi
+}
diff --git a/app-admin/collectd/collectd-5.7.1.ebuild b/app-admin/collectd/collectd-5.7.1.ebuild
new file mode 100644
index 000000000000..89191111c74e
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.1.ebuild
@@ -0,0 +1,537 @@
+# 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} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero: Requires aerotools-ng/libaquaero5
+# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkstat: Requires dpdk
+# grpc: Requires libgrpc
+# intel_rdt Requires libpqos from intel-cmt-cat project
+# lpar: Requires libperfstat (AIX only)
+# mic: Requires Intel Many Integrated Core Architecture API
+# (part of Intel's Xeon Phi software)
+# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf: Requires BSD packet filter
+# pinba: Requires MySQL Pinba engine (http://pinba.org/)
+# tape: Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms: Requires libxmms (v1)
+# zone: Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
+ intel_rdt lpar mic netapp pf pinba tape write_mongodb
+ write_riemann xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+ ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+ csv curl curl_json curl_xml dbi df disk dns drbd email
+ entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+ hugepages interface ipc ipmi iptables ipvs irq java lua
+ load logfile log_logstash lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md
+ memcachec memcached memory modbus mqtt multimeter mysql netlink
+ network network nfs nginx notify_desktop notify_email notify_nagios
+ ntpd numa nut olsrd onewire openldap openvpn oracle perl ping
+ postgresql powerdns processes protocols python python redis
+ routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd
+ swap syslog table tail tail_csv target_notification target_replace
+ target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant turbostat unixsock uptime users uuid varnish virt
+ vmem vserver wireless write_graphite write_http write_kafka
+ write_log write_prometheus write_redis write_sensu write_tsdb
+ xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+ dev-libs/libgcrypt:=
+ dev-libs/libltdl:0=
+ perl? ( dev-lang/perl:=[ithreads] )
+ udev? ( virtual/udev )
+ xfs? ( sys-fs/xfsprogs )
+ collectd_plugins_amqp? ( net-libs/rabbitmq-c )
+ collectd_plugins_apache? ( net-misc/curl:0= )
+ collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_ceph? ( dev-libs/yajl:= )
+ collectd_plugins_curl? ( net-misc/curl:0= )
+ collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
+ collectd_plugins_log_logstash? ( dev-libs/yajl:= )
+ collectd_plugins_lua? ( dev-lang/lua:0= )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_modbus? ( dev-libs/libmodbus )
+ collectd_plugins_mqtt? ( app-misc/mosquitto )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl:0= )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp )
+ collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
+ collectd_plugins_openldap? ( net-nds/openldap )
+ collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= )
+ collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
+ collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_ping? ( net-libs/liboping )
+ collectd_plugins_postgresql? ( dev-db/postgresql:= )
+ collectd_plugins_python? ( ${PYTHON_DEPS} )
+ collectd_plugins_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_routeros? ( net-libs/librouteros )
+ collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
+ collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= )
+ collectd_plugins_sensors? ( sys-apps/lm_sensors )
+ collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
+ collectd_plugins_smart? ( dev-libs/libatasmart )
+ collectd_plugins_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= )
+ collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+ collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
+ collectd_plugins_write_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
+
+ kernel_FreeBSD? (
+ collectd_plugins_disk? ( sys-libs/libstatgrab:= )
+ collectd_plugins_interface? ( sys-libs/libstatgrab:= )
+ collectd_plugins_load? ( sys-libs/libstatgrab:= )
+ collectd_plugins_memory? ( sys-libs/libstatgrab:= )
+ collectd_plugins_swap? ( sys-libs/libstatgrab:= )
+ collectd_plugins_users? ( sys-libs/libstatgrab:= )
+ )"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+ collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+ collectd_plugins_java? ( >=virtual/jdk-1.6 )
+ virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_java? ( >=virtual/jre-1.6 )
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )
+ !<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
+ collectd_plugins_smart? ( udev )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-5.6.2-CVE-2017-7401.patch
+ "${FILESDIR}"/${PN}-5.6.2-issue2303.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+# is emitted.
+collectd_plugin_kernel_linux() {
+ local multi_opt opt
+ if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+ if use collectd_plugins_${1}; then
+ for opt in ${2}; do
+ if linux_chkconfig_present ${opt}; then
+ return 0;
+ fi
+ done
+ multi_opt=${2//\ /\ or\ }
+ case ${3} in
+ (info)
+ elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (*)
+ die "function collectd_plugin_kernel_linux called with invalid third argument"
+ ;;
+ esac
+ fi
+ fi
+}
+
+collectd_linux_kernel_checks() {
+ if ! linux_chkconfig_present PROC_FS; then
+ ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+ fi
+
+ if ! linux_chkconfig_present SYSFS; then
+ ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+ fi
+
+ # battery.c: /proc/pmu/battery_%i
+ # battery.c: /proc/acpi/battery
+ collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+ # cgroups.c: /sys/fs/cgroup/
+ collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+ # cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+ collectd_plugin_kernel_linux cpufreq SYSFS warn
+ collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+ # drbd.c: /proc/drbd
+ collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+ # conntrack.c: /proc/sys/net/netfilter/*
+ collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+ # fscache.c: /proc/fs/fscache/stats
+ collectd_plugin_kernel_linux fscache FSCACHE warn
+
+ # nfs.c: /proc/net/rpc/nfs
+ # nfs.c: /proc/net/rpc/nfsd
+ collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+ # serial.c: /proc/tty/driver/serial
+ # serial.c: /proc/tty/driver/ttyS
+ collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+ # swap.c: /proc/meminfo
+ collectd_plugin_kernel_linux swap SWAP warn
+
+ # thermal.c: /proc/acpi/thermal_zone
+ # thermal.c: /sys/class/thermal
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # turbostat.c: /dev/cpu/%d/msr
+ collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+ # vmem.c: /proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # vserver.c: /proc/virtual
+ collectd_plugin_kernel_linux vserver VSERVER warn
+
+ # uuid.c: /sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c: /proc/net/wireless
+ collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+ # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+ collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ linux-info_pkg_setup
+
+ if linux_config_exists; then
+ einfo "Checking your linux kernel configuration:"
+ collectd_linux_kernel_checks
+ else
+ elog "Cannot find a linux kernel configuration. Continuing anyway."
+ fi
+ fi
+
+ if use collectd_plugins_java; then
+ java-pkg-opt-2_pkg_setup
+ fi
+
+ use collectd_plugins_python && python-single-r1_pkg_setup
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ default
+
+ # There's some strange prefix handling in the default config file, resulting in
+ # paths like "/usr/var/..."
+ sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ # Adjust upstream's systemd unit
+ # - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+ # - Add User=collectd to run collectd as user "collectd" per default
+ sed -i \
+ -e '/^EnvironmentFile=.*/d' \
+ -e '/^\[Service\]/aUser=collectd' \
+ contrib/systemd.${PN}.service || die
+
+ if use collectd_plugins_java; then
+ # Set javac -source and -target flags according to (R)DEPEND.
+ sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+ fi
+
+ ebegin "Removing bundled libltdl"
+ rm -rf libltdl || die
+ eend 0
+
+ eautoreconf
+}
+
+src_configure() {
+ # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+ # should work independent of the operating system.
+
+ local linux_plugins="barometer battery cpu cpufreq disk
+ drbd entropy ethstat hugepages interface iptables
+ ipvs irq ipc load memory md netlink nfs numa processes
+ serial swap tcpconns thermal turbostat users vmem wireless
+ zfc_arc"
+
+ local need_libstatgrab=0
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+ local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+ local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+ local myos_plugins=""
+ if use kernel_linux; then
+ einfo "Enabling Linux plugins."
+ myos_plugins=${linux_plugins}
+ elif use kernel_FreeBSD; then
+ einfo "Enabling FreeBSD plugins."
+ myos_plugins=${bsd_plugins}
+ elif use kernel_Darwin; then
+ einfo "Enabling Darwin plugins."
+ myos_plugins=${darwin_plugins}
+ fi
+
+ local myconf="--disable-werror"
+
+ # Do we debug?
+ myconf+=" $(use_enable debug)"
+
+ # udev support?
+ # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+ if use udev; then
+ myconf+=" --with-libudev"
+ else
+ myconf+=" --without-libudev"
+ fi
+
+ local plugin
+
+ # Disable what needs to be disabled.
+ for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+ myconf+=" --disable-${plugin}"
+ done
+
+ # Set enable/disable for each single plugin.
+ for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ if has ${plugin} ${osdependent_plugins}; then
+ # plugin is os-dependent ...
+ if has ${plugin} ${myos_plugins}; then
+ # ... and available in this os
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ # ... must we link against libstatgrab? Bug #541518
+ if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+ einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+ need_libstatgrab=1
+ fi
+ else
+ # ... and NOT available in this os
+ if use collectd_plugins_${plugin}; then
+ ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+ ewarn "kernel. Disabling it automatically."
+ fi
+ myconf+=" --disable-${plugin}"
+ fi
+ elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+ if use collectd_plugins_perl && ! use perl; then
+ ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+ myconf+= --disable-perl
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ done
+
+ if [ "${need_libstatgrab}" -eq 1 ]; then
+ myconf+=" --with-libstatgrab"
+ else
+ myconf+=" --without-libstatgrab"
+ fi
+
+ # JAVA_HOME is set by eclasses.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ # lots of libs are only needed for plugins, if they are disabled, also disable the lib
+ use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+ use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+ use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+ use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
+ use collectd_plugins_gps || myconf+=" --with-libgps=no"
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Python
+ if use collectd_plugins_python; then
+ myconf+=" --with-libpython=yes"
+ export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+ else
+ myconf+=" --with-libpython=no"
+ fi
+
+ # XFS support
+ myconf+=" $(use_enable xfs)"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+ $(use_enable static-libs static) \
+ --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D%/}" install
+
+ perl_delete_localpod
+
+ find "${ED}"usr/ -name "*.la" -delete || die
+
+ if use collectd_plugins_java; then
+ java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+ fi
+
+ fowners root:collectd /etc/collectd.conf
+ fperms u=rw,g=r,o= /etc/collectd.conf
+
+ dodoc AUTHORS ChangeLog README
+
+ if use contrib ; then
+ insinto /usr/share/doc/${PF}
+ doins -r contrib
+ fi
+
+ keepdir /var/lib/${PN}
+ fowners collectd:collectd /var/lib/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+ if use filecaps; then
+ local caps=()
+ use collectd_plugins_ceph && caps+=('CAP_DAC_OVERRIDE')
+ use collectd_plugins_exec && caps+=('CAP_SETUID' 'CAP_SETGID')
+ use collectd_plugins_iptables && caps+=('CAP_NET_ADMIN')
+ use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+ if use collectd_plugins_dns || use collectd_plugins_ping; then
+ caps+=('CAP_NET_RAW')
+ fi
+
+ if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+ caps+=('CAP_SYS_RAWIO')
+ fi
+
+ if [ ${#caps[@]} -gt 0 ]; then
+ local caps_str=$(IFS=","; echo "${caps[*]}")
+ fcaps ${caps_str} usr/sbin/collectd
+ elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+ elog " ${caps_str}+EP"
+ elog
+
+ local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+ if [[ -e "${systemd_unit}" ]]; then
+ caps_str="${caps[*]}"
+ sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+ die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+ elog "CapabilityBoundingSet in '${systemd_unit}'"
+ elog "updated to match capabilities set above."
+ elog
+ fi
+ fi
+ fi
+
+ elog "Note: Collectd is only the collector."
+ elog " You need to install 'data' sources (applications) locally or"
+ elog " remotely on your own."
+
+ elog
+ elog "Collectd is configured to run as unprivileged user by default."
+ elog "You may want to revisit the configuration."
+ elog
+
+ if use collectd_plugins_email; then
+ ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+ fi
+
+ if use collectd_plugins_smart; then
+ elog ""
+ elog "If you are using smart plugin and don't run collectd as root make sure"
+ elog "that the collectd user is allowed to access the disk you want to monitor"
+ elog "(can be done via udev rule for example) and that collectd has the required"
+ elog "capabilities set (which is the default when package was emerged with"
+ elog "'filecaps' USE flag set)."
+ fi
+
+ if use contrib; then
+ elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+ elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+ fi
+}
diff --git a/app-admin/collectd/collectd-5.7.2.ebuild b/app-admin/collectd/collectd-5.7.2.ebuild
new file mode 100644
index 000000000000..199a7948bb28
--- /dev/null
+++ b/app-admin/collectd/collectd-5.7.2.ebuild
@@ -0,0 +1,536 @@
+# 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} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero: Requires aerotools-ng/libaquaero5
+# barometer: Requires libi2c (i2c_smbus_read_i2c_block_data)
+# dpdkstat: Requires dpdk
+# grpc: Requires libgrpc
+# intel_rdt Requires libpqos from intel-cmt-cat project
+# lpar: Requires libperfstat (AIX only)
+# mic: Requires Intel Many Integrated Core Architecture API
+# (part of Intel's Xeon Phi software)
+# netapp: Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf: Requires BSD packet filter
+# pinba: Requires MySQL Pinba engine (http://pinba.org/)
+# tape: Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms: Requires libxmms (v1)
+# zone: Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer dpdkstat grpc
+ intel_rdt lpar mic netapp pf pinba tape write_mongodb
+ write_riemann xmms zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+ ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+ csv curl curl_json curl_xml dbi df disk dns drbd email
+ entropy ethstat exec fhcount filecount fscache gmond gps hddtemp
+ hugepages interface ipc ipmi iptables ipvs irq java lua
+ load logfile log_logstash lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md
+ memcachec memcached memory modbus mqtt multimeter mysql netlink
+ network network nfs nginx notify_desktop notify_email notify_nagios
+ ntpd numa nut olsrd onewire openldap openvpn oracle perl ping
+ postgresql powerdns processes protocols python python redis
+ routeros rrdcached rrdtool sensors serial sigrok smart snmp statsd
+ swap syslog table tail tail_csv target_notification target_replace
+ target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant turbostat unixsock uptime users uuid varnish virt
+ vmem vserver wireless write_graphite write_http write_kafka
+ write_log write_prometheus write_redis write_sensu write_tsdb
+ xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+ dev-libs/libgcrypt:=
+ dev-libs/libltdl:0=
+ perl? ( dev-lang/perl:=[ithreads] )
+ udev? ( virtual/udev )
+ xfs? ( sys-fs/xfsprogs )
+ collectd_plugins_amqp? ( net-libs/rabbitmq-c )
+ collectd_plugins_apache? ( net-misc/curl:0= )
+ collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_ceph? ( dev-libs/yajl:= )
+ collectd_plugins_curl? ( net-misc/curl:0= )
+ collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
+ collectd_plugins_log_logstash? ( dev-libs/yajl:= )
+ collectd_plugins_lua? ( dev-lang/lua:0= )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_modbus? ( dev-libs/libmodbus )
+ collectd_plugins_mqtt? ( app-misc/mosquitto )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl:0= )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp )
+ collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
+ collectd_plugins_openldap? ( net-nds/openldap )
+ collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= )
+ collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
+ collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_ping? ( net-libs/liboping )
+ collectd_plugins_postgresql? ( dev-db/postgresql:= )
+ collectd_plugins_python? ( ${PYTHON_DEPS} )
+ collectd_plugins_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_routeros? ( net-libs/librouteros )
+ collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= )
+ collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= )
+ collectd_plugins_sensors? ( sys-apps/lm_sensors )
+ collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
+ collectd_plugins_smart? ( dev-libs/libatasmart )
+ collectd_plugins_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= )
+ collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= )
+ collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+ collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= )
+ collectd_plugins_write_redis? ( dev-libs/hiredis:= )
+ collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
+
+ kernel_FreeBSD? (
+ collectd_plugins_disk? ( sys-libs/libstatgrab:= )
+ collectd_plugins_interface? ( sys-libs/libstatgrab:= )
+ collectd_plugins_load? ( sys-libs/libstatgrab:= )
+ collectd_plugins_memory? ( sys-libs/libstatgrab:= )
+ collectd_plugins_swap? ( sys-libs/libstatgrab:= )
+ collectd_plugins_users? ( sys-libs/libstatgrab:= )
+ )"
+
+# Enforcing !=sys-kernel/linux-headers-4.5 > due to #577846
+DEPEND="${COMMON_DEPEND}
+ collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) )
+ collectd_plugins_java? ( >=virtual/jdk-1.6 )
+ virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_java? ( >=virtual/jre-1.6 )
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )
+ !<sys-apps/openrc-0.18.2"
+
+REQUIRED_USE="
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )
+ collectd_plugins_smart? ( udev )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+ "${FILESDIR}"/${PN}-5.7.2-issue-2443.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+# one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+# is emitted.
+collectd_plugin_kernel_linux() {
+ local multi_opt opt
+ if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+ if use collectd_plugins_${1}; then
+ for opt in ${2}; do
+ if linux_chkconfig_present ${opt}; then
+ return 0;
+ fi
+ done
+ multi_opt=${2//\ /\ or\ }
+ case ${3} in
+ (info)
+ elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (*)
+ die "function collectd_plugin_kernel_linux called with invalid third argument"
+ ;;
+ esac
+ fi
+ fi
+}
+
+collectd_linux_kernel_checks() {
+ if ! linux_chkconfig_present PROC_FS; then
+ ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+ fi
+
+ if ! linux_chkconfig_present SYSFS; then
+ ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+ fi
+
+ # battery.c: /proc/pmu/battery_%i
+ # battery.c: /proc/acpi/battery
+ collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+ # cgroups.c: /sys/fs/cgroup/
+ collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+ # cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+ collectd_plugin_kernel_linux cpufreq SYSFS warn
+ collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+ # drbd.c: /proc/drbd
+ collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+ # conntrack.c: /proc/sys/net/netfilter/*
+ collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+ # fscache.c: /proc/fs/fscache/stats
+ collectd_plugin_kernel_linux fscache FSCACHE warn
+
+ # nfs.c: /proc/net/rpc/nfs
+ # nfs.c: /proc/net/rpc/nfsd
+ collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+ # serial.c: /proc/tty/driver/serial
+ # serial.c: /proc/tty/driver/ttyS
+ collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+ # swap.c: /proc/meminfo
+ collectd_plugin_kernel_linux swap SWAP warn
+
+ # thermal.c: /proc/acpi/thermal_zone
+ # thermal.c: /sys/class/thermal
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # turbostat.c: /dev/cpu/%d/msr
+ collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+ # vmem.c: /proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # vserver.c: /proc/virtual
+ collectd_plugin_kernel_linux vserver VSERVER warn
+
+ # uuid.c: /sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c: /proc/net/wireless
+ collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+ # zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+ collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ linux-info_pkg_setup
+
+ if linux_config_exists; then
+ einfo "Checking your linux kernel configuration:"
+ collectd_linux_kernel_checks
+ else
+ elog "Cannot find a linux kernel configuration. Continuing anyway."
+ fi
+ fi
+
+ if use collectd_plugins_java; then
+ java-pkg-opt-2_pkg_setup
+ fi
+
+ use collectd_plugins_python && python-single-r1_pkg_setup
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ default
+
+ # There's some strange prefix handling in the default config file, resulting in
+ # paths like "/usr/var/..."
+ sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ # Adjust upstream's systemd unit
+ # - Get rid of EnvironmentFile directive; These files don't exist on Gentoo!
+ # - Add User=collectd to run collectd as user "collectd" per default
+ sed -i \
+ -e '/^EnvironmentFile=.*/d' \
+ -e '/^\[Service\]/aUser=collectd' \
+ contrib/systemd.${PN}.service || die
+
+ if use collectd_plugins_java; then
+ # Set javac -source and -target flags according to (R)DEPEND.
+ sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+ fi
+
+ ebegin "Removing bundled libltdl"
+ rm -rf libltdl || die
+ eend 0
+
+ eautoreconf
+}
+
+src_configure() {
+ # Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+ # should work independent of the operating system.
+
+ local linux_plugins="barometer battery cpu cpufreq disk
+ drbd entropy ethstat hugepages interface iptables
+ ipvs irq ipc load memory md netlink nfs numa processes
+ serial swap tcpconns thermal turbostat users vmem wireless
+ zfc_arc"
+
+ local need_libstatgrab=0
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+ local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+ local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+ local myos_plugins=""
+ if use kernel_linux; then
+ einfo "Enabling Linux plugins."
+ myos_plugins=${linux_plugins}
+ elif use kernel_FreeBSD; then
+ einfo "Enabling FreeBSD plugins."
+ myos_plugins=${bsd_plugins}
+ elif use kernel_Darwin; then
+ einfo "Enabling Darwin plugins."
+ myos_plugins=${darwin_plugins}
+ fi
+
+ local myconf="--disable-werror"
+
+ # Do we debug?
+ myconf+=" $(use_enable debug)"
+
+ # udev support?
+ # Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+ if use udev; then
+ myconf+=" --with-libudev"
+ else
+ myconf+=" --without-libudev"
+ fi
+
+ local plugin
+
+ # Disable what needs to be disabled.
+ for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+ myconf+=" --disable-${plugin}"
+ done
+
+ # Set enable/disable for each single plugin.
+ for plugin in ${COLLECTD_ALL_PLUGINS}; do
+ if has ${plugin} ${osdependent_plugins}; then
+ # plugin is os-dependent ...
+ if has ${plugin} ${myos_plugins}; then
+ # ... and available in this os
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ # ... must we link against libstatgrab? Bug #541518
+ if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+ einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+ need_libstatgrab=1
+ fi
+ else
+ # ... and NOT available in this os
+ if use collectd_plugins_${plugin}; then
+ ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+ ewarn "kernel. Disabling it automatically."
+ fi
+ myconf+=" --disable-${plugin}"
+ fi
+ elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+ if use collectd_plugins_perl && ! use perl; then
+ ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+ myconf+= --disable-perl
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ else
+ myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+ fi
+ done
+
+ if [ "${need_libstatgrab}" -eq 1 ]; then
+ myconf+=" --with-libstatgrab"
+ else
+ myconf+=" --without-libstatgrab"
+ fi
+
+ # JAVA_HOME is set by eclasses.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ # lots of libs are only needed for plugins, if they are disabled, also disable the lib
+ use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+ use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+ use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+ use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
+ use collectd_plugins_gps || myconf+=" --with-libgps=no"
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Python
+ if use collectd_plugins_python; then
+ myconf+=" --with-libpython=yes"
+ export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+ else
+ myconf+=" --with-libpython=no"
+ fi
+
+ # XFS support
+ myconf+=" $(use_enable xfs)"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+ $(use_enable static-libs static) \
+ --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D%/}" install
+
+ perl_delete_localpod
+
+ find "${ED}"usr/ -name "*.la" -delete || die
+
+ if use collectd_plugins_java; then
+ java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+ fi
+
+ fowners root:collectd /etc/collectd.conf
+ fperms u=rw,g=r,o= /etc/collectd.conf
+
+ dodoc AUTHORS ChangeLog README
+
+ if use contrib ; then
+ insinto /usr/share/doc/${PF}
+ doins -r contrib
+ fi
+
+ keepdir /var/lib/${PN}
+ fowners collectd:collectd /var/lib/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+ sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n# Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+ if use filecaps; then
+ local caps=()
+ use collectd_plugins_ceph && caps+=('CAP_DAC_OVERRIDE')
+ use collectd_plugins_exec && caps+=('CAP_SETUID' 'CAP_SETGID')
+ use collectd_plugins_iptables && caps+=('CAP_NET_ADMIN')
+ use collectd_plugins_filecount && caps+=('CAP_DAC_READ_SEARCH')
+
+ if use collectd_plugins_dns || use collectd_plugins_ping; then
+ caps+=('CAP_NET_RAW')
+ fi
+
+ if use collectd_plugins_turbostat || use collectd_plugins_smart; then
+ caps+=('CAP_SYS_RAWIO')
+ fi
+
+ if [ ${#caps[@]} -gt 0 ]; then
+ local caps_str=$(IFS=","; echo "${caps[*]}")
+ fcaps ${caps_str} usr/sbin/collectd
+ elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+ elog " ${caps_str}+EP"
+ elog
+
+ local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service"
+ if [[ -e "${systemd_unit}" ]]; then
+ caps_str="${caps[*]}"
+ sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \
+ die "Failed to set CapabilityBoundingSet in '${systemd_unit}'"
+
+ elog "CapabilityBoundingSet in '${systemd_unit}'"
+ elog "updated to match capabilities set above."
+ elog
+ fi
+ fi
+ fi
+
+ elog "Note: Collectd is only the collector."
+ elog " You need to install 'data' sources (applications) locally or"
+ elog " remotely on your own."
+
+ elog
+ elog "Collectd is configured to run as unprivileged user by default."
+ elog "You may want to revisit the configuration."
+ elog
+
+ if use collectd_plugins_email; then
+ ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+ fi
+
+ if use collectd_plugins_smart; then
+ elog ""
+ elog "If you are using smart plugin and don't run collectd as root make sure"
+ elog "that the collectd user is allowed to access the disk you want to monitor"
+ elog "(can be done via udev rule for example) and that collectd has the required"
+ elog "capabilities set (which is the default when package was emerged with"
+ elog "'filecaps' USE flag set)."
+ fi
+
+ if use contrib; then
+ elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+ elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+ fi
+}
diff --git a/app-admin/collectd/files/collectd-5.6.0-gentoo.patch b/app-admin/collectd/files/collectd-5.6.0-gentoo.patch
new file mode 100644
index 000000000000..dd8c1576354c
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.6.0-gentoo.patch
@@ -0,0 +1,153 @@
+From 8fe20883e248572690798e4dd1423511aa2f4e5d Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 22 Sep 2016 00:53:58 +0200
+Subject: [PATCH 1/3] Remove bundled libltdl
+
+---
+ Makefile.am | 6 ------
+ configure.ac | 8 ++++----
+ 2 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 03bdd39..ad04a3c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,5 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+ SUBDIRS =
+
+-if BUILD_INCLUDED_LTDL
+-SUBDIRS += libltdl
+-endif
+-
+ SUBDIRS += proto src bindings .
+
+ AM_CPPFLAGS = $(LTDLINCL)
+diff --git a/configure.ac b/configure.ac
+index 9a6da11..68e15e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,6 @@ AC_PREREQ([2.60])
+ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
+ AC_CONFIG_SRCDIR(src/target_set.c)
+ AC_CONFIG_HEADERS(src/config.h)
+-AC_CONFIG_AUX_DIR([libltdl/config])
+
+ dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
+ dnl we don't really need the 'u' even in older toolchains. Then there is
+@@ -13,7 +12,6 @@ m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
+ m4_ifdef([LT_PACKAGE_VERSION],
+ # libtool >= 2.2
+ [
+- LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen])
+ LTDL_INIT([convenience])
+ AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -25,12 +23,14 @@ m4_ifdef([LT_PACKAGE_VERSION],
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+ AC_LIBTOOL_DLOPEN
+- AC_CONFIG_SUBDIRS(libltdl)
+ AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ ]
+ )
+
+-AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
++if test "x$LTDLDEPS" != "x"
++then
++ AC_MSG_ERROR(["system's libltdl is too old! Should never happen. Please file a bug at https://bugs.gentoo.org"])
++fi
+
+ AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+--
+2.10.0
+
+
+From 0b00f519ce183b8ceaab5cf8e56f574ecd2cb7c4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 22 Sep 2016 00:54:08 +0200
+Subject: [PATCH 2/3] Remove libhal dependency
+
+X-Gentoo-Bug: 353839
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=353839
+---
+ configure.ac | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 68e15e0..1700c44 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1663,30 +1663,6 @@ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
+
+ dnl Check for HAL (hardware abstraction library)
+ with_libhal="no"
+-PKG_CHECK_MODULES([HAL], [hal],
+- [
+- SAVE_LIBS="$LIBS"
+- LIBS="$HAL_LIBS $LIBS"
+- AC_CHECK_LIB([hal], [libhal_device_property_exists],
+- [
+- SAVE_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$HAL_CFLAGS $CPPFLAGS"
+- AC_CHECK_HEADERS([libhal.h],
+- [
+- with_libhal="yes"
+- BUILD_WITH_LIBHAL_CFLAGS="$HAL_CFLAGS"
+- BUILD_WITH_LIBHAL_LIBS="$HAL_LIBS"
+- ])
+- CPPFLAGS="$SAVE_CPPFLAGS"
+- ],
+- [ : ]
+- )
+- LIBS="$SAVE_LIBS"
+- ],
+- [ : ]
+-)
+-AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
+-AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
+
+
+ SAVE_LIBS="$LIBS"
+--
+2.10.0
+
+
+From 380c61888bed5856319fa32816d8f2f4c88ee7bc Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 22 Sep 2016 00:54:19 +0200
+Subject: [PATCH 3/3] Link Oracle plug-in against libocci
+
+Author: Aurelien Minet
+X-Gentoo-Bug: 347607
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=347607
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1700c44..83909a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3587,14 +3587,14 @@ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t
+ ])
+ if test "x$ORACLE_HOME" != "x"
+ then
+- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
++ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
+
+ if test -e "$ORACLE_HOME/lib/ldflags"
+ then
+ with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
+ fi
+ #with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
+- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
++ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
+ fi
+ if test "x$with_oracle" = "xyes"
+ then
+--
+2.10.0
+
diff --git a/app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch b/app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch
new file mode 100644
index 000000000000..7c23ac18d8f8
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.6.2-CVE-2017-7401.patch
@@ -0,0 +1,56 @@
+From f6be4f9b49b949b379326c3d7002476e6ce4f211 Mon Sep 17 00:00:00 2001
+From: Pavel Rochnyack <pavel2000@ngs.ru>
+Date: Mon, 3 Apr 2017 11:57:09 +0600
+Subject: [PATCH] network plugin: Fix endless loop DOS in parse_packet()
+
+When correct 'Signature part' is received by Collectd, configured without
+AuthFile option, condition for endless loop occurs due to missing increase
+of pointer to next unprocessed part.
+
+This is a forward-port of #2233.
+
+Fixes: CVE-2017-7401
+Closes: #2174
+Signed-off-by: Florian Forster <octo@collectd.org>
+---
+ src/network.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/network.c b/src/network.c
+index be4c3ba..2ff09af 100644
+--- a/src/network.c
++++ b/src/network.c
+@@ -1003,14 +1003,6 @@ static int parse_part_sign_sha256(sockent_t *se, /* {{{ */
+ buffer_len = *ret_buffer_len;
+ buffer_offset = 0;
+
+- if (se->data.server.userdb == NULL) {
+- c_complain(
+- LOG_NOTICE, &complain_no_users,
+- "network plugin: Received signed network packet but can't verify it "
+- "because no user DB has been configured. Will accept it.");
+- return (0);
+- }
+-
+ /* Check if the buffer has enough data for this structure. */
+ if (buffer_len <= PART_SIGNATURE_SHA256_SIZE)
+ return (-ENOMEM);
+@@ -1027,6 +1019,18 @@ static int parse_part_sign_sha256(sockent_t *se, /* {{{ */
+ return (-1);
+ }
+
++ if (se->data.server.userdb == NULL) {
++ c_complain(
++ LOG_NOTICE, &complain_no_users,
++ "network plugin: Received signed network packet but can't verify it "
++ "because no user DB has been configured. Will accept it.");
++
++ *ret_buffer = buffer + pss_head_length;
++ *ret_buffer_len -= pss_head_length;
++
++ return (0);
++ }
++
+ /* Copy the hash. */
+ BUFFER_READ(pss.hash, sizeof(pss.hash));
+
diff --git a/app-admin/collectd/files/collectd-5.6.2-issue2303.patch b/app-admin/collectd/files/collectd-5.6.2-issue2303.patch
new file mode 100644
index 000000000000..0fffcd6b9224
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.6.2-issue2303.patch
@@ -0,0 +1,44 @@
+From fd01cdd0546ccbbda7f4cf5db2d0ae28e1e770cd Mon Sep 17 00:00:00 2001
+From: Ruben Kerkhof <ruben@rubenkerkhof.com>
+Date: Tue, 30 May 2017 17:25:17 +0200
+Subject: [PATCH] Bind plugin: plug a few leaks
+
+Fixes: #2303
+---
+ src/bind.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/bind.c b/src/bind.c
+index 4860f1b604..853b9c26a3 100644
+--- a/src/bind.c
++++ b/src/bind.c
+@@ -526,8 +526,10 @@ static int bind_parse_generic_name_value(const char *xpath_expression, /* {{{ */
+ status = bind_xml_read_gauge(doc, counter, &value.gauge);
+ else
+ status = bind_xml_read_derive(doc, counter, &value.derive);
+- if (status != 0)
++ if (status != 0) {
++ xmlFree(name);
+ continue;
++ }
+
+ status = (*list_callback)(name, value, current_time, user_data);
+ if (status == 0)
+@@ -659,12 +661,16 @@ static int bind_parse_generic_name_attr_value_list(
+ status = bind_xml_read_gauge(doc, child, &value.gauge);
+ else
+ status = bind_xml_read_derive(doc, child, &value.derive);
+- if (status != 0)
++ if (status != 0) {
++ xmlFree(attr_name);
+ continue;
++ }
+
+ status = (*list_callback)(attr_name, value, current_time, user_data);
+ if (status == 0)
+ num_entries++;
++
++ xmlFree(attr_name);
+ }
+ }
+
diff --git a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch b/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
new file mode 100644
index 000000000000..19410c139b0a
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
@@ -0,0 +1,160 @@
+turbostat: import msr-index header from linux to allow building against
+ >=linux-4.12
+
+Backport of https://github.com/collectd/collectd/pull/2446
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -805,28 +805,6 @@ AC_CACHE_CHECK([whether clock_boottime and clock_monotonic are supported],
+
+
+ # For the turbostat plugin
+-have_asm_msrindex_h="no"
+-AC_CHECK_HEADERS(asm/msr-index.h, [have_asm_msrindex_h="yes"])
+-
+-if test "x$have_asm_msrindex_h" = "xyes"
+-then
+- AC_CACHE_CHECK([whether asm/msr-index.h has MSR_PKG_C10_RESIDENCY],
+- [c_cv_have_usable_asm_msrindex_h],
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+-[[[
+-#include<asm/msr-index.h>
+-]]],
+-[[[
+-int y = MSR_PKG_C10_RESIDENCY;
+-return(y);
+-]]]
+- )],
+- [c_cv_have_usable_asm_msrindex_h="yes"],
+- [c_cv_have_usable_asm_msrindex_h="no"],
+- )
+- )
+-fi
+-
+ have_cpuid_h="no"
+ AC_CHECK_HEADERS(cpuid.h, [have_cpuid_h="yes"])
+
+@@ -6108,7 +6086,7 @@ then
+ then
+ plugin_ipvs="yes"
+ fi
+- if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes"
++ if test "x$have_cpuid_h" = "xyes"
+ then
+ plugin_turbostat="yes"
+ fi
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1212,7 +1212,9 @@ endif
+
+ if BUILD_PLUGIN_TURBOSTAT
+ pkglib_LTLIBRARIES += turbostat.la
+-turbostat_la_SOURCES = turbostat.c
++turbostat_la_SOURCES = \
++ turbostat.c \
++ msr-index.h
+ turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ endif
+
+--- /dev/null
++++ b/src/msr-index.h
+@@ -0,0 +1,88 @@
++/*
++ * Partial header file imported from the linux kernel
++ * (arch/x86/include/asm/msr-index.h)
++ * as it is not provided by the kernel sources anymore
++ *
++ * Only the minimal blocks of macro have been included
++ * ----
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU General Public License,
++ * version 2, as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
++ * ----
++ */
++
++#ifndef _ASM_X86_MSR_INDEX_H
++#define _ASM_X86_MSR_INDEX_H
++
++/*
++ * CPU model specific register (MSR) numbers.
++ *
++ * Do not add new entries to this file unless the definitions are shared
++ * between multiple compilation units.
++ */
++
++/* Intel MSRs. Some also available on other CPUs */
++
++/* C-state Residency Counters */
++#define MSR_PKG_C3_RESIDENCY 0x000003f8
++#define MSR_PKG_C6_RESIDENCY 0x000003f9
++#define MSR_ATOM_PKG_C6_RESIDENCY 0x000003fa
++#define MSR_PKG_C7_RESIDENCY 0x000003fa
++#define MSR_CORE_C3_RESIDENCY 0x000003fc
++#define MSR_CORE_C6_RESIDENCY 0x000003fd
++#define MSR_CORE_C7_RESIDENCY 0x000003fe
++#define MSR_KNL_CORE_C6_RESIDENCY 0x000003ff
++#define MSR_PKG_C2_RESIDENCY 0x0000060d
++#define MSR_PKG_C8_RESIDENCY 0x00000630
++#define MSR_PKG_C9_RESIDENCY 0x00000631
++#define MSR_PKG_C10_RESIDENCY 0x00000632
++
++/* Run Time Average Power Limiting (RAPL) Interface */
++
++#define MSR_RAPL_POWER_UNIT 0x00000606
++
++#define MSR_PKG_POWER_LIMIT 0x00000610
++#define MSR_PKG_ENERGY_STATUS 0x00000611
++#define MSR_PKG_PERF_STATUS 0x00000613
++#define MSR_PKG_POWER_INFO 0x00000614
++
++#define MSR_DRAM_POWER_LIMIT 0x00000618
++#define MSR_DRAM_ENERGY_STATUS 0x00000619
++#define MSR_DRAM_PERF_STATUS 0x0000061b
++#define MSR_DRAM_POWER_INFO 0x0000061c
++
++#define MSR_PP0_POWER_LIMIT 0x00000638
++#define MSR_PP0_ENERGY_STATUS 0x00000639
++#define MSR_PP0_POLICY 0x0000063a
++#define MSR_PP0_PERF_STATUS 0x0000063b
++
++#define MSR_PP1_POWER_LIMIT 0x00000640
++#define MSR_PP1_ENERGY_STATUS 0x00000641
++#define MSR_PP1_POLICY 0x00000642
++
++
++
++/* Intel defined MSRs. */
++#define MSR_IA32_TSC 0x00000010
++#define MSR_SMI_COUNT 0x00000034
++
++#define MSR_IA32_MPERF 0x000000e7
++#define MSR_IA32_APERF 0x000000e8
++
++#define MSR_IA32_THERM_STATUS 0x0000019c
++
++#define MSR_IA32_TEMPERATURE_TARGET 0x000001a2
++
++#define MSR_IA32_PACKAGE_THERM_STATUS 0x000001b1
++
++
++#endif /* _ASM_X86_MSR_INDEX_H */
+--- a/src/turbostat.c
++++ b/src/turbostat.c
+@@ -41,7 +41,7 @@
+ #include "plugin.h"
+ #include "utils_time.h"
+
+-#include <asm/msr-index.h>
++#include "msr-index.h"
+ #include <cpuid.h>
+ #ifdef HAVE_SYS_CAPABILITY_H
+ #include <sys/capability.h>
diff --git a/app-admin/collectd/files/collectd.confd-r1 b/app-admin/collectd/files/collectd.confd-r1
new file mode 100644
index 000000000000..1ad78f839d8a
--- /dev/null
+++ b/app-admin/collectd/files/collectd.confd-r1
@@ -0,0 +1,45 @@
+# Distributed under the terms of the GNU General Public License v2
+
+# Nice value used to launch collectd, to change priority of the process. As
+# you usually we want to run it in background, a default of 5 is used.
+#
+#COLLECTD_NICELEVEL=5
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#COLLECTD_CONFIGFILE="/etc/collectd.conf"
+
+# File used to store the PID file. Usually you won't need to touch it.
+#
+#COLLECTD_PIDFILE="/run/collectd/collectd.pid"
+
+# User to run collectd as (default is collectd, change to root or give
+# collectd user appropriate privileges if you use one of the plugins that
+# require it, as e.g. ping or iptables plugins)
+#
+#COLLECTD_USER="collectd"
+
+# The group is only important if you are using collectd's UNIX socket
+# in the default location (/run/collectd) because we will chown the
+# default location to COLLECTD_USER:COLLECTD_GROUP. The default value
+# is "collectd".
+#COLLECTD_GROUP="collectd"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#COLLECTD_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#COLLECTD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# Options to collectd
+# See collectd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+#COLLECTD_OPTS=""
diff --git a/app-admin/collectd/files/collectd.initd-r1 b/app-admin/collectd/files/collectd.initd-r1
new file mode 100644
index 000000000000..e65f85a7bcbf
--- /dev/null
+++ b/app-admin/collectd/files/collectd.initd-r1
@@ -0,0 +1,78 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+COLLECTD_CONFIGFILE=${COLLECTD_CONFIGFILE:-"/etc/collectd.conf"}
+COLLECTD_PIDFILE=${COLLECTD_PIDFILE:-"/run/collectd/collectd.pid"}
+COLLECTD_NICELEVEL=${COLLECTD_NICELEVEL:-5}
+COLLECTD_USER=${COLLECTD_USER:-"collectd"}
+COLLECTD_GROUP=${COLLECTD_GROUP:-"collectd"}
+COLLECTD_SSDARGS=${COLLECTD_SSDARGS:-"--wait 1000"}
+COLLECTD_TERMTIMEOUT=${COLLECTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+COLLECTD_OPTS=${COLLECTD_OPTS:-""}
+
+command="/usr/sbin/collectd"
+command_args="${COLLECTD_OPTS} -C \"${COLLECTD_CONFIGFILE}\" -P \"${COLLECTD_PIDFILE}\""
+start_stop_daemon_args="${COLLECTD_SSDARGS} --nice ${COLLECTD_NICELEVEL} --user ${COLLECTD_USER}:${COLLECTD_GROUP}"
+pidfile="${COLLECTD_PIDFILE}"
+retry="${COLLECTD_TERMTIMEOUT}"
+
+extra_commands="configtest"
+description_configtest="Run collectd's internal config check."
+
+required_files="\"${COLLECTD_CONFIGFILE}\""
+
+depend() {
+ use dns
+}
+
+_checkconfig() {
+ if [ $(sed '/^$\|^#/d' "${COLLECTD_CONFIGFILE}" | grep 'LoadPlugin[[:space:]]\+oracle' | wc -l) -ge 1 ] ; then
+ if [ -e /etc/env.d/50oracle-instantclient-basic ] ; then
+ . /etc/env.d/50oracle-instantclient-basic
+ export ORACLE_HOME
+ export TNS_ADMIN
+ else
+ ewarn "Unable to set Oracle environment, Oracle plugin wont work"
+ fi
+ fi
+
+ local test_command="${command} -t -C \"${COLLECTD_CONFIGFILE}\""
+
+ eval ${test_command} 1>/dev/null 2>&1
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ eerror "${SVCNAME} has detected an error in your configuration:"
+ eval ${test_command}
+ fi
+
+ return $ret
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME} configuration"
+ _checkconfig
+ eend $?
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+
+ checkpath --directory --mode 0770 --owner ${COLLECTD_USER}:${COLLECTD_GROUP} "$(dirname "${COLLECTD_PIDFILE}")"
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ if [ -f "${COLLECTD_PIDFILE}" ]; then
+ vebegin "Removing stale PID file"
+ rm --force "${COLLECTD_PIDFILE}"
+ veend $?
+ fi
+}
diff --git a/app-admin/collectd/files/collectd.logrotate b/app-admin/collectd/files/collectd.logrotate
new file mode 100644
index 000000000000..5d344f6208f1
--- /dev/null
+++ b/app-admin/collectd/files/collectd.logrotate
@@ -0,0 +1,9 @@
+#
+# /etc/logrotate.d/collectd
+#
+/var/log/collectd.log {
+ daily
+ rotate 5
+ notifempty
+ missingok
+}
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
new file mode 100644
index 000000000000..5f027424cee4
--- /dev/null
+++ b/app-admin/collectd/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>whissi@gentoo.org</email>
+ <name>Thomas Deutschmann</name>
+ </maintainer>
+ <longdescription lang="en">
+ Collectd gathers statistics about the system it is running on and stores this
+ information. Those statistics can then be used to find current performance
+ bottlenecks (i.e. performance analysis) and predict future system load (i.e.
+ capacity planning). Or if you just want pretty graphs of your private server
+ and are fed up with some homegrown solution you're at the right place.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://github.com/collectd/collectd/issues</bugs-to>
+ <doc lang="en">https://collectd.org/documentation.shtml</doc>
+ <remote-id type="github">collectd/collectd</remote-id>
+ </upstream>
+ <use>
+ <flag name="contrib">Install user-contributed files in the doc directory</flag>
+ <flag name="filecaps">When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user</flag>
+ <flag name="java">Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin</flag>
+ <flag name="udev">Enable optional udev usage in disk plugin; Required for smart plugin</flag>
+ <flag name="xfs">Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from <pkg>sys-fs/xfsprogs</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
new file mode 100644
index 000000000000..0f4dfad4e990
--- /dev/null
+++ b/app-admin/conky/Manifest
@@ -0,0 +1,9 @@
+AUX conky-1.10.4-x11-build.patch 944 SHA256 e5e16ba54b6d0f80a9ecfb309e77f2e065836daf66f6417549fb76aa08043be1 SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa WHIRLPOOL d16a08cba155096ad70f59ee8f8bba852692b787ce09e421816e20ac7301cada2a2ea91217635b98cc6a84c7a7ca3aae6ba6407fa9dbdd16252d2a4648302017
+AUX conky-1.10.6-new_graph-oor.patch 1312 SHA256 09790582195c65df29b55e19e18182382deced171d13726c893c6394936080f3 SHA512 ef7e15601251b846766dacad6bf1ff6f8d66b6c8fec2c40222ea7f072679ecacbceac297d516f0764aa9b4e9caac7f1deeea0b4365e89ba5733f7c8412658ec1 WHIRLPOOL 6757df1ee8915da7af6574921b13eac7efc21c8aaaf923cf120a685d6c3e11809790017a356619d9b45f9ea1a2edacfa50a334379aab2e174670a713ae188a41
+DIST conky-1.10.4.tar.gz 365145 SHA256 ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c WHIRLPOOL 6ca2a043dbc20aaff94bd0c05367b535cd71819543d76dd9a90b79417e2ebb0462c9203901f4e26e887bc249388ec041e0f76dcccf24a88fed9ce4bb532af558
+DIST conky-1.10.6.tar.gz 365669 SHA256 4c80982960b2a72e3e33cef33347c97b9239ed110d9584da4e7f17f28faf60ca SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9 WHIRLPOOL 65a43baf0ec1b5e298a81a062d2aa511488026baf440a470eecc89d15aac010d0f89f86b60a16040ae1941fedbdb46f9aed82431a79f59b7f97439f148b9c5f5
+EBUILD conky-1.10.4.ebuild 4850 SHA256 4f1d8cf0ab5523ffd916a8471ffbee24575720585be684bd61690a54e336e275 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663 WHIRLPOOL b706caf820c1905dc1a76e6e9c559b01d50365afa82b6bfbd7ce0c76a0df4590e0c094f72296ffed0ca88bef194bd1984ad4882a12f2f46bdbbcbceb22049ae1
+EBUILD conky-1.10.6-r2.ebuild 4939 SHA256 7294197342c3d27d9c7a4dd64ae8b44c0424022b3da5aa5f1e5f8fc56551403e SHA512 2916e371b9c0a7641e150c484beac635400f595e0c7b16c2e18235d8ebc59ec98c18d8802d1bfb288a720f1111885d31a486c1edba804dbb306c43fc242ab51f WHIRLPOOL a0d1666da60f115bf4f9a57457e89dcdfdd9ed957baaa356b87852762338079d775fa68e06de5873ec6cda9225a4451c11c4f694c9de32c2a8a4301b79e9e80e
+MISC ChangeLog 8668 SHA256 3e1697a626614dcaecef4ac12727962b62fdf1c23a2021424f7a386a40729b38 SHA512 7f686cace9e9915e1772a7288f32b382ffa7170650271f3a967d816d0357f7156dac09c9996e104112d7b97b5764c7923a0bd2fa5ca1b86b9a5a474b6c9a9d22 WHIRLPOOL 3d40e13840be1cc68501c748a415028ab040114fe874387fc6d559a1908faf88e1083cc415a24d4d7797fda9a6366840e4b369285ee95642a32fa670a6e4d394
+MISC ChangeLog-2015 34218 SHA256 adc2023620bd75ca1fd201ebcda63137f7a678b63c5f6d609f5af34f383b4592 SHA512 c0ede6c537e264edf8308ac7bc115de278bd4aff510a061012d358c0c1776bb5f67d40d0600a4e92d91ea11ed0645535ebbcd0aa77fa125cfd6ece7ae0537b15 WHIRLPOOL 7648aeacb920d81f71bf8fed75c21ecca7cdb16511c4c18399a87b95dbc1eab510c84da5e1856f6a0bd6385d44b4746ba51b042fca6027fe3044447fe8420000
+MISC metadata.xml 2525 SHA256 65554345e355ca9ec2e72dd6c5169954ccf421ca3bce2385aec7909c384f000b SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb WHIRLPOOL b9081e8c70902af80147904eafc94bc2f626a1f580843c408b0dce613ac835af5b0bd5b79dfd330c15c67ccb444cceacb90698475c5ce9987c52223748d9092c
diff --git a/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
new file mode 100644
index 000000000000..38f3c714f274
--- /dev/null
+++ b/app-admin/conky/conky-1.10.4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+ weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ media-libs/imlib2[X] )
+ lua-rsvg? (
+ >=dev-lua/toluapp-1.0.93
+ gnome-base/librsvg )
+ nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( >=virtual/mysql-5.0 )
+ ncurses? ( sys-libs/ncurses:= )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ >=dev-lang/lua-5.1.4-r8:0
+ "
+RDEPEND="
+ ${DEPEND_COMMON}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ "
+DEPEND="
+ ${DEPEND_COMMON}
+ app-text/docbook2X
+ "
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-x11-build.patch )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_AUDACIOUS=$(usex audacious)
+ -DBUILD_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_EVE=$(usex eve)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=OFF
+ -DRELEASE=ON
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+ # -DMAINTAINER_MODE=OFF disables building documentation and fixes bug #486270
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/conky-1.10.6-r2.ebuild b/app-admin/conky/conky-1.10.6-r2.ebuild
new file mode 100644
index 000000000000..dca7c0a1150e
--- /dev/null
+++ b/app-admin/conky/conky-1.10.6-r2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+ weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ media-libs/imlib2[X] )
+ lua-rsvg? (
+ >=dev-lua/toluapp-1.0.93
+ gnome-base/librsvg )
+ nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( >=virtual/mysql-5.0 )
+ ncurses? ( sys-libs/ncurses:= )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ >=dev-lang/lua-5.1.4-r8:0
+ "
+RDEPEND="
+ ${DEPEND_COMMON}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ "
+DEPEND="
+ ${DEPEND_COMMON}
+ app-text/docbook2X
+ "
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-new_graph-oor.patch )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_AUDACIOUS=$(usex audacious)
+ -DBUILD_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_EVE=$(usex eve)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.4-x11-build.patch b/app-admin/conky/files/conky-1.10.4-x11-build.patch
new file mode 100644
index 000000000000..eb113a47fd57
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.4-x11-build.patch
@@ -0,0 +1,31 @@
+From 178015a9495b7d40031ed7459e4f6b6731633a7c Mon Sep 17 00:00:00 2001
+From: shizeeg <shizeeque@gmail.com>
+Date: Thu, 8 Sep 2016 18:24:29 +0300
+Subject: [PATCH] Fix build without X11 (#317)
+
+---
+ src/conky.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 0a812fc..4c5da94 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -1404,6 +1404,9 @@ static void draw_string(const char *s)
+
+ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
+ {
++#ifndef BUILD_X11
++ static int cur_x, cur_y; /* current x and y for drawing */
++#endif
+ #ifdef BUILD_X11
+ int font_h = 0;
+ int cur_y_add = 0;
+@@ -1934,6 +1937,7 @@ static void draw_text(void)
+
+ static void draw_stuff(void)
+ {
++ static int text_offset_x, text_offset_y; /* offset for start position */
+ text_offset_x = text_offset_y = 0;
+ #ifdef BUILD_IMLIB2
+ cimlib_render(text_start_x, text_start_y, window.width, window.height);
diff --git a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
new file mode 100644
index 000000000000..18091702f681
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch
@@ -0,0 +1,35 @@
+From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001
+From: labath <pavelo@centrum.sk>
+Date: Tue, 31 Jan 2017 01:31:09 +0000
+Subject: [PATCH] Fix an out-of-range error in new_graph (#356)
+
+The code was multiplying the index with the size of the element, and
+then adding it to the typed pointer (resulting in a double
+multiplication and an OOB access).
+
+Replace the buggy code with a slightly safer c++ alternative.
+---
+ src/specials.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/specials.cc b/src/specials.cc
+index ee941eb..73bd2a2 100644
+--- a/src/specials.cc
++++ b/src/specials.cc
+@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val)
+ DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width);
+ if (!s->graph) {
+ /* initialize */
+- memset(graph, 0, s->graph_width * sizeof(double));
++ std::fill_n(graph, s->graph_width, 0.0);
+ s->scale = 100;
+ } else {
+ if (s->graph_width > s->graph_allocated) {
+ /* initialize the new region */
+- memset(graph + (s->graph_allocated * sizeof(double)), 0,
+- (s->graph_width - s->graph_allocated) *
+- sizeof(double));
++ std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0);
+ }
+ }
+ s->graph = graph;
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
new file mode 100644
index 000000000000..3bdd546109e7
--- /dev/null
+++ b/app-admin/conky/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>billie@gentoo.org</email>
+ <name>Daniel Pielmeier</name>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email>brenden@rty.ca</email>
+ <name>Brenden Matthews</name>
+ </maintainer>
+ <remote-id type="sourceforge">conky</remote-id>
+ <remote-id type="github">brndnmtthws/conky</remote-id>
+ </upstream>
+ <longdescription>Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.</longdescription>
+ <use>
+ <flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
+ <flag name="audacious">Enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
+ <flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+ <flag name="eve">Enable support for the eve-online skill monitor</flag>
+ <flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
+ <flag name="iostats">Enable support for per-task I/O statistics</flag>
+ <flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
+ <flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
+ <flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
+ <flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
+ <flag name="math">Enable support for glibc's libm math library</flag>
+ <flag name="moc">Enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
+ <flag name="mpd">Enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
+ <flag name="nano-syntax">Enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
+ <flag name="nvidia">Enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
+ <flag name="portmon">Enable support for tcp (ip4) port monitoring</flag>
+ <flag name="thinkpad">Enable support for IBM/Lenovo notebooks</flag>
+ <flag name="weather-metar">Enable support for metar weather service</flag>
+ <flag name="weather-xoap">Enable support for metar and xoap weather service</flag>
+ <flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
+ <flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/conkyforecast/Manifest b/app-admin/conkyforecast/Manifest
new file mode 100644
index 000000000000..53bcfda07241
--- /dev/null
+++ b/app-admin/conkyforecast/Manifest
@@ -0,0 +1,5 @@
+DIST conkyforecast_2.24.tar.gz 11347231 SHA256 251dba60bc209a2f4181de856abb1fe553e8b983d1af40998235061e8679a54d SHA512 dcff08915c00915f6be4cd25824e3d8de978ed15ffb6776f002d585d95856f5e0827632371dd4d37016e07d58542e2bc95a7a859ebdc8ab9d1200ac04d4364e0 WHIRLPOOL d7a6967e09a52eeac98ab13f64f3ab86a29f1964b7b79951c78b08f7e42c67d6d41e5c339bd1d7dedad687c523bd7fd059d529d076894d19af2a1c2a8180e718
+EBUILD conkyforecast-2.24-r1.ebuild 1143 SHA256 2ce47e5359453144dd0a29f3e37825c579d3430f4a96c5ff5273a25865a0a820 SHA512 b269faef892efa7ded0d49830e0232fb2eefc95c55e24a6e50935aa40b9e2c0ad198c061237d7200a252a6169cc2480df6b1d865423963374375dc264f4c5695 WHIRLPOOL 806c90b2f7dc4792c6b83c998a8aa3eb75d9e6a5694d95ee4811be2ee81c4b76c85648821b2871bf5fde4d62f17e7d6dd1435c7abbd1093b9a9e1f0b1e0dc777
+MISC ChangeLog 2199 SHA256 69543bd70972d420d1cd5a61b5fb46fd4b63bc322d33feb433ceceacf0f100bf SHA512 ef6cd37b9f3dc5cce0444c590fe26d2e843ca16b341eae90852c2f41a08e5b0aaf85cb71f5dfded8d5277e4183ab252f2cc49aeb52a28115002257ec6febb5f3 WHIRLPOOL a9f333c1f9bba4d9b1c1380f084dc0a885f18f72c4b56594f67d012f61ef85e19f5fc7b633aad285c494504f5d177ec80c06cd634e1b817dba6fd4162f664272
+MISC ChangeLog-2015 1379 SHA256 4223c2785e36e2e2b5b73a6ca745bf355ec36b974d4c305c0d750a8d12961ad2 SHA512 9e1f5abfcdd0b15897e5e480e816fff90f5e0dbdc5f1771e794de4b7c887c07d709ec94b6cbace2648c05a8420f7ff470f034fa6775f451400ca956e16d7c197 WHIRLPOOL 4a4d96f40336e25ac4b5308498e144237201901e0466eaf06d1bb13b18fc3bb1f57d232ebd0a7610b520e4bb072f5409c4045ef16ea4e3c36b2ae62be7cc4a63
+MISC metadata.xml 328 SHA256 42562b05183360f33bee3279a728db09771f8c94428be860ffbc1b8afc129632 SHA512 b82738da77f143327af6973f163191826c7883fb1d3991f2c369ebcc84e50c71b1ea714d124562236501788fde015c3c3b33c4300561cc549a275931dc9fe426 WHIRLPOOL 7f3161bd822780af5dc41098c19c947a54a416a8a0f6f7d4f84ab538067892d063ba7c066a5b915a0575e8f0b3f96c59bd14c75f341855e07fcc222bebbcb1ce
diff --git a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
new file mode 100644
index 000000000000..2a1f73e2ee42
--- /dev/null
+++ b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# upstream broke setup.py to install into /usr/share...
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Conky weather forecast script with support for language files"
+HOMEPAGE="https://launchpad.net/~conky-companions"
+SRC_URI="https://launchpad.net/~conky-companions/+archive/ppa/+files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/conky"
+
+S=${WORKDIR}/src
+
+python_prepare_all() {
+ sed -i -e "s:pythoncmd=.*$:pythoncmd=${EPYTHON}:" conkyForecast* || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ python_optimize "${ED%/}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+ elog "You have to define a partner id and registration code for "
+ elog "the weather.com xoap. You need to copy the template from"
+ elog "/usr/share/conkyforecast/conkyForecast.config into you account"
+ elog "as ~/.conkyForecast.config and edit the respective fields."
+ elog
+ elog "More details can be found in the README file."
+}
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
new file mode 100644
index 000000000000..d9f08c9f2411
--- /dev/null
+++ b/app-admin/conkyforecast/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="launchpad">~conky-companions</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
new file mode 100644
index 000000000000..7069a2b71689
--- /dev/null
+++ b/app-admin/conserver/Manifest
@@ -0,0 +1,12 @@
+AUX conserver-8.1.18-dmalloc.patch 2806 SHA256 4c2ce7620fd78d2d4b2fcdb11fbef03eb532124f95dc9653488d6c166fb59621 SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6 WHIRLPOOL 6f2cc198e2b1d7e335c0f89ec674c0ccd0111811deafda3dbe61708b0621173ce7a51e524e9c3235a052c047f320aa0996bc94d159b11ef52eb112989e414c41
+AUX conserver-prestrip.patch 882 SHA256 3e333d4e3bce4faa67255fc8065c22590b24e812956f8d7b9645ae2788dd4839 SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af WHIRLPOOL 6a6b14c7a85d8bd3fa938792e580a84e31b6c048e54e06a137569a95f5382524d4c4687e01c66e7403d32accf829637e157dd44cd9edaf6523b7b9d4557540d6
+AUX conserver.confd 170 SHA256 ba9aa2d43ed094a90478bc01e763e3c4158ada567539ec2625dbdd0d08cd67db SHA512 af326d215eb7b6e4bdf68a9fc8b58c42dae9d0b31f653af181097c7cf4ee663bcc7c848f77ef051327e54a18e0202536b524b1b82d36693751f07d2c37f5b071 WHIRLPOOL 929d4e756c0e9e8a126f81425a28fa75584fab78d24291505920572946fac5394c33dc1df283e8f065a1a594a12caf3b0edc6bb6772be865824035acf0f4e0b4
+AUX conserver.initd 1055 SHA256 6eb6d2f9361496a896f4df1892b3dbad6f8c55b7629e2d148f05e7cdb2052738 SHA512 4bd10a1cd95707d6ebde6774ed88ef69552ed1b823baac4942958f9ecc2c5185f45d08d9a4707ad31320645c80e13a34b5fecbfb6eac9f282c2c422820986ac6 WHIRLPOOL 2e07da4552bcd782e6cb81ce0b1f1b563a05bb0a5df9e1790878755322f31ff5ecea7e16ac3fa730f8f8011d386d9e7c54e5daf1b8c4517594fad87f91ab681a
+AUX conserver.initd-r1 1088 SHA256 108da59df71dfb6494724a123da98321abc628f3e7a5beaaa32f1b8187181d85 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3 WHIRLPOOL ac4eafc17d20d01950bea945fe38c087dd412fef4a8e5cd9ebab5b87447caf0d343d341d5030da6da7b88f14b6ebf0acd13dca857f34a887d2bf778d60e477db
+AUX conserver.pam-pambase 194 SHA256 7b1f7770c8781453907b2785c54b1043c8e66202437479c4d9664b71a0bac816 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9 WHIRLPOOL ad118856b14aae65730dc224882d442314b6620df51fae55b000ab74afb744f2f99e47d009c8733e18269915ac0f02e5cdc1bd2a3e0b67f8527ef9b39bbe99d4
+DIST conserver-8.1.18.tar.gz 323247 SHA256 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f WHIRLPOOL e12e54f2af25ef696ecf61818da0dd8cd09c23ca03e0fbb8445ee8eca5dc4ec2dbb25e88a68ac4a51c49b89838bf875ac65ac0e59d49337f36aa3929aa02dc81
+EBUILD conserver-8.1.18-r1.ebuild 2298 SHA256 f5c6c4e0721836ace4479030208b011494300f14d8c859730a4d0d09458a2007 SHA512 51e12d2e12ec0c793bc5df6ef8887404acea3bb07565e222afa7225a8578b4432b1197494047c24d0e96cde05b2e7f42404ac8e8c0509d773efc7b6aa4b121b2 WHIRLPOOL 25331585488cda2c222b4d4e31686c7fe5d5ba95d8d213c993a1e6f4fd7b2e0073e98c807858b7678864d12d87288b156e64f484ddd8d35c436b7659c7339048
+EBUILD conserver-8.1.18.ebuild 2230 SHA256 f56ded4a398d96d173fc727c9c6322a84bfab782551b2cad6b8494483d9ed14f SHA512 a77a9c4550d25b134033f7d549528f58438f06012d2ecc8564dde521ed4dca880b7fd9ad75b43e0061988574a43c395e7760bb3b10e9709bdae54cfbf9311dc1 WHIRLPOOL 0a02f6b57d545e67bcf3e7c2bbc2256f51495b667e40fc992d6df98f4e832fe1cc2b98faa3cb79a1537d97ce90f348cfa2982ac36d0e93a1b804590cc50c41bd
+MISC ChangeLog 3284 SHA256 20e16c1aab0c530c8202cc7bd3103a14bdd3a111bc75f8813e7f86b7bc9d759d SHA512 d34f862a217885fea4c48eaf3eeb2b739d773ad5794d32ddd84cb4f594fbfef73eab8e979181a1e19510b2d4e86a1be9bc0d331bb069ce394fa8c84329e0ad62 WHIRLPOOL e120e7f76a3683f7ce4cf07f2f93bcbac89ed9334b6a8fc30050a33768d91659b8b3e107ca58285aabfaffdb32ce946f26897562628832a704bea042f6787047
+MISC ChangeLog-2015 12410 SHA256 2ba145452e54ec60b7ff51d61888de1adfe61be3522277aa8aa13e8e360d8bd5 SHA512 2b9e88baeae008abe0580dc0c17f62fec81e903d16b0ec94aed108b905559cf103a2179182043d6c524aefc470ccfd241768b3e0c9543cafbba0dde73058c7ca WHIRLPOOL d2f884fedccf7c4a33a481937a7c56f58b634a7fb879fb22da8af62db7ce4b6b867941b61b6148cace75b13151ab2e1ca72e58ed4040207b8090330e3d2ce72f
+MISC metadata.xml 1247 SHA256 36a93b4105050235fda58276d36ce96316ae2c482caff74132b377f9b6a428a7 SHA512 a5d15b8c926b8f073c1c70bfe591d118880f58157e4e128d9f048f96898905bf0a49ea6710f8684d169d5e128a80bde242b9c1d787de59dba4449816d0e30e54 WHIRLPOOL 79f4fed7b1f62df0aaff4f6ce481299b969a980bd917d378ad00f5ea71796e4dcac7aa3f7adfada8ed6f38d04ffd619472b03d41cdc34a074d6e91b73c745327
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
new file mode 100644
index 000000000000..c23494679c75
--- /dev/null
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit ssl-cert eutils pam autotools
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="http://www.conserver.com/"
+SRC_URI="http://www.conserver.com/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kerberos libressl pam ssl tcpd debug"
+
+DEPEND="ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ pam? ( virtual/pam )
+ tcpd? ( sys-apps/tcp-wrappers )
+ debug? ( dev-libs/dmalloc )
+ kerberos? (
+ virtual/krb5
+ net-libs/libgssglue
+ )"
+RDEPEND="${DEPEND}
+ pam? ( >=sys-auth/pambase-20080219.1 )"
+
+src_prepare() {
+ # Apply patch to prevent package from stripping binaries
+ epatch "${FILESDIR}"/${PN}-prestrip.patch
+
+ # Apply patch to use custom dmalloc macro
+ epatch "${FILESDIR}"/${P}-dmalloc.patch
+
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with ssl openssl) \
+ $(use_with pam) \
+ $(use_with tcpd libwrap) \
+ $(use_with debug dmalloc) \
+ $(use_with kerberos gssapi) \
+ --with-logfile=/var/log/conserver.log \
+ --with-pidfile=/var/run/conserver.pid \
+ --with-cffile=conserver/conserver.cf \
+ --with-pwdfile=conserver/conserver.passwd \
+ --with-master=localhost \
+ --with-port=7782
+}
+
+src_install() {
+ emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+ ## create data directory
+ dodir /var/consoles
+ fowners daemon:daemon /var/consoles
+ fperms 700 /var/consoles
+
+ ## add startup and sample config
+ newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+ newconfd "${FILESDIR}"/conserver.confd conserver
+
+ dodir /etc/conserver
+ fperms 700 /etc/conserver
+ insinto /etc/conserver
+ newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+ newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+ ## add docs
+ dohtml conserver.html
+ dodoc CHANGES FAQ PROTOCOL README TODO
+ dodoc conserver/Sun-serial contrib/maketestcerts
+ newdoc conserver.cf/conserver.cf conserver.cf.sample
+
+ # Add pam config
+ newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+pkg_postinst() {
+ # Add certs if SSL use flag is enabled
+ if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
+ install_cert /etc/ssl/conserver/conserver
+ fi
+}
diff --git a/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild
new file mode 100644
index 000000000000..cb1fea8dbe92
--- /dev/null
+++ b/app-admin/conserver/conserver-8.1.18.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit ssl-cert eutils pam autotools
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="http://www.conserver.com/"
+SRC_URI="http://www.conserver.com/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="kerberos pam ssl tcpd debug"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+ pam? ( virtual/pam )
+ tcpd? ( sys-apps/tcp-wrappers )
+ debug? ( dev-libs/dmalloc )
+ kerberos? (
+ virtual/krb5
+ net-libs/libgssglue
+ )"
+RDEPEND="${DEPEND}
+ pam? ( >=sys-auth/pambase-20080219.1 )"
+
+src_prepare() {
+ # Apply patch to prevent package from stripping binaries
+ epatch "${FILESDIR}"/${PN}-prestrip.patch
+
+ # Apply patch to use custom dmalloc macro
+ epatch "${FILESDIR}"/${P}-dmalloc.patch
+
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with ssl openssl) \
+ $(use_with pam) \
+ $(use_with tcpd libwrap) \
+ $(use_with debug dmalloc) \
+ $(use_with kerberos gssapi) \
+ --with-logfile=/var/log/conserver.log \
+ --with-pidfile=/var/run/conserver.pid \
+ --with-cffile=conserver/conserver.cf \
+ --with-pwdfile=conserver/conserver.passwd \
+ --with-master=localhost \
+ --with-port=7782
+}
+
+src_install() {
+ emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+ ## create data directory
+ dodir /var/consoles
+ fowners daemon:daemon /var/consoles
+ fperms 700 /var/consoles
+
+ ## add startup and sample config
+ newinitd "${FILESDIR}"/conserver.initd conserver
+ newconfd "${FILESDIR}"/conserver.confd conserver
+
+ dodir /etc/conserver
+ fperms 700 /etc/conserver
+ insinto /etc/conserver
+ newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+ newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+ ## add docs
+ dohtml conserver.html
+ dodoc CHANGES FAQ PROTOCOL README TODO
+ dodoc conserver/Sun-serial contrib/maketestcerts
+ newdoc conserver.cf/conserver.cf conserver.cf.sample
+
+ # Add pam config
+ newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+pkg_postinst() {
+ # Add certs if SSL use flag is enabled
+ if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
+ install_cert /etc/ssl/conserver/conserver
+ fi
+}
diff --git a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
new file mode 100644
index 000000000000..ff82f74b261c
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
@@ -0,0 +1,100 @@
+--- configure.in 2011-08-19 01:11:06.000000000 -0400
++++ configure.in 2011-08-19 02:06:50.000000000 -0400
+@@ -320,6 +320,8 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
++AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"])
++
+ dnl ### Compiler characteristics. ##################################
+ AC_AIX
+ AC_C_CONST
+@@ -578,51 +580,6 @@
+ fi]
+ )
+
+-cons_with_dmalloc="NO"
+-AC_ARG_WITH(dmalloc,
+- AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@],
+- [Compile in dmalloc support]),
+- [if test "$withval" != "no"; then
+- if test "$withval" != "yes"; then
+- DMALLOCCPPFLAGS="-I$withval/include"
+- if test "$use_dash_r" != "yes"; then
+- DMALLOCLDFLAGS="-L$withval/lib"
+- else
+- DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
+- fi
+- else
+- DMALLOCCPPFLAGS=""
+- DMALLOCLDFLAGS=""
+- fi
+-
+- oCPPFLAGS="$CPPFLAGS"
+- oLDFLAGS="$LDFLAGS"
+- oLIBS="$LIBS"
+- have_dmalloc=no
+-
+- CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS"
+- LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS"
+-
+- AC_CHECK_HEADER([dmalloc.h],
+- [LIBS="$LIBS -ldmalloc"
+- AC_MSG_CHECKING(for dmalloc libraries -ldmalloc)
+- AC_TRY_LINK([#include <dmalloc.h>
+- ],[dmalloc_debug(0)],
+- [AC_MSG_RESULT(yes)
+- cons_with_dmalloc="YES"
+- AC_DEFINE(HAVE_DMALLOC)
+- have_dmalloc=yes],
+- [AC_MSG_RESULT(no)])],)
+-
+- if test $have_dmalloc = no; then
+- LIBS="$oLIBS"
+- CPPFLAGS="$oCPPFLAGS"
+- LDFLAGS="$oLDFLAGS"
+- fi
+- fi]
+-)
+-
+-
+ dnl ### Check for needed functions. ################################
+
+ dnl dnl The following basically stollen from the less-358 distribution, but
+--- /dev/null 2011-08-07 13:18:05.535976733 -0400
++++ m4/dmalloc.m4 2011-08-19 03:49:03.755073497 -0400
+@@ -0,0 +1,34 @@
++## ----------------------------------- ## -*- Autoconf -*-
++## Check if --with-dmalloc was given. ##
++## From Franc,ois Pinard ##
++## ----------------------------------- ##
++
++# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010,
++# 2011 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 7
++
++dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT])
++AC_DEFUN([AM_WITH_DMALLOC],
++[AC_MSG_CHECKING([if malloc debugging is wanted])
++AC_ARG_WITH([dmalloc],
++[AS_HELP_STRING([--with-dmalloc],
++ [use dmalloc, as in http://www.dmalloc.com])],
++[if test "$withval" = yes; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE([WITH_DMALLOC], [1],
++ [Define if using the dmalloc debugging malloc package])
++ LIBS="$LIBS -ldmalloc"
++ LDFLAGS="$LDFLAGS -g"
++ [$1]
++else
++ AC_MSG_RESULT([no])
++ [$2]
++fi], [AC_MSG_RESULT([no])])
++])
++
++AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/app-admin/conserver/files/conserver-prestrip.patch b/app-admin/conserver/files/conserver-prestrip.patch
new file mode 100644
index 000000000000..e67c49da1a66
--- /dev/null
+++ b/app-admin/conserver/files/conserver-prestrip.patch
@@ -0,0 +1,24 @@
+diff -Nuar conserver-8.1.14.orig/conserver/Makefile.in conserver-8.1.14/conserver/Makefile.in
+--- conserver-8.1.14.orig/conserver/Makefile.in 2006-10-25 17:41:00.398082243 -0600
++++ conserver-8.1.14/conserver/Makefile.in 2006-10-25 17:41:27.876759095 -0600
+@@ -13,7 +13,7 @@
+
+ ### Installation programs and flags
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ LN_S = @LN_S@
+ MKDIR = @MKDIR@
+
+diff -Nuar conserver-8.1.14.orig/console/Makefile.in conserver-8.1.14/console/Makefile.in
+--- conserver-8.1.14.orig/console/Makefile.in 2006-10-25 17:41:00.401081662 -0600
++++ conserver-8.1.14/console/Makefile.in 2006-10-25 17:41:18.188635834 -0600
+@@ -9,7 +9,7 @@
+
+ ### Installation programs and flags
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ LN_S = @LN_S@
+ MKDIR = @MKDIR@
+
diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd
new file mode 100644
index 000000000000..4544fed4ab36
--- /dev/null
+++ b/app-admin/conserver/files/conserver.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+## Config file for /etc/init.d/conserver
+
+CONSERVER_OPTS="-d"
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
new file mode 100644
index 000000000000..0c0771c72c6b
--- /dev/null
+++ b/app-admin/conserver/files/conserver.initd
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need clock
+}
+
+checkconfig() {
+ if [ ! -e /etc/conserver/conserver.cf ] ; then
+ eerror "You need to create /etc/conserver/conserver.cf first."
+ eerror "A sample is placed there to be renamed and ajusted."
+ eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+ return 1
+ fi
+
+ if [ ! -e /etc/conserver/conserver.passwd ] ; then
+ eerror "You need to create /etc/conserver/conserver.passwd first."
+ eerror "A sample is placed there to be renamed and ajusted."
+ eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting conserver"
+ start-stop-daemon --start --quiet --exec \
+ /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
+ eend $? "Failed to start conserver"
+}
+
+stop() {
+ ebegin "Stopping conserver"
+ start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
+ eend $? "Failed to stop conserver"
+}
diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1
new file mode 100644
index 000000000000..907b1b711705
--- /dev/null
+++ b/app-admin/conserver/files/conserver.initd-r1
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need clock
+}
+
+checkconfig() {
+ if [ ! -e /etc/conserver/conserver.cf ] ; then
+ eerror "You need to create /etc/conserver/conserver.cf first."
+ eerror "A sample is placed there to be renamed and ajusted."
+ eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+ return 1
+ fi
+
+ if [ ! -e /etc/conserver/conserver.passwd ] ; then
+ eerror "You need to create /etc/conserver/conserver.passwd first."
+ eerror "A sample is placed there to be renamed and ajusted."
+ eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting conserver"
+ start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
+ /usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
+ eend $? "Failed to start conserver"
+}
+
+stop() {
+ ebegin "Stopping conserver"
+ start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
+ eend $? "Failed to stop conserver"
+}
diff --git a/app-admin/conserver/files/conserver.pam-pambase b/app-admin/conserver/files/conserver.pam-pambase
new file mode 100644
index 000000000000..30025fe1403e
--- /dev/null
+++ b/app-admin/conserver/files/conserver.pam-pambase
@@ -0,0 +1,6 @@
+auth required pam_securetty.so
+auth include system-remote-login
+
+account include system-remote-login
+password include system-remote-login
+session include system-remote-login
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
new file mode 100644
index 000000000000..324e981b462a
--- /dev/null
+++ b/app-admin/conserver/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>dan@danweeks.net</email>
+ <name>Dan Weeks</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Conserver is an application that allows multiple users to watch a serial
+ console at the same time. It can log the data, allows users to take
+ write-access of a console (one at a time), and has a variety of bells
+ and whistles to accentuate that basic functionality. The idea is that
+ conserver will log all your serial traffic so you can go back and review
+ why something crashed, look at changes (if done on the console), or tie
+ the console logs into a monitoring system (just watch the logfiles it
+ creates). With multi-user capabilities you can work on equipment with
+ others, mentor, train, etc. It also does all that client-server stuff so
+ that, assuming you have a network connection, you can interact with any
+ of the equipment from home or wherever.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/consolehm/Manifest b/app-admin/consolehm/Manifest
new file mode 100644
index 000000000000..5ef005579282
--- /dev/null
+++ b/app-admin/consolehm/Manifest
@@ -0,0 +1,6 @@
+AUX consolehm-gcc4.patch 250 SHA256 59cab73407d1311686629585eb893a3e704feb5aa9c963ad38acad859b8c1723 SHA512 d9d74aed3961073c2356ce30296635e000e8c9b0ab27b1b860d6a9ee30dd49c0e7ac9fea8c4f21118c36e3973ede0a07b14afd6da2506a0762fdafb89abcccbb WHIRLPOOL 46729edd95491d9c1969d14592549310898a8cf986a7757c912f290799a3b4bd5ed72abb015bbd54fb92cfaf1c7350520e99b9b64ad134fc2fcead141077864a
+DIST consolehm-1.31.tar.gz 21615 SHA256 121bdc1f50f06e7a751bf1aee9d3d7d36415b234a524af6b6f626dcf5b9d5ef6 SHA512 595a5808bf85b878254e10fbe9a7beccffb4e5a35e03fe9fbea710963733fb4d6afe6fe6b70b30fa2b4fd565ed4ac1ffcca624b6717cc3b6d900960e7e6001f8 WHIRLPOOL 81d90880049acb338d4e94b00afcf88f7b897b60377dcb3a1844785d456483cdf1e079692aca387168246b5e945936feaa54759f3df4aaf5d67bedc15ddac577
+EBUILD consolehm-1.31.ebuild 1019 SHA256 92b4ece23f47bdac1bbfd57b23225dfa5aa80b00d8d9e035b1fd51fd06a7d6ab SHA512 edbe7c63cf0af49f366936dbdb8f0025774b38cc138fb0b3653d1dd7e4bee3b8fda98186cd298fe1692aa0f3bc040f6be68d471085f2201e433ec5d89872d0d4 WHIRLPOOL 7b97040eb28da1e714e53cc993e6cd35fdde1245591807e7d46699c5eefa5d5670eceacea53c251f622b43cf5ff46ce9bd59bd2864c79f5ed6cbd03d402552fc
+MISC ChangeLog 2461 SHA256 4284aacdada1c6e3a8f9402a670702ab3f619fd05939a76a784f3f85e860db3b SHA512 a2f781e789813c1c5a5e0b365ff3d8eabbc98b4d95436cf6a8d3feb8e7bc6046a45e71734a9e55f177f7516522cae34189f410e79b11491c0330d03c21f6781f WHIRLPOOL 68567326da7ee8cdb2b4dfcdac4d87de9808056e49a5efc36cd2874a788c9b0c03e55e2a64831a904f7843230b88d4adbed45caa57cd46fd3f61956d2803a344
+MISC ChangeLog-2015 515 SHA256 2283e1e3bdd7dfb37e6dafb6bd2b8aee9dce20d0445a01c2aaddcb06fa879ed3 SHA512 7971479f0bcdf28fbcef7177e3daa8560d8188dcbf342f5f215de75bb8a14af07dcfa684f55cf0e45e31a13ca72511458e094d0cb8a4edf815eddc5f4e51d572 WHIRLPOOL 97a904d542227c7d360e4f702f3a8d00e4287dbcde8456b55f0d2fcf79b9b623bc5a1c6744f681ee5c0a3ba3f4f2889bb14cd6efdb2059b81c52bec6d7501925
+MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
diff --git a/app-admin/consolehm/consolehm-1.31.ebuild b/app-admin/consolehm/consolehm-1.31.ebuild
new file mode 100644
index 000000000000..a0dda68d8469
--- /dev/null
+++ b/app-admin/consolehm/consolehm-1.31.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Console based hardware monitor for FreeBSD"
+HOMEPAGE="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/fenner/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+
+KEYWORDS="~x86-fbsd"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+ unpack ${A}
+ epatch "${FILESDIR}"/${PN}-gcc4.patch || die "patch failed"
+ export CHMS="${S}/consolehm"
+ # The only 'SMBus' smb.h i've found is in a different place:
+ cd "${S}/consolehm"
+ sed -i.orig -e 's:machine/smb.h:dev/smbus/smb.h:g' \
+ configure.in \
+ configure \
+ chm.h || die "sed failed."
+}
+
+src_compile() {
+ cd "${S}/consolehm"
+ econf || die "econf failed"
+ MAKE=make emake || die "emake failed"
+}
+
+src_install() {
+ dobin "${S}/consolehm/chm"
+ doman "${S}/consolehm/chm.8"
+ dodoc "${S}"/CHANGELOG
+ dodoc "${S}"/README
+ dodoc "${S}"/TODO
+}
diff --git a/app-admin/consolehm/files/consolehm-gcc4.patch b/app-admin/consolehm/files/consolehm-gcc4.patch
new file mode 100644
index 000000000000..85f677a29cbf
--- /dev/null
+++ b/app-admin/consolehm/files/consolehm-gcc4.patch
@@ -0,0 +1,10 @@
+--- consolehm/consolehm/chm.c.orig 2000-12-23 03:51:45 -0300
++++ consolehm/consolehm/chm.c 2007-01-12 11:18:27 -0300
+@@ -165,6 +165,7 @@
+ printf("Delay: %d microseconds. \n\n",delay);
+ break;
+ default:
++ ;;
+ }
+
+ file_handle = OpenIO();
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/app-admin/consolehm/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>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
new file mode 100644
index 000000000000..1c8d090c4788
--- /dev/null
+++ b/app-admin/consul-replicate/Manifest
@@ -0,0 +1,15 @@
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
+DIST consul-replicate-0.2.0.tar.gz 24575 SHA256 64028b79994407f8d0d0b858a064d0bb9cbecf1e889f55b74a0f6a2c0cb63f6e SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2 WHIRLPOOL efac8709e6efa87b8aca5342d5bfaf752a22bca42a9a38cb9c4bada6855302a02140ef5bb06c27bf178081f7aef570a773c64b67ecec5f1e57c15c5a4d9c86c4
+DIST consul-template-0.8.0.tar.gz 63281 SHA256 ac12bdde35e88184d5e3f2201c2f46e2dd7b301d4f31b51945905d1b2c456064 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb WHIRLPOOL e8e48972350d9bb617c72ba07b86823359b8e997494671a23d8d897861e9cfcf429d6edb4ce3fc117849a2fbf6a56aee35809b9db6d738460da34671cfc9c4a7
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
+DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 SHA256 f9998ee9ab32a55cfa7a9f93a9439ee56fc146d8aff6601f06bb2048b71c381a SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f WHIRLPOOL cc4063c7463e261a32a84c357c352141a91e4a88874c02acd6f91bc05f478e668b5ad7629a7473009cebe201a789854f295b22d56310d39d632d81d223baec65
+EBUILD consul-replicate-0.2.0.ebuild 3449 SHA256 e7c98cfc5c24961566dd7295406827577c5edb3fee13825b096ef0cdf46b446f SHA512 e5e0bb67529e732323428c7e3ebd4bb93943700b28b1f8fd4301e0284f44ab0f88ce91601b766fea703adce8f82be9212c230cd7ec69ac8858044f3670dfa4e1 WHIRLPOOL 441360fd4f11a5b3b40db78eb0cc2aabb36365584c0ac0395a82ece46fd2c21f0f1926000485bc0cb4cd2d25de2b349ec122b93beab6460f1c398aa522981425
+MISC ChangeLog 634 SHA256 fab4dbca4d97967bf878f6809e7a78083bcc206ebd7a7f27ff2bf8671cc1477a SHA512 5a8a00d3a814aeaee59c441b4dd7357708633c79b10261b2ded010d434092aec62dc9caec75ecbe347c41569c2d3bf78d752723a8fb5048cc05d3d7e8a6b5aac WHIRLPOOL 5f010e0220042025ce174b343a7e54bd7e4fbe57a6b901fd973579246f09d91a920ae546e1db20225805e1a035af965d3058dd9b6bcb96b52ce6f311a56a8a3c
+MISC metadata.xml 317 SHA256 2d32fe624f3e7729413e6607f2e43b1e3acdc654ebf8102bdc49c602d34ec581 SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d WHIRLPOOL 4e7656b93ce984fe52789570353532388303aa5ee557eb3477054efd4f9743087fe00a1ea40dde74f563bd3ee65db5bbfb55550f01ac3b8bf7532ea390358c68
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
new file mode 100644
index 000000000000..be3251197b84
--- /dev/null
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit golang-base
+
+KEYWORDS="~amd64"
+DESCRIPTION="Consul cross-DC KV replication daemon"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="http://${EGO_PN%/*}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
+ https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+ https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+ https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+ https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+ https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+ https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+ https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+ https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+ https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+ local go_package x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ go_package=$(get_archive_go_package ${x})
+ mkdir -p src/${go_package%/*}
+ mv ${go_package##*/}-* src/${go_package} || die
+ done
+}
+
+src_unpack() {
+ unpack_go_packages
+ export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ export GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+ # Prune conflicting libraries from GOROOT
+ while read -r -d '' x; do
+ x=${x#${WORKDIR}/src}
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+ done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+ sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
+}
+
+src_compile() {
+ go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+ dobin "${WORKDIR}/bin/${PN}"
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
new file mode 100644
index 000000000000..387973160cac
--- /dev/null
+++ b/app-admin/consul-replicate/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/consul-replicate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
new file mode 100644
index 000000000000..b91c87b2fcd8
--- /dev/null
+++ b/app-admin/consul-template/Manifest
@@ -0,0 +1,9 @@
+AUX consul-template.confd 293 SHA256 8e303d21f2c42d0372a374e2e93095f86c6caf7c86f79afd24483e0ee8ddbebe SHA512 ee07c0f95b3ac35599417524dc2b76931a541f60888d93bf403c535518693452ff01076f70f3e891bca962376e422fb6650496297b5ffad96544fb4c36df0295 WHIRLPOOL 3bf900604bc1817bb5a6e0df423cd1a2a352e8d0d77d06beaaffaadf08e735a687cf3122366fe6f01f2069380f267493d36c3e33e81a4c66737ceca435fac2ef
+AUX consul-template.initd 592 SHA256 2c6f23de3ae5db567932039ec2cd2ed1da420a71884bb6fe9f7390049f3eb130 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676 WHIRLPOOL 226b2b3809d15858bdfc17a41e9ec38c0605da71d98e0a76848c7acae0a19f2ff8caf09affe5860aa9adad2cf33760036e486e5b8429e572a5880168d6d2d346
+AUX consul-template.logrotated 103 SHA256 44b553aa86ea3a1b017dbbe187b3d843831091fed81f71339ac34393f8f47513 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75 WHIRLPOOL 7a4e61e7649577b6b9caa4f11da84450d2910712ebc2cb4b82437f002a2b40c5120c05e08dd7d3a8c33fdbebd778e00529f3a8778ca73884511922f720b0eefd
+AUX consul-template.service 398 SHA256 d95708aaebabdcb557825ffec93beb4c31d61b5f1f9ff4dec30d8793b0993997 SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1 WHIRLPOOL b1a60ef29ae93924f8b980dca88463a9d2661e895ec02cd2aec97cda95529259fb2a5e336b654fa27fe96c9f4bb5e8c07e940a252e204ff84d8fc116a7b05ba8
+DIST consul-template-0.18.5.tar.gz 5285939 SHA256 749bff38cefc1a2ced91a73f766550fb36ed793f402041bf31c624d1969e5b0b SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de WHIRLPOOL 9d9062043414d19d9038c962206d9868bef517a00e773a4205bf4c909fc0c9a8e0a2609b2cd92947159d91b7ae9adc3a96d7d3bf8865d11562d0a9e7c9940ee7
+EBUILD consul-template-0.18.5-r1.ebuild 1323 SHA256 5221370f59d367e84ed3c7c2a30ff7732acec2a8f2be1335e457a96763eaa5b2 SHA512 8ce0711af3cd5832468689370fa1e25f292302a0c6ea1045cf2e5fb77319be6cb2c1f0dd115fcc323ddcf95b25a169b7ce48b5ad62f0b9efdc53e94b1e9d0708 WHIRLPOOL 87f295dd5ec9dbf30c5f9134088941a5dd5767924e36000e66d4c365b7a52e0465974f2151a1dbd69d757870144b74e90e4b21b25a4b3968e13b1fded0b8f755
+MISC ChangeLog 4703 SHA256 f80b9a4ab43909f45b5456b7c4b209af7062f6d20c9c268ca56927e7b0de7333 SHA512 7a719a46a03ca327e224d1c3211cc65d074590983c5b5ae7d01d12bb0da3228bb01f83b58f2378068642f42974390823f6186960e75ef962265b0b27372b7222 WHIRLPOOL e6adbc582b4c5ee67e87e4d17b8e3583b7a1859066c5703749b66bdf5243109357768c05764083957bedcb32e62a53759437ef8f145d58be568ebc6414c96820
+MISC ChangeLog-2015 873 SHA256 309dab3b08de0570626ad0bd52979c35df9f8feb16763f31b23d922ac81d3f68 SHA512 c40929f84755aca698dc8c9787023b2d3c3afc435b89596a4d61b37f5f835ee40dd695c1b2f554e64fccde82ea12f14aeff9ce059d02a350621636ff19082c92 WHIRLPOOL dc36aedf24ff73c7373416e518299ad874e76adc3c887109710f95d3f66f99265e09424b0de28f34d790de7078b7db56160178943cf8c1a579d5b462ad282be6
+MISC metadata.xml 316 SHA256 d139fac458549f25769647609eb71c52527244c5577a7237cc4f2ec77663f7d0 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad WHIRLPOOL 4aa14a0f2f2ab600005e375da4d4f9f9aa7b1eb857a38c1deacf84a0d3a5ef7833e46d5bf492fb97a1b12a9afacbecf3e54986f32ec32a812c7f8681d9c63866
diff --git a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
new file mode 100644
index 000000000000..b04c5a353362
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="http://${EGO_PN}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.6:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ eapply_user
+ # Avoid the need to have a git checkout
+ sed -e 's:^GIT.*::' \
+ -i src/${EGO_PN}/scripts/compile.sh || die
+}
+
+src_compile() {
+ export GOPATH=${S}
+ cd "${S}"/src/${EGO_PN} || die
+ PATH=${PATH}:${S}/bin \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ emake bin-local
+}
+
+src_test() {
+ cd "${S}"/src/${EGO_PN} || die
+ emake test || die
+}
+
+src_install() {
+ dobin "${S}"/src/${EGO_PN}/pkg/$(go env GOOS)_$(go env GOARCH)/${PN}
+ dodoc "${S}"/src/${EGO_PN}/{CHANGELOG.md,README.md}
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+}
diff --git a/app-admin/consul-template/files/consul-template.confd b/app-admin/consul-template/files/consul-template.confd
new file mode 100644
index 000000000000..9af7d023305e
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: consul-template)
+# - pidfile (default: /run/consul-template/consul-template.pid)
+# - user (default: consul-template)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/consul-template.d"
diff --git a/app-admin/consul-template/files/consul-template.initd b/app-admin/consul-template/files/consul-template.initd
new file mode 100644
index 000000000000..f968d8d08612
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="consul-template agent"
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="-config=/etc/consul-template.d ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+ need net
+}
diff --git a/app-admin/consul-template/files/consul-template.logrotated b/app-admin/consul-template/files/consul-template.logrotated
new file mode 100644
index 000000000000..51e2737fd491
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.logrotated
@@ -0,0 +1,7 @@
+/var/log/consul-template/consul-template.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/app-admin/consul-template/files/consul-template.service b/app-admin/consul-template/files/consul-template.service
new file mode 100644
index 000000000000..69b1c86ddb46
--- /dev/null
+++ b/app-admin/consul-template/files/consul-template.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=consul-template daemon
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul-template
+Environment=CONSUL_TEMPLATE_DAEMON_OPTS="-config=/etc/consul-template.d"
+ExecStart=/usr/bin/consul-template $CONSUL_TEMPLATE_DAEMON_OPTS
+Restart=on-failure
+SuccessExitStatus=12
+KillSignal=SIGINT
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/consul-template/metadata.xml b/app-admin/consul-template/metadata.xml
new file mode 100644
index 000000000000..7efeb6aef9c6
--- /dev/null
+++ b/app-admin/consul-template/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/consul-template</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
new file mode 100644
index 000000000000..f2ca680ed4a5
--- /dev/null
+++ b/app-admin/consul/Manifest
@@ -0,0 +1,14 @@
+AUX bootstrap.json.example 46 SHA256 3c72ef9ab55addef92689816fe0e737c640190a8e5513af0b4b60a3176a30aa3 SHA512 eda1c8779b06ce6020e3f4e759201336b2bfa716986446882db4e6e95ff89a7da0c6101dd4dd603a59202b9c2db79d96f36cf53b63bc63375d94ba74ba4e2857 WHIRLPOOL 7c0c51dc01977b429db97b5928e90ecd6b294fdf354aaaf781b77cc661c7de5f755b93774c37a790777afff2cf8dec2459dea8e2687b7b71e99f79fd1ff3874e
+AUX consul.confd 301 SHA256 55151a3dbec4877bb5d02edb97686ebf28c216197672f31b93cb5ba3e38bc057 SHA512 d0587263753965b4614a24c3bd4aeed13e236a1dc6ed329b2ce542d394d1d5542e5db061af2151be54f5882c4bb0e254511645065f32c59d7fc338ac0bd4de7a WHIRLPOOL 3e96b307e34092204f81afdfe2ffed0fd08026163d7c5f93e20d08a3fa171b60b5950ad89bcea7cf75fa0d9ffa770cd135e92045c5d6d26585e67684b56c912d
+AUX consul.initd 726 SHA256 1a2fe5a47ab6d617a0c40310967b1ed8ae1dd1743c02e9e04a623ae1e8741c1b SHA512 a13fa8476d27288ee284b7460d77f7e67327b5a18b4635ab9c6f2f5ae05981f6876f1a2f4f27448a22a602a2ed30bd7873fe15776473d5aa6db9497765f1be6e WHIRLPOOL c6b7dfb92be4bcc3f4646ac607436be224b4a53aa5f69633fdddb7fa4dc8b27d3d950997394b9acf11e3c5b0f24f044d6fba1fadd33989aa07c129dff055c401
+AUX consul.logrotated 85 SHA256 9c69976b13ea56155e8cc9fc70327d8b7a24a0dd01f67c5f9389aa71d670df8d SHA512 e4943908e26d75ca8eb658b268479e47bc71b96957de8c35dddec52e7b8062aec3fada4e86fd97f986fbac912d29cad1f83f943ea4451b7469df0712799bb972 WHIRLPOOL ba8a6b793cbc8048136413869acbfbf44c7c8b4b6eace7d3d53677c4569974a5ed9dc1bbe92bba60c945d5db72ccfa806ce3e8a7e71cdfda8e8c343f33860dc5
+AUX consul.service 354 SHA256 e36670c1d1189403996ed74704c1751666d4bb2340d5c62f0bbedcfdd48ac539 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d WHIRLPOOL 263352c1372f76f4676e69e7f66362eea69df71ef26d097928c6b02b7a464ce747a7f0d6acd2b01eaa2b62f88ba54bf96879ea3c1f9fb10c42dbf6eaf403ef8d
+AUX data-dir.json.example 36 SHA256 1f1f24ac4b37df816974fbe3e3ba3d7ed1c8d15cb2425ba29b196329473bf38c SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b WHIRLPOOL a866a28ae0160a138b19c2f8bde315f175932d1bc5ac9b77823cf8e5553644520b5ab2f7206404522e25f3188d83a18001d3631a681e27ae0252c472d231c03f
+AUX ui.json.example 17 SHA256 a90eb6376a8d69443c5f72b434c84ba51280a64d9831adf3882fe548f65c391b SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d WHIRLPOOL 40ec22ab7c14627f6fa2352b663a3f1545f259e813d14177e591dc52d50de2612d08f53976ddc581e2bef384a11caf22cad41feed521154245eef88537ee6e84
+DIST consul-0.8.4.tar.gz 6614287 SHA256 d5573d6e70d490c8b8109722c2019b5a2b35eff703b92d6276997846361cff1b SHA512 4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68 WHIRLPOOL e270367c69fe74f25c89ef9e8c7f71307d3b8e48b4210e43e48907f1f5a73f11f45aa2b212f70c24463e35d800b861ccd34e2c82de863fc6e7da9cd3eda5214c
+DIST consul-0.9.3.tar.gz 7278357 SHA256 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70 SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f WHIRLPOOL 9e5ac311761bc786c986d4b0cdb4ba541a46f57cffd8cac4de96292293518cd8e8f3743bcb0740b245ae5a30f9f157987078874503bd6b0685a9f3c88c92ffba
+EBUILD consul-0.8.4-r1.ebuild 1524 SHA256 54f280e236dda24eda7da07f1feed8790b6f493d289b2d3455465f969172454d SHA512 a262f9fcffdff04f28a6e5be42a0037ab15a774675ab32b0d6cdfb1a7c695b9f859e2c189736157c558bef98d21a2cefe48c4556c823667b64ef4578c9541b84 WHIRLPOOL f6fa7c0857d7a470f5ff6ede65ecae00e77a504581b8a04048b314f58e82f950ab84fe4ae0b011c43cbede96ef6e811c57c77f238d870d4c59906c65a0447787
+EBUILD consul-0.9.3.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
+MISC ChangeLog 6414 SHA256 b6c3345f18332d9c9965b335a0b7c4246d852886f0c089f166d2c255d6e0af4d SHA512 664491d4dcef4abda009070a482c80a681f39a564ba7d983b8cf7a680db972550233e808bbaadecfef895c9990bb263f95c6273bf6b24c2f5523b660bb68e7d3 WHIRLPOOL 215e15b6c6379fb4e02ca41848e610ebec31946d24cb8f92adc4ac9b7f7675ef6d12679cf509e50cad04ac01587e335063c19f353f2880748dd1cd13928cf04b
+MISC ChangeLog-2015 1260 SHA256 e346cb99b0d823a6e4052d51aed1e13684aa9c7feeeb8a4b3027b74073e172a7 SHA512 9bcc7db86198b81da562dc68a3ebaa3505be6febaba7c21779580493a226fe7ec37e13ce1a3503ab4b17dfe0fc4e6e8b057908c2855c2b897318460ddc67d068 WHIRLPOOL 684c125f9d249b808024e89ad593c7c4219bcf59e4842d850118b728ef28219169fa6ae05e426fdb25b2cbe94c04b41c02748adc971df47374f57b4f6950cf0e
+MISC metadata.xml 391 SHA256 6b88704531e2782296e0491cf2b57c8bef914045a088c8c68c42b6cf0a655eda SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb WHIRLPOOL 344059242683458d3619a02327cf7e2919c43b940346d351c3d30a4dc91d5089491305ddd2193aad97c593a94151dd263bb7e3482447b3d7f914fa6c20199f4a
diff --git a/app-admin/consul/consul-0.8.4-r1.ebuild b/app-admin/consul/consul-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..e12beae0d6c9
--- /dev/null
+++ b/app-admin/consul/consul-0.8.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+ >=dev-lang/go-1.7.5:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+ eapply_user
+
+ sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+ -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e 's:go get -u -v $(GOTOOLS)::' \
+ -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GOPATH="${S}" \
+ emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners consul:consul "${x}"
+ done
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-0.9.3.ebuild b/app-admin/consul/consul-0.9.3.ebuild
new file mode 100644
index 000000000000..1eae049ea45d
--- /dev/null
+++ b/app-admin/consul/consul-0.9.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+ >=dev-lang/go-1.9:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+ default
+
+ sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+ -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e 's:go get -u -v $(GOTOOLS)::' \
+ -e 's:vendorfmt dev-build:dev-build:' \
+ -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GOPATH="${S}" \
+ emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners consul:consul "${x}"
+ done
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/files/bootstrap.json.example b/app-admin/consul/files/bootstrap.json.example
new file mode 100644
index 000000000000..b7d573c0d2b3
--- /dev/null
+++ b/app-admin/consul/files/bootstrap.json.example
@@ -0,0 +1,4 @@
+{
+ "server": true,
+ "bootstrap_expect": 1
+}
diff --git a/app-admin/consul/files/consul.confd b/app-admin/consul/files/consul.confd
new file mode 100644
index 000000000000..b15e19c77013
--- /dev/null
+++ b/app-admin/consul/files/consul.confd
@@ -0,0 +1,10 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: consul)
+# - pidfile (default: /run/consul/consul.pid)
+# - user (default: consul)
+
+# extra arguments for the consul agent
+command_args="-config-dir=/etc/consul.d"
+
+# upstream strongly recommends > 1
+GOMAXPROCS=2
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
new file mode 100644
index 000000000000..b36db8aef13c
--- /dev/null
+++ b/app-admin/consul/files/consul.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="consul agent"
+extra_started_commands="reload"
+export GOMAXPROCS=${GOMAXPROCS:-2}
+group=${group:-${RC_SVCNAME}}
+user=${user:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/bin/${RC_SVCNAME}"
+command_args="agent ${command_args:-config-dir=/etc/consul.d}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+ need net
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ ${command} reload
+ eend $?
+}
diff --git a/app-admin/consul/files/consul.logrotated b/app-admin/consul/files/consul.logrotated
new file mode 100644
index 000000000000..ca958a5f5d05
--- /dev/null
+++ b/app-admin/consul/files/consul.logrotated
@@ -0,0 +1,7 @@
+/var/log/consul/consul.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/app-admin/consul/files/consul.service b/app-admin/consul/files/consul.service
new file mode 100644
index 000000000000..496fe4814789
--- /dev/null
+++ b/app-admin/consul/files/consul.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=consul agent
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul
+Environment=GOMAXPROCS=2
+Environment=CONSUL_AGENT_OPTS="-config-dir=/etc/consul.d"
+ExecStart=/usr/bin/consul agent $CONSUL_AGENT_OPTS
+Restart=on-failure
+KillSignal=SIGINT
+ExecReload=/usr/bin/consul reload
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/consul/files/data-dir.json.example b/app-admin/consul/files/data-dir.json.example
new file mode 100644
index 000000000000..af162113af62
--- /dev/null
+++ b/app-admin/consul/files/data-dir.json.example
@@ -0,0 +1,3 @@
+{
+ "data_dir": "/var/lib/consul"
+}
diff --git a/app-admin/consul/files/ui.json.example b/app-admin/consul/files/ui.json.example
new file mode 100644
index 000000000000..f8ce72f7753a
--- /dev/null
+++ b/app-admin/consul/files/ui.json.example
@@ -0,0 +1,3 @@
+{
+ "ui": true
+}
diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
new file mode 100644
index 000000000000..a028c353fe53
--- /dev/null
+++ b/app-admin/consul/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>ultrabug@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/consul</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
new file mode 100644
index 000000000000..cccea3dac04a
--- /dev/null
+++ b/app-admin/cpulimit/Manifest
@@ -0,0 +1,10 @@
+AUX cpulimit.8 1451 SHA256 4c3591679acf33f82d7e282cf63b3ff42683a7e7553ecc7b02ad2714285e013c SHA512 3cceb217f5053aa6583a13ada2ef9ed6370859bb072474fcc6fef88f5184985b0a369b1f0c1ead634b07a1318ea1f81a4f4128de95513f9e6cabdf86223f6083 WHIRLPOOL 63cec3e9adf5e1e854f580c175028b1cce3159bc4ea709af0e98f52635acdac33ab00d8b2e41d83b9d4e83441b98997d9beeeeb8870b0306d52d907ef1d35c1a
+DIST cpulimit-1.8.tar.gz 20610 SHA256 8d0cdc3ec3e462f2ddc6debb195e1a4e7a19cce8233211f473d921f1c517d5f5 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa WHIRLPOOL f9be855b9a4b010c8456c2841afc3551a9a28bfc4a9ec3211e2c1e312bf43cdce9e1b745cc325342433feca5a73df03860469ea3a966d3bd37f7ad11a1627510
+DIST cpulimit-2.2.tar.gz 22224 SHA256 3f64daa5c4ab9245fa6ae5b564a2ffb3ae60677785103a207fd5f9c5c4cc29e4 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e WHIRLPOOL cd9f4c1d2258f2beb7e150c349c5fee984d63c1b4b3c6ca50e8c853ddf26924964ea45230e5196478416b6d17be895966476522b3f9b3702e8c9d5196322029f
+DIST cpulimit-2.4.tar.gz 24669 SHA256 a22e373755608048e9b8d4ec0c9309c59eec7178294902acee72b55de2cb24bb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0 WHIRLPOOL 39ca5c35d34b19121e367e561b9b47748b4679ad88944a5b3dacea6cdb8f16fe5a551bf5464989f4d4f99b57d6c43f82a4e20303d08cdc870b43c4a9d6d2526a
+EBUILD cpulimit-1.8.ebuild 575 SHA256 327be6c3564f61bf484bdc647c381abb78a07766a3b3a65e9dba92d0dca1281c SHA512 5b726887834de6eb7ccaef9d8797998a4bd82e3cd06c8e8982895d9780178afda4778ed2a3a55bdf89125ee78d179c594c1ca82d3d7f7bbad4384d83e6da5cf4 WHIRLPOOL f928f0beb698b75c2413d6b6cd5f6972e83a271a8d74f3bc4c8e0331f4a179619dadfc23113de9255dc2be9a38e8c41be3dd3a44aa571ae1fa49bcb662f0844e
+EBUILD cpulimit-2.2.ebuild 593 SHA256 f437d2b2912d6084519a0922ca3684458eeb90c0081990f6a31f78f9d3319316 SHA512 a488c04229230cbcc83f800ae39a391a61d8ecb7c704bdeaba85d6dcfc02179e939bbf098b26520350be25350f3ec3a8a2a709cf25991b7777b53a609c6942ac WHIRLPOOL a0d98ff69e8b8e87a48675928273754d59ad42c3012d1b2333f4c7691a8487eb7d378f1d771047e7f792b7d9ce3b8861e234c370ff1b8f06aa675b45913ac542
+EBUILD cpulimit-2.4.ebuild 642 SHA256 97caf7c3355258da87745dd643ed47625c5d96f8e288432bcebe87ee3c7403b7 SHA512 3ea7af0885d83069ce70bc0bf3a2fd6247d05bf6c54bb08b703523209acdc4e146a0a7272b9a25e5a2171e6a161a0914182daa19edda65eadd784c62f73798b1 WHIRLPOOL e3a351411b367b70714ab32822db7e3a721dc9fd180466b6dd8027e9775a52830b940d21f652d46cc8c7f7cf8cc340c3a8b41e1bf79f7cb3d6bf472dbb031fd4
+MISC ChangeLog 2871 SHA256 0c3717e099f5d96a2790b37300857e1148556e9ad4142e8d415119f648ab8280 SHA512 4dbd1e64916292280778c3a2bf2fa93bb4149f026b85c529c17dfd59a03693681039e7548303450fce8101d980afb10802bfababc3aad36a77719f5e67bb640e WHIRLPOOL 39e7279fb7e8c47028a0e07e80acf5cdb8859e293533f61796b6d62475909997489d87d9cfd420e42fc7d76f5b8410698525c0db70098fa6a2465c6cd9be882d
+MISC ChangeLog-2015 2707 SHA256 b9ad75fe1e26b0f8600a9523dc14c9014f3e6c708475d3622a90dbec8a34cb6b SHA512 fde2f4e48ef3977acf0e3dfe2f4233323c7c3a26eb970e3622e94505d6a8be4e7ddc22e410874e8586cb6e81c0af16d4bcdf26c91598fd1a5a02aa18020d6440 WHIRLPOOL 0f3c495b76857a6f71d1d65b9a612ec612ab649aba52dfe29c85bd29d89b331ea2490e813326c228de8195fc0787e9b7c9cce1af6be073d64375374403408e04
+MISC metadata.xml 328 SHA256 a0ed8ef7cb3ed649c52dda47bdc11bd8eb201cb8855fff3f0f62f45bb3fdded3 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1 WHIRLPOOL 749b190d209f69f212de768d6eb619d2aecaf326da4197db1e79f1c80872a14cccb9ca9c87ad057c29562621408748a89b9c60c9ba7ba572c9fc49d8f24c0d87
diff --git a/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
new file mode 100644
index 000000000000..bdc78ff5f3f2
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-1.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ tc-export CC
+ # set correct VERSION
+ sed -i -e '/^#define VERSION/s/1.7/1.8/' cpulimit.c || die 'sed on VERSION string failed'
+}
+
+src_install() {
+ dosbin ${PN}
+ doman "${FILESDIR}/${PN}.8"
+}
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
new file mode 100644
index 000000000000..8df40c18cf64
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ tc-export CC
+ # set correct VERSION
+ sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
+}
+
+src_install() {
+ dosbin ${PN}
+ doman "${FILESDIR}/${PN}.8"
+}
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
new file mode 100644
index 000000000000..72e81d6e2ab9
--- /dev/null
+++ b/app-admin/cpulimit/cpulimit-2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Limits the CPU usage of a process"
+HOMEPAGE="http://cpulimit.sourceforge.net"
+SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ tc-export CC
+ # set correct VERSION
+ #sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c \
+ # || die 'sed on VERSION string failed'
+
+ default
+}
+
+src_install() {
+ local DOCS=( CHANGELOG README )
+ dosbin ${PN}
+ doman ${PN}.1
+ einstalldocs
+}
diff --git a/app-admin/cpulimit/files/cpulimit.8 b/app-admin/cpulimit/files/cpulimit.8
new file mode 100644
index 000000000000..8e6dcf9bbf42
--- /dev/null
+++ b/app-admin/cpulimit/files/cpulimit.8
@@ -0,0 +1,49 @@
+.TH CPULIMIT "8" "July 2006" "cpulimit" "System Management"
+.SH NAME
+cpulimit -- limits the CPU usage of a process
+.SH SYNOPSIS
+.B cpulimit
+\fITARGET \fR[\fIOPTIONS\fR...]
+.SH DESCRIPTION
+.P
+\fITARGET \fRmust be exactly one of these:
+.TP
+\fB\-p\fR, \fB\-\-pid\fR=\fIN\fR
+pid of the process
+.TP
+\fB\-e\fR, \fB\-\-exe\fR=\fIFILE\fR
+name of the executable program file
+.TP
+\fB\-P\fR, \fB\-\-path\fR=\fIPATH\fR
+absolute path name of the executable program file
+.P
+\fIOPTIONS\fR
+.TP
+\fB\-l\fR, \fB\-\-limit\fR=\fIN\fR
+percentage of CPU allowed from 0 to 100 (mandatory)
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+show control statistics
+.TP
+\fB\-z\fR, \fB\-\-lazy\fR
+exit if there is no suitable target process, or if it dies
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.SH EXAMPLES
+Assuming you have started \fB`foo \-\-bar`\fR and you find out with \fItop\fR(1) or
+\fIps\fR(1) that this process uses all your CPU time you can either
+.TP
+\[sh] \fBcpulimit \-e foo \-l 50\fR
+limits the CPU usage of the process by acting on the executable program file
+(note: the argument "\-\-bar" is omitted)
+.TP
+\[sh] \fBcpulimit \-p 1234 \-l 50\fR
+limits the CPU usage of the process by acting on its PID, as shown by
+\fIps\fR(1)
+.TP
+\[sh] \fBcpulimit \-P /usr/bin/foo \-l 50\fR
+same as \fI\-e\fR but uses the absolute path name
+.SH AUTHOR
+This manpage was written for the Debian project by gregor herrmann
+<gregor+debian@comodo.priv.at> but may be used by others.
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
new file mode 100644
index 000000000000..79f77a166fa8
--- /dev/null
+++ b/app-admin/cpulimit/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>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">limitcpu</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
new file mode 100644
index 000000000000..bd1871a3375e
--- /dev/null
+++ b/app-admin/cronolog/Manifest
@@ -0,0 +1,16 @@
+AUX 1.6.2-patches/cronolog-define-strptime.patch 302 SHA256 06f933bef29bf3194c7506d9abb476b5a2996ec8100c9a7a05164ce59c86c573 SHA512 f2bd5b109ef4c3656f31f516364defaad899a16f279d867a1548e7c797b30691daef49b7bee49e6ce15be3903aea09c3b5cf04cf077797d066ada9ac68e6335a WHIRLPOOL d8ad5817fd340cb534dea62622443cc2157a74195467436b01c03608c0e7934d680976f9b08399d202b86876a0a0330cf9589ed6dbbcf0ea1b638442804331f5
+AUX 1.6.2-patches/cronolog-doc.patch 406 SHA256 fc4098f09e6aa7a252239bc5ab1da45d1ce5d3c61ecb7e44deb6ee337fb75ca2 SHA512 a33eda2c8d9cb1c4f72ec6fa80de9748789cb1e754f6448f53c12df601d78f5284c66d1ed476cd11435fb83a4d834cdaea85f0a4d1421fb1796197a871860cfa WHIRLPOOL ab3b8c352a7b61534f37df8e2e3e522705ce2960f7cf0e28ebf51a919b9a38180aa0afa04f99186777591852041a41cfe89564e83f56f9bf8ccab287c7e21043
+AUX 1.6.2-patches/cronolog-getopt-long.patch 1080 SHA256 60dc7a318f7caf53834d92323bf9f65c43fce1d145002c8e7106aeb1da0671f7 SHA512 84f784dff035200a15ade43e5379bbaadf8ac24216c2dd157d2f3f2e30575d0bda8357b0d2661f1d13ba1b446e88b4bbe2805b46fd8af80c5f6af4a47bc03f4e WHIRLPOOL cc105dc2981b525eeae0c36e99e2d511a3e3816f19c53af3f87c7222c9c19192135fa8757dcaa48f06c782756cf0a8e4ee77eeefdafc73bfd2a20c60c2874983
+AUX 1.6.2-patches/cronolog-large-file.patch 823 SHA256 9bd28c00b30ef37c7fed8d362552edc86d5feb4551228facf78308d39eeb5716 SHA512 23d2579941d57bab47e73c3f258e54074b87bd5306877d8139b3a777de97be8d24c994142d6a38163048d02aa550096264e076fd47b3e5b4d5599d16f48edd3e WHIRLPOOL 5de6125851583665e67f215e29ed4fc94bcb934c9bfefa021d8a7283e61ad29d44f9f1122e34e82319e9e855c45b0524b6a15e316f55e4a733a2d8a5f05ba72e
+AUX 1.6.2-patches/cronolog-missing-symlink.patch 326 SHA256 130793717436653c389280f372d5dce9b3e069f2b8c5fbf49a8a1fda6d443af1 SHA512 6617e7ccde6fd97e68147157b1c1341e5d4d0ad2ffe69225d543990ef5dba3bfea2f79c3a351d696470a70e0da57595d3eea194cc53aea81d3926b0f3b2eabad WHIRLPOOL 76c620918624f09265fbd4186f44018067ccbb491a7294ca76365b839ded6ac078b906505f3bb34ced8f0fc21f26e056c02197d7758e1af92c9beee64d92ab81
+AUX 1.6.2-patches/cronolog-setugid.patch 12345 SHA256 cd4a84f205b90575524ff282b19f997e0d6f487a24ad47a927bd29625cdd5151 SHA512 ed9048ceb5e9dcb86c34f34e0f2619ec85a1789883939ca99875ec61b3df711e6793204363445c8df3a13298aaa079fadde76f0a9e87b62b8bc44f103143a9e0 WHIRLPOOL 42801ed9c84470346bf9a7ef7bc7e81da17163a7032b28b336a5e59eb0502b6612759563394d2c83d23e88862086be46f3c6edc3447096aee9b3754ed1177f39
+AUX 1.6.2-patches/cronolog-sigusr1.patch 1154 SHA256 146822d36cac823e6e1c40838b7b1c94809202dfa495e527065b111aa1050ff7 SHA512 8d31f0032581b3295b168b5af4755f0ac5793869d7472a42c66ebe2b0ac7ecf03b88aa6459341bcbc5f6dfa3265f205844fe1a1b4e1256f957f12b5577ef2ed6 WHIRLPOOL fed9b050eca48b43d3054ea5dc44c8ed4dc6f409078f9869dc45580014bb40d063f2be70050d7fbd0fdcb99c9cc2ce13b81c81c70c11c0ac33352f4cdc65dadb
+AUX 1.6.2-patches/cronolog-strftime.patch 435 SHA256 bb5fe1e93e79e4704bc0be045f4b15a810a76c068e1fc14e15c63039bb8f7ff6 SHA512 8c226b70c7b026ce5e7400798d0e2016ed984df04bd66b6a2358ce445323be930b5f7951b879545c8f075761cc2b5062f9ccc4b759f2e586a4c8943efa4ee914 WHIRLPOOL 70ba3a12f518727933a3c493f9a6ccce6e949e0091d8c6b2e8a6126c63a6981782a494ea1250dcd4892621cd23944fdcb33566c1fea246db07b8525487b652eb
+AUX cronolog-1.6.2-umask.patch 2366 SHA256 8cf46a4acf301a1a5a12a993d653969874d8aba31884462313cd92a6a19976ae SHA512 da3f7d84ce365edce396bc43ec9b469973301c6a28f3eb56b7f019dcb65fb7ceec981f92c1382542d01e4b6e49e32ff4fe283aed9dbc7bb30c6780775acf39b3 WHIRLPOOL 740496a38f513494a4a3678c7bd9d1559924a667c85699d43622686e5e894fd7a8aa54f8e70210a98b624d3ef453158c2413b06afbdcac1eb0d8966643193a47
+DIST cronolog-1.6.2.tar.gz 133591 SHA256 65e91607643e5aa5b336f17636fa474eb6669acc89288e72feb2f54a27edb88e SHA512 786135aaa1359605840effb9a755c500970098ca32c1c4976c62f9d7481d24cecefe223ce8dcc34a139427259a6f3ba1c435c700a72ee07ed68ffc7f2d36e4ea WHIRLPOOL 2da26cdbbf3de135c1eaaaa4e932ed297f13ae05420f03a6b8f950c87c1d4ac067048058203dc9825e3a977aef7b44b24dbaf37b81c96c53e632e78121651506
+EBUILD cronolog-1.6.2-r3.ebuild 551 SHA256 5e55b8f58f880630e3a9f1fcad34d30578b65ef3e0026682f9fd5c01db620b64 SHA512 7d59570fa6a7346bc97acd36f9f30d4433929541bae8afe97ef7c2db2fa04bd2c11d63c750a41793edcbdf6d59456db890c48d07151d897cc5d160f7d5fa11d0 WHIRLPOOL b1489d147bf78bed691136a164ab70f656be473dc27a3fb2298eba67718b9a435e34beee3ea528862fab3b3a5eec6dcffbf8c626b00ffbc4046fe3edfa644fdd
+EBUILD cronolog-1.6.2-r4.ebuild 636 SHA256 e86b2920ea88b30550c3e16300011a253e669d01f32f3bac4e34f8a815dc5339 SHA512 0b15fad256c0b3c2687aac00da048f3fb03ad35ecb307afa53c4f4d455f9c3930fc29a07f016151ea5296b6a1e0b74fb9e48de72d2f94f87e2a13d5e9cabb119 WHIRLPOOL 82360a970a77497d75b05f279e111acf58a310496c3058597c0f085716ed050f82f982ebddb43272b53afd36985bd7f302b13454edefe1dca582b79a8c766873
+EBUILD cronolog-1.6.2-r5.ebuild 610 SHA256 0020b4cf82c7db6621ab624fbde3c5020dbe7cfebc06bfe569bc1983bfd9c432 SHA512 c24343e2e09355cfe3b335583d13504a679a9f9cc2ffde0bb1fb2e30b86061b5d976bb5a275a48be2988f5b7a5667471f86a43a95bc457a1c86dadb716cdbd03 WHIRLPOOL f9d45a03b1a3c2e30cd839b21b765df6e286be2bc4b3df9d4e8d24e7ae1fbcafa698d93d12dd4dbc013b6bbc3662179042fbf676d1d643ab4625df93af061928
+MISC ChangeLog 3450 SHA256 4fccb655314cdc275d162d7c1befde1a5c67cb4a8adafc9dd9f15dc9e4ab4250 SHA512 ccb5c46299c97c421f8d9aa6a4363b79aae99ff8bc64f542f1a49e61db64824d95d6812d22c34f66633cf30d2daa261f604036550e7c5ad8426bfa89a9e5837d WHIRLPOOL 2277f8492dc698a8f197e9b636528eb4b0924aaa6f8710364eb890041428a24172803e61f7f90ec05942598bd1905066cd9e8146b6ce09b63f77a9716a50f8e8
+MISC ChangeLog-2015 4731 SHA256 d1b5eae7c8c9ae1d8d387be31a6e92f36b589151c26abf963db0e94768ea202e SHA512 1f1eea1f9a8e7b184e3997ad1bb58b84d24d663845cf7e859acfb35d5912062d8c824971a30292f0dfd578de31aede6d8bf3cd9c7845ba8de55b9be97dbf3515 WHIRLPOOL 539c6e34b51b242ecb73ad33a13c9d6b9791391691d8ca612ef6211df15e057f82b1845fdc6d41b19e7f4b53efdff1c5a7eb6df1e3bf190f54b852766dbb66bd
+MISC metadata.xml 719 SHA256 1510b0c232eea361df3ec9399dea339e6e38b9b4f9d1485721653ae807260e57 SHA512 d5b5452b8105d8273328ee8ab1c95674686a00862a578f8171c4799791ceb131ac0204693a3d65ce6136d9cbea114f7f899a85669bde9b76b8c8e800a4c4c75f WHIRLPOOL 02cf394ec469d849f9dbabd14997ef14457e7f3e7a82f3ead00c353f66b748344dafab77883082158f33f629356d6a6595922cb5f68369b83d035ab5c8dddb69
diff --git a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
new file mode 100644
index 000000000000..d3dd66369235
--- /dev/null
+++ b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION="Cronolog apache logfile rotator"
+HOMEPAGE="http://cronolog.org/"
+SRC_URI="http://cronolog.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-1.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${PV}-patches/*.patch
+
+ eautoreconf
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
new file mode 100644
index 000000000000..3c603c959591
--- /dev/null
+++ b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION="Cronolog apache logfile rotator"
+HOMEPAGE="http://cronolog.org/"
+SRC_URI="http://cronolog.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE=""
+
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${PV}-patches/*.patch
+ # patch written for infra usage
+ epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch
+
+ eautoreconf
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
new file mode 100644
index 000000000000..ca4ce0c7003d
--- /dev/null
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Log rotation software"
+HOMEPAGE="https://github.com/fordmason/cronolog"
+SRC_URI="http://cronolog.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-patches
+ # rename and move into ${PV}-patches after -r3 removal
+ "${FILESDIR}"/${P}-umask.patch
+)
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
+
+src_prepare() {
+ default
+ mv configure.in configure.ac || die
+ eautoreconf
+}
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
new file mode 100644
index 000000000000..26ac2a40319c
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch
@@ -0,0 +1,11 @@
+diff -urb cronolog-1.6.2/src/cronoutils.c cronolog-1.6.2-patched/src/cronoutils.c
+--- a/src/cronoutils.c 2001-05-03 09:43:21.000000000 -0700
++++ b/src/cronoutils.c 2008-01-05 22:08:42.000000000 -0800
+@@ -69,6 +69,8 @@
+ *
+ */
+
++#define _GNU_SOURCE
++
+ #include "cronoutils.h"
+ extern char *tzname[2];
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
new file mode 100644
index 000000000000..b4b68d5690a9
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch
@@ -0,0 +1,12 @@
+diff -ur cronolog-1.6.2/doc/cronolog.1m cronolog-1.6.2/doc/cronolog.1m
+--- a/doc/cronolog.1m 2001-05-04 01:44:55.000000000 -0700
++++ b/doc/cronolog.1m 2008-01-06 00:43:33.000000000 -0800
+@@ -77,7 +77,7 @@
+ to the current log file.
+ .\"
+ .IP "-P \fINAME\fP"
+-.IP "--prevlink=\fINAME\fP"
++.IP "--prev-symlink=\fINAME\fP"
+ maintain a symbolic link from
+ .I NAME
+ to the previous log file. Requires that the
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
new file mode 100644
index 000000000000..b7eb5c1760c4
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch
@@ -0,0 +1,24 @@
+diff -urp cronolog-1.6.2/src/cronolog.c cronolog-1.6.2/src/cronolog.c
+--- a/src/cronolog.c 2001-05-03 09:42:48.000000000 -0700
++++ b/src/cronolog.c 2008-01-05 23:54:53.000000000 -0800
+@@ -139,7 +139,8 @@ struct option long_options[] =
+ { "delay", required_argument, NULL, 'd' },
+ { "once-only", no_argument, NULL, 'o' },
+ { "help", no_argument, NULL, 'h' },
+- { "version", no_argument, NULL, 'V' }
++ { "version", no_argument, NULL, 'V' },
++ { NULL, 0, NULL, 0 }
+ };
+ #endif
+
+diff -urp cronolog-1.6.2/src/cronotest.c cronolog-1.6.2/src/cronotest.c
+--- cronolog-1.6.2/src/cronotest.c 2001-05-03 09:26:44.000000000 -0700
++++ cronolog-1.6.2/src/cronotest.c 2008-01-06 00:02:24.000000000 -0800
+@@ -112,7 +112,8 @@ struct option long_options[] =
+ { "test-subdirs", required_argument, NULL, 'D' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
+- { "verbose", no_argument, NULL, 'v' }
++ { "verbose", no_argument, NULL, 'v' },
++ { NULL, 0, NULL, 0 }
+ };
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
new file mode 100644
index 000000000000..25e488f061c0
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-large-file.patch
@@ -0,0 +1,27 @@
+--- a/src/cronolog.c 2003-10-13 12:35:17.000000000 +0000
++++ b/src/cronolog.c 2003-10-13 12:36:36.000000000 +0000
+@@ -82,6 +82,8 @@
+ * written to "file" (e.g. /dev/console) or to stderr if "file" is "-".
+ */
+
++#define _GNU_SOURCE 1
++
+ #include "cronoutils.h"
+ #include "getopt.h"
+
+@@ -394,13 +396,13 @@
+ timestamp(*pnext_period), *pnext_period,
+ *pnext_period - time_now));
+
+- log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND, FILE_MODE);
++ log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+
+ #ifndef DONT_CREATE_SUBDIRS
+ if ((log_fd < 0) && (errno == ENOENT))
+ {
+ create_subdirs(pfilename);
+- log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND, FILE_MODE);
++ log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+ }
+ #endif
+
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
new file mode 100644
index 000000000000..974c69faa74a
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink.patch
@@ -0,0 +1,11 @@
+--- a/src/cronoutils.c 2003-10-13 12:44:59.000000000 +0000
++++ b/src/cronoutils.c 2003-10-13 12:45:08.000000000 +0000
+@@ -199,7 +199,7 @@
+ {
+ unlink(prevlinkname);
+ }
+- if (stat(linkname, &stat_buf) == 0)
++ if (lstat(linkname, &stat_buf) == 0)
+ {
+ if (prevlinkname) {
+ rename(linkname, prevlinkname);
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
new file mode 100644
index 000000000000..8fe4c0f12396
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-setugid.patch
@@ -0,0 +1,390 @@
+diff -Naur cronolog-1.6.2/configure cronolog-1.6.2-new/configure
+--- a/configure Thu May 3 17:44:22 2001
++++ b/configure Mon Jun 3 00:38:32 2002
+@@ -1757,15 +1757,49 @@
+
+ fi
+
++echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
++echo "configure:1762: checking for uid_t in sys/types.h" >&5
++if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ cat > conftest.$ac_ext <<EOF
++#line 1767 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++EOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ egrep "uid_t" >/dev/null 2>&1; then
++ rm -rf conftest*
++ ac_cv_type_uid_t=yes
++else
++ rm -rf conftest*
++ ac_cv_type_uid_t=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_type_uid_t" 1>&6
++if test $ac_cv_type_uid_t = no; then
++ cat >> confdefs.h <<\EOF
++#define uid_t int
++EOF
++
++ cat >> confdefs.h <<\EOF
++#define gid_t int
++EOF
++
++fi
++
+
+
+ echo $ac_n "checking for strftime""... $ac_c" 1>&6
+-echo "configure:1764: checking for strftime" >&5
++echo "configure:1798: checking for strftime" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1769 "configure"
++#line 1803 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char strftime(); below. */
+@@ -1788,7 +1822,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_strftime=yes"
+ else
+@@ -1810,7 +1844,7 @@
+ echo "$ac_t""no" 1>&6
+ # strftime is in -lintl on SCO UNIX.
+ echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
+-echo "configure:1814: checking for strftime in -lintl" >&5
++echo "configure:1848: checking for strftime in -lintl" >&5
+ ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1818,7 +1852,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lintl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1822 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -1829,7 +1863,7 @@
+ strftime()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1856,12 +1890,12 @@
+ fi
+
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:1860: checking for vprintf" >&5
++echo "configure:1894: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1865 "configure"
++#line 1899 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vprintf(); below. */
+@@ -1884,7 +1918,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+@@ -1908,12 +1942,12 @@
+
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:1912: checking for _doprnt" >&5
++echo "configure:1946: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1917 "configure"
++#line 1951 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _doprnt(); below. */
+@@ -1936,7 +1970,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+@@ -1963,12 +1997,12 @@
+ for ac_func in mkdir mktime putenv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1967: checking for $ac_func" >&5
++echo "configure:2001: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1972 "configure"
++#line 2006 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -1991,7 +2025,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2018,12 +2052,12 @@
+ for ac_func in strptime localtime_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2022: checking for $ac_func" >&5
++echo "configure:2056: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2027 "configure"
++#line 2061 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -2046,7 +2080,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+diff -Naur cronolog-1.6.2/configure.in cronolog-1.6.2-new/configure.in
+--- cronolog-1.6.2/configure.in Thu May 3 17:30:50 2001
++++ cronolog-1.6.2-new/configure.in Mon Jun 3 00:38:32 2002
+@@ -56,6 +56,7 @@
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+ AC_STRUCT_TM
++AC_TYPE_UID_T
+
+ dnl Checks for library functions.
+
+diff -Naur cronolog-1.6.2/doc/cronolog.1m cronolog-1.6.2-new/doc/cronolog.1m
+--- cronolog-1.6.2/doc/cronolog.1m Fri May 4 09:44:55 2001
++++ cronolog-1.6.2-new/doc/cronolog.1m Mon Jun 3 00:39:10 2002
+@@ -89,6 +89,20 @@
+ .IP --help
+ print a help message and then exit.
+ .\"
++.IP "-u \fIUSER\fP"
++.IP "--set-uid=\fIUSER\fP"
++sets the user ID of the cronolog process before any logs are opened.
++\fIUSER\fP can be a username or a numeric user ID. If \fIUSER\fP
++contains solely digits, it will be assumed to be a numeric user ID;
++otherwise, it will be assumed to be a username.
++.\"
++.IP "-g \fIGROUP\fP"
++.IP "--set-gid=\fIGROUP\fP"
++sets the group ID of the cronolog process before any logs are opened.
++\fIGROUP\fP can be a group name or a numeric group ID. If \fIGROUP\fP
++contains solely digits, it will be assumed to be a numeric group ID;
++otherwise, it will be assumed to be a group name.
++.\"
+ .IP "-p \fIPERIOD\fP"
+ .IP "--period=\fIPERIOD\fP"
+ specifies the period explicitly as an optional digit string followed
+diff -Naur cronolog-1.6.2/src/cronolog.c cronolog-1.6.2-new/src/cronolog.c
+--- cronolog-1.6.2/src/cronolog.c Thu May 3 17:42:48 2001
++++ cronolog-1.6.2-new/src/cronolog.c Mon Jun 3 00:38:32 2002
+@@ -100,6 +100,12 @@
+ #define VERSION_MSG "cronolog version 0.1\n"
+ #endif
+
++#ifndef _WIN32
++#define SETUGID_USAGE " -u USER, --set-uid=USER change to USER before doing anything (name or UID)\n" \
++ " -g GROUP, --set-gid=GROUP change to GROUP before doing anything (name or GID)\n"
++#else
++#define SETUGID_USAGE ""
++#endif
+
+ #define USAGE_MSG "usage: %s [OPTIONS] logfile-spec\n" \
+ "\n" \
+@@ -117,12 +123,17 @@
+ " -e, --european European date formats (default)\n" \
+ " -s, --start-time=TIME starting time\n" \
+ " -z TZ, --time-zone=TZ use TZ for timezone\n" \
++ SETUGID_USAGE \
+ " -V, --version print version number, then exit\n"
+
+
+ /* Definition of the short and long program options */
+
++#ifndef _WIN32
++char *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:";
++#else
+ char *short_options = "ad:eop:s:z:H:P:S:l:hVx:";
++#endif
+
+ #ifndef _WIN32
+ struct option long_options[] =
+@@ -137,6 +148,8 @@
+ { "link", required_argument, NULL, 'l' },
+ { "period", required_argument, NULL, 'p' },
+ { "delay", required_argument, NULL, 'd' },
++ { "set-uid", required_argument, NULL, 'u' },
++ { "set-gid", required_argument, NULL, 'g' },
+ { "once-only", no_argument, NULL, 'o' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' }
+@@ -160,6 +173,12 @@
+ char *template;
+ char *linkname = NULL;
+ char *prevlinkname = NULL;
++#ifndef _WIN32
++ uid_t new_uid = 0;
++ gid_t new_gid = 0;
++ int change_uid = 0;
++ int change_gid = 0;
++#endif
+ mode_t linktype = 0;
+ int n_bytes_read;
+ int ch;
+@@ -234,6 +253,16 @@
+ }
+ break;
+
++#ifndef _WIN32
++ case 'u':
++ new_uid = parse_uid(optarg, argv[0]);
++ change_uid = 1;
++ break;
++ case 'g':
++ new_gid = parse_gid(optarg, argv[0]);
++ change_gid = 1;
++ break;
++#endif
+ case 'o':
+ periodicity = ONCE_ONLY;
+ break;
+@@ -265,6 +294,17 @@
+ fprintf(stderr, USAGE_MSG, argv[0]);
+ exit(1);
+ }
++
++#ifndef _WIN32
++ if (change_gid && setgid(new_gid) == -1) {
++ fprintf(stderr, "setgid: unable to change to gid: %d\n", new_gid);
++ exit(1);
++ }
++ if (change_uid && setuid(new_uid) == -1) {
++ fprintf(stderr, "setuid: unable to change to uid: %d\n", new_uid);
++ exit(1);
++ }
++#endif
+
+ DEBUG((VERSION_MSG "\n"));
+
+diff -Naur cronolog-1.6.2/src/cronoutils.c cronolog-1.6.2-new/src/cronoutils.c
+--- cronolog-1.6.2/src/cronoutils.c Thu May 3 17:43:21 2001
++++ cronolog-1.6.2-new/src/cronoutils.c Mon Jun 3 00:38:32 2002
+@@ -710,4 +710,50 @@
+ return retval;
+ }
+
+-
++
++#ifndef _WIN32
++/* Turn a string specifying either a username or UID into an actual
++ * uid_t for use in setuid(). A string is assumed to be a UID if
++ * it contains only decimal digits. */
++uid_t
++parse_uid(char *user, char *argv0)
++{
++ char *probe = user;
++ struct passwd *ent;
++
++ while (*probe && isdigit(*probe)) {
++ probe++;
++ }
++ if (!(*probe)) {
++ return atoi(user);
++ }
++ if (!(ent = getpwnam(user))) {
++ fprintf(stderr, "%s: Bad username %s\n", argv0, user);
++ exit(1);
++ }
++ return (ent->pw_uid);
++}
++
++
++/* Turn a string specifying either a group name or GID into an actual
++ * gid_t for use in setgid(). A string is assumed to be a GID if
++ * it contains only decimal digits. */
++gid_t
++parse_gid(char *group, char *argv0)
++{
++ char *probe = group;
++ struct group *ent;
++
++ while (*probe && isdigit(*probe)) {
++ probe++;
++ }
++ if (!(*probe)) {
++ return atoi(group);
++ }
++ if (!(ent = getgrnam(group))) {
++ fprintf(stderr, "%s: Bad group name %s\n", argv0, group);
++ exit(1);
++ }
++ return (ent->gr_gid);
++}
++#endif /* _WIN32 */
+diff -Naur cronolog-1.6.2/src/cronoutils.h cronolog-1.6.2-new/src/cronoutils.h
+--- cronolog-1.6.2/src/cronoutils.h Thu May 3 17:40:12 2001
++++ cronolog-1.6.2-new/src/cronoutils.h Mon Jun 3 00:38:32 2002
+@@ -84,6 +84,8 @@
+ #include <limits.h>
+ #ifndef _WIN32
+ #include <unistd.h>
++#include <pwd.h>
++#include <grp.h>
+ #else
+ #include <io.h>
+ #include <direct.h>
+@@ -172,7 +174,8 @@
+ void print_debug_msg(char *msg, ...);
+ time_t parse_time(char *time_str, int);
+ char *timestamp(time_t thetime);
+-
++uid_t parse_uid(char *user, char *argv0);
++gid_t parse_gid(char *group, char *argv0);
+
+ /* Global variables */
+
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
new file mode 100644
index 000000000000..e7cc8be2c425
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1.patch
@@ -0,0 +1,46 @@
+*** a/src/cronolog.c.orig 2001-05-03 17:42:48.000000000 +0100
+--- b/src/cronolog.c 2003-08-15 14:03:17.000000000 +0100
+***************
+*** 84,95 ****
+--- 84,97 ----
+
+ #include "cronoutils.h"
+ #include "getopt.h"
++ #include <signal.h>
+
+
+ /* Forward function declaration */
+
+ int new_log_file(const char *, const char *, mode_t, const char *,
+ PERIODICITY, int, int, char *, size_t, time_t, time_t *);
++ void terminate_self(int);
+
+
+ /* Definition of version and usage messages */
+***************
+*** 306,311 ****
+--- 308,317 ----
+ DEBUG(("Rotation period is per %d %s\n", period_multiple, periods[periodicity]));
+
+
++ /* set up signal handlers to catch USR1 and HUP when restarting Apache */
++ signal(SIGUSR1, terminate_self);
++ signal(SIGHUP, terminate_self);
++
+ /* Loop, waiting for data on standard input */
+
+ for (;;)
+***************
+*** 416,418 ****
+--- 422,432 ----
+ }
+ return log_fd;
+ }
++
++ void terminate_self(int sig)
++ {
++ time_t time_now = time(NULL);
++ DEBUG(("%s (%d): received signal USR1; terminating.\n",
++ timestamp(time_now), time_now));
++ exit(6);
++ }
diff --git a/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch
new file mode 100644
index 000000000000..12d561776f8c
--- /dev/null
+++ b/app-admin/cronolog/files/1.6.2-patches/cronolog-strftime.patch
@@ -0,0 +1,26 @@
+--- a/src/cronoutils.c Mon Dec 20 00:34:44 1999
++++ b/src/cronoutils.c Mon Feb 11 03:19:32 2002
+@@ -204,9 +204,21 @@
+ {
+ if (ch == '%')
+ {
+- ch = *spec++;
+- if (!ch) break;
++ do {
++ ch = *spec++;
++ if (!ch) break;
+
++ switch(ch) {
++ case '_':
++ case '-':
++ case '0':
++ continue;
++ }
++ break;
++ } while(1);
++
++ if(!ch) break;
++
+ switch (ch)
+ {
+ case 'y': /* two digit year */
diff --git a/app-admin/cronolog/files/cronolog-1.6.2-umask.patch b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
new file mode 100644
index 000000000000..446c1460bee1
--- /dev/null
+++ b/app-admin/cronolog/files/cronolog-1.6.2-umask.patch
@@ -0,0 +1,86 @@
+Add umask support to cronolog.
+
+Patch-by: Mike Doty <kingtaco@gentoo.org>
+Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
+
+--- a/src/cronolog.c.orig 2010-01-22 16:49:41.000000000 -0800
++++ b/src/cronolog.c 2010-01-22 17:31:50.000000000 -0800
+@@ -106,7 +106,8 @@
+
+ #ifndef _WIN32
+ #define SETUGID_USAGE " -u USER, --set-uid=USER change to USER before doing anything (name or UID)\n" \
+- " -g GROUP, --set-gid=GROUP change to GROUP before doing anything (name or GID)\n"
++ " -g GROUP, --set-gid=GROUP change to GROUP before doing anything (name or GID)\n" \
++ " -U OCTAL, --umask=OCTAL sets umask of file/directory creation\n"
+ #else
+ #define SETUGID_USAGE ""
+ #endif
+@@ -134,7 +135,7 @@
+ /* Definition of the short and long program options */
+
+ #ifndef _WIN32
+-char *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:";
++char *short_options = "ad:eop:s:z:H:P:S:l:hVx:u:g:U:";
+ #else
+ char *short_options = "ad:eop:s:z:H:P:S:l:hVx:";
+ #endif
+@@ -157,10 +158,16 @@
+ { "once-only", no_argument, NULL, 'o' },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
++ { "umask", required_argument, NULL, 'U' },
+ { NULL, 0, NULL, 0 }
+ };
+ #endif
+
++#ifndef _WIN32
++static mode_t saved_umask = 0;
++static mode_t new_umask = 0;
++#endif
++
+ /* Main function.
+ */
+ int
+@@ -193,6 +200,11 @@
+ int log_fd = -1;
+
+ #ifndef _WIN32
++ new_umask=umask(0);
++ umask(new_umask);
++#endif
++
++#ifndef _WIN32
+ while ((ch = getopt_long(argc, argv, short_options, long_options, NULL)) != EOF)
+ #else
+ while ((ch = getopt(argc, argv, short_options)) != EOF)
+@@ -267,6 +279,9 @@
+ new_gid = parse_gid(optarg, argv[0]);
+ change_gid = 1;
+ break;
++ case 'U':
++ new_umask = (mode_t)strtol(optarg, NULL, 8);
++ break;
+ #endif
+ case 'o':
+ periodicity = ONCE_ONLY;
+@@ -443,6 +458,9 @@
+ timestamp(*pnext_period), *pnext_period,
+ *pnext_period - time_now));
+
++#ifndef _WIN32
++ saved_umask=umask(new_umask);
++#endif
+ log_fd = open(pfilename, O_WRONLY|O_CREAT|O_APPEND|O_LARGEFILE, FILE_MODE);
+
+ #ifndef DONT_CREATE_SUBDIRS
+@@ -459,6 +477,10 @@
+ exit(2);
+ }
+
++#ifndef _WIN32
++ umask(saved_umask);
++#endif
++
+ if (linkname)
+ {
+ create_link(pfilename, linkname, linktype, prevlinkname);
diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
new file mode 100644
index 000000000000..0e5ed8f4355e
--- /dev/null
+++ b/app-admin/cronolog/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">
+ Cronolog is a simple filter program that reads log file entries from
+ standard input and writes each entry to the output file specified by a
+ filename template and the current date and time. When the expanded
+ filename changes, the current file is closed and a new one opened.
+ cronolog is intended to be used in conjunction with a Web server, such
+ as Apache, to split the access log into daily or monthly logs.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">fordmason/cronolog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
new file mode 100644
index 000000000000..571b347b31f5
--- /dev/null
+++ b/app-admin/denyhosts/Manifest
@@ -0,0 +1,13 @@
+AUX denyhosts-2.6-hostname.patch 664 SHA256 6c7c4567dbfc1c04e76f458ad3fe0247a058a917e4f5808477bf0de306917330 SHA512 0fc512f4a1691a90aba7d95b4757a363f3ff6bb893fdc719277c5dbec1904828be923f5ab21c5ba20e03a5e6bf61a5f7d35c6675b9ccfafd32dbd9e108dd5095 WHIRLPOOL 85d8d3fb33fe629c3c8660f1ef0227b07847cad3c2769484547671108d23acbb2f879dae456f8bdbeb47ce810b0436a98e9ee578dfea90fd546a04cd4b02eb39
+AUX denyhosts-3.0-python2.7.patch 1502 SHA256 8abf4100efc9500ad1ba22a0a342dd183391fa09c159a483cdb36a115c686d5c SHA512 ee3c4f7f6a8126e4a9c30531cce2673f8c0eb4c4d2a011aa22a3aa4f0b9ee58f8278334cf9253619d999b8dadf4370d6c02f2535a0b6d794243e3050f3927e8f WHIRLPOOL 681ecb3559d7f83659b6b498b5ea1eeaf791c4945598d1af5582f2238199b79ac7fe31426e49a60570586ca0542fb861fc4e5e60304b450b1fe2384ab034028a
+AUX denyhosts.init-r2 646 SHA256 b08fd688b3e7cd1ca9f6a0b59e74eef535881cacf010a81c81d93411af8cedf1 SHA512 ea20958c74ec34d4f8e2f165cda9d0c3e27d94fe7eef374548d74275d35dc7fc7c89395e36b0a00dfc7d2a83b198f179fd44e16f7dc51419f9af1e907616382c WHIRLPOOL 75295855ad1ef9b85c2e046c5c1a9ca0697efc3d7a7b898c1645ab25d83ee1d2497e91b1eca93f27a38eddfcc407aaec0a2a4af6cdb75aa269997cf5fac81c2a
+AUX denyhosts.logrotate-r2 272 SHA256 b2d048354fb00d317e554a93a370ec7e3f276061a350a452b8a3f8c903973772 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569 WHIRLPOOL 041811f4bc12dabeae155d0330a0b02df12887d3fcd98b744c42afb7f8ac274715a68472348d2166eb454fbf9787fb271759430a970b1ce82a3ca42a0500cf43
+AUX denyhosts.service 265 SHA256 706911153d24785d577d376c772a3c4b7682dfd968d2fdc737872c27e5e574f8 SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be WHIRLPOOL cb62ab529918d801567e5f3b7f6eb3d52709d54bd89747d0b1739bc01a87cbbdd066aa56ff8db3ca7e857d217f2672cc2a267d6ee78e314d821287fea3633806
+DIST denyhosts-2.9.tar.gz 49472 SHA256 751ce6f11c91d1f29c2e726e829c8fe5ddc417bfbb2f229829f5ec820c236716 SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1 WHIRLPOOL 6930899d84a50200c869298cf1061d51a0cebab27edea58252a66c97c81792b13898a726a6bbcba35510cc6041b66d175557d2ddfb5c21c2ae5b62bd4e43fe5d
+DIST denyhosts-3.0.tar.gz 56283 SHA256 581cd3b782d7b702f41873ae52d39472d27c90ebd1b2178802cdd623e8e94240 SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d WHIRLPOOL 6b8db8e88a5f1693d4a72ea54009b5d185b035040c9407585f829b0f8f918bcbfa38623b0ecb08157256da045427b8b5111f7dc8f520505c56aefdaf1a02a154
+EBUILD denyhosts-2.9.ebuild 1860 SHA256 555a8c778cdd31823dd1eaa7a85d89b4584dc76b9443d90277609b38508f782d SHA512 170d31711fc00f51e6b177cfebcdbeff660a9d2b6cc3eb953d4082e7d3d265cf371da59890ee92b29fea8a2aa740cb25373c0ad6585e9e31db515fd87f512ff4 WHIRLPOOL db72c9797a895b2af227eb48ad0199b07b38fe46280274b8b514c058ab33360d71cb0b2bb128886b20dd89cd0584173c238e9413ccc9adffe49817a6593b81cb
+EBUILD denyhosts-3.0-r1.ebuild 1784 SHA256 e0755eebde90c4959d50658eb1abadb6b23bbdb9d2e3e0c366b7102993d0cafa SHA512 cbc35021efb6cd6c4e67ca62cf66576246c2ee2c68114874dd08bcdfed9c4d0ccdc81f343633cee68064b1a575e0bb2fedd3a966e59bad17e8d9a49e331518af WHIRLPOOL feb9ffdb0fec75c28d83f299898a0d274133f527341261e255d11430fd91e32ab70bf0229be05b4ac4ad9e96b606b981bf3745b34cba8c907b73f246f2e8727d
+EBUILD denyhosts-3.0.ebuild 1672 SHA256 dd38eb557a2f15b216dfe6d95bb686cf310d23660a813c5bf8a1ddc7f1ad543e SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0 WHIRLPOOL 75edeac928fd0d62f1944daeca25137c269e31189d0c1c906d141bca61607655ecad6b50a8fcce25a91a664c8916bc257fb22ec20fa7cd5f68aa88435561a8d1
+MISC ChangeLog 6266 SHA256 bf248a0c66cbeae0908285f4a6199ca58d99961d46dd395d33d54c79779d3132 SHA512 720287e9d86cf5dfc8e1df582fadbc055e6824a0f12ba607b687bbe038ea77a2c9ce85c7868e4aa6011816900621c462268a291ba98c03752cb4d5c3cb6d1730 WHIRLPOOL 86d6af76360996b3948c07923f86406d18df19fcfc0e19ff473665433f7209975e8e883affd33749c36e5f985c75a00d0defa84ed2a957814ff19896b0b35f7d
+MISC ChangeLog-2015 13169 SHA256 c9990d712a316b57562e93cabf22701a037bb398583f9b3f6ae36a75d283482f SHA512 bfdf25113583ddd664c00709cb44fb97b6c93785f42159c5d68c7f03c7047ef56cd1a3b4e11f826a9f149371a17d24953e0a45f6fb7a06a66742e8424cfed727 WHIRLPOOL 03daaee6b287aed72e633476223827fc5d699e6a610f97114fc18a29686af1ffb1a5a3c4906951d5801d3096529c1ea1500648c039bed829902e5f0ba0adacf2
+MISC metadata.xml 402 SHA256 1ec6ce139f385327b0e664b043441c0bf2a46cb699d75d4aae7daf89ca61b61e SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7 WHIRLPOOL 9be58b7660475eceb2e07bdcc23ceefbd5b407eebc9efef6bb51339b774670c5ab68ce8d5776eec9301068de1fcce064f4184fce812a3c6ff1b7fd16d8b48d27
diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
new file mode 100644
index 000000000000..f9a579759fe2
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@@ -0,0 +1,72 @@
+# 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 eutils readme.gentoo systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="http://denyhost.sourceforge.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10 * * * * root /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+src_prepare() {
+ #systemd needs HOSTNAME
+ epatch "${FILESDIR}"/${PN}-2.6-hostname.patch
+
+ sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+ -e '/^SECURE_LOG/s/^/#/' \
+ -e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+ -i denyhosts.conf || die "sed failed"
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ dodoc CHANGELOG.txt README.txt PKG-INFO
+ distutils-r1_src_install
+
+ dodir /etc/logrotate.d
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+ newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ keepdir /var/lib/denyhosts
+}
+
+pkg_postinst() {
+ [[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny"
+
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
new file mode 100644
index 000000000000..09d0b4642714
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 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 eutils readme.gentoo-r1 systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="https://github.com/denyhosts/denyhosts"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10 * * * * root /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+#bring back python-2.7 support bug #577502
+PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
+
+src_prepare() {
+ sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+ -e '/^SECURE_LOG/s/^/#/' \
+ -e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+ -i denyhosts.conf || die "sed failed"
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ dodoc CHANGELOG.txt README.md
+ distutils-r1_src_install
+
+ dodir /etc/logrotate.d
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+ newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ keepdir /var/lib/denyhosts
+}
diff --git a/app-admin/denyhosts/denyhosts-3.0.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild
new file mode 100644
index 000000000000..cd2c9fdeea38
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-3.0.ebuild
@@ -0,0 +1,63 @@
+# 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 eutils readme.gentoo systemd
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="https://github.com/denyhosts/denyhosts"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+>=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
+(see bug#531156) that means you either have patch openssh or use
+denyhosts' iptables feature to get any protection.
+
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10 * * * * root /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at ${HOMEPAGE}faq.html"
+
+src_prepare() {
+ sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
+ -e '/^SECURE_LOG/s/^/#/' \
+ -e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
+ -i denyhosts.conf || die "sed failed"
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ dodoc CHANGELOG.txt README.md
+ distutils-r1_src_install
+
+ dodir /etc/logrotate.d
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+ newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ keepdir /var/lib/denyhosts
+}
diff --git a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
new file mode 100644
index 000000000000..56d881319c5f
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
@@ -0,0 +1,21 @@
+diff -up ./denyhosts.py.orig ./denyhosts.py
+--- ./denyhosts.py.orig 2012-01-30 13:14:41.146715839 -0600
++++ ./denyhosts.py 2012-01-30 14:45:14.372539341 -0600
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env python
+ import os
++import platform
+ import sys
+
+ import DenyHosts.python_version
+@@ -107,6 +108,10 @@ if __name__ == '__main__':
+ print "DenyHosts version:", VERSION
+ sys.exit(0)
+
++ # This is generally expected to be in the environment, but there's no
++ # non-hackish way to get systemd to set it, so just hack it in here.
++ os.environ['HOSTNAME'] = platform.node()
++
+ prefs = Prefs(config_file)
+
+ first_time = 0
diff --git a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
new file mode 100644
index 000000000000..4b727c7067d9
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
@@ -0,0 +1,51 @@
+From b5611dfa0510ec8fbaa2db4b6834d0bd7ecf0909 Mon Sep 17 00:00:00 2001
+From: Jesse <jessefrgsmith@yahoo.ca>
+Date: Sat, 27 Jun 2015 20:24:44 -0300
+Subject: [PATCH] Fixed a type check which was causing syntax/undefined errors
+ in DenyHosts/report.py when switching between Python2 and Python3.
+
+---
+ CHANGELOG.txt | 8 ++++++++
+ DenyHosts/report.py | 4 +++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.txt b/CHANGELOG.txt
+index ca173cb..b585332 100644
+--- a/CHANGELOG.txt
++++ b/CHANGELOG.txt
+@@ -1,5 +1,13 @@
+ DENYHOSTS CHANGELOG
+
++3.1
++======================
++
++Fixed a type check in DenyHosts/report.py which was causing
++problems when moving between Python2 and Python3.
++
++
++
+ 3.0
+ ======================
+
+diff --git a/DenyHosts/report.py b/DenyHosts/report.py
+index 05f3e3d..9560eab 100644
+--- a/DenyHosts/report.py
++++ b/DenyHosts/report.py
+@@ -3,6 +3,7 @@
+ import socket
+ # Removing this as it causes runtime errors on Python3.4
+ # from types import ListType, TupleType
++import types
+ from .util import is_true
+ try:
+ import syslog
+@@ -38,7 +39,8 @@ def get_report(self):
+ def add_section(self, message, iterable):
+ self.report += "%s:\n\n" % message
+ for i in iterable:
+- if type(i) in (TupleType, ListType):
++ # if type(i) in (TupleType, ListType):
++ if (type(i) is types.ListType) or (type(i) is types.TupleType):
+ extra = ": %d\n" % i[1]
+ i = i[0]
+ else:
diff --git a/app-admin/denyhosts/files/denyhosts.init-r2 b/app-admin/denyhosts/files/denyhosts.init-r2
new file mode 100644
index 000000000000..9b2f24cbf21e
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.init-r2
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_stopped_commands="purge"
+
+purge() {
+ ebegin "Purging hosts.deny"
+ start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --purge
+ eend $?
+}
+
+depend() {
+ use logger sshd
+}
+
+start() {
+ ebegin "Starting DenyHosts daemon"
+ start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --daemon -c /etc/denyhosts.conf
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping DenyHosts daemon"
+ start-stop-daemon --quiet --stop --pidfile /var/run/denyhosts.pid
+ eend $?
+}
diff --git a/app-admin/denyhosts/files/denyhosts.logrotate-r2 b/app-admin/denyhosts/files/denyhosts.logrotate-r2
new file mode 100644
index 000000000000..582e72f7a365
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.logrotate-r2
@@ -0,0 +1,10 @@
+/var/log/denyhosts {
+ missingok
+ notifempty
+ create 0640 root root
+ sharedscripts
+ postrotate
+ test -e /run/openrc/softlevel && /etc/init.d/denyhosts restart 1>/dev/null || true
+ test -e /run/systemd/system && systemctl restart denyhosts >/dev/null || true
+ endscript
+}
diff --git a/app-admin/denyhosts/files/denyhosts.service b/app-admin/denyhosts/files/denyhosts.service
new file mode 100644
index 000000000000..05a59dd27bfc
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=SSH log watcher
+Before=sshd.service
+
+[Service]
+Type=forking
+ExecStartPre=/bin/rm -f /var/run/denyhosts.pid
+ExecStart=/usr/bin/denyhosts.py --daemon --config=/etc/denyhosts.conf
+PIDFile=/var/run/denyhosts.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
new file mode 100644
index 000000000000..c193ef3b8e0a
--- /dev/null
+++ b/app-admin/denyhosts/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>junghans@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">denyhosts/denyhosts</remote-id>
+ <remote-id type="sourceforge">denyhost</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
new file mode 100644
index 000000000000..084e7ac04467
--- /dev/null
+++ b/app-admin/diamond/Manifest
@@ -0,0 +1,11 @@
+AUX diamond-4.0-psutil.patch 1842 SHA256 8654e35bfffdc84dbde798bf283ffd6fffc626fd8b12ae98848dae08d7bdf241 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea WHIRLPOOL 2fbee860112dc44a77999bfc1df24d5464b4c515461d3879271aaf25453bfaa070b8d32c1b8a6dac1c089f55cf17d495711e4c31f65debc613d0b642fe0e00f8
+AUX diamond.confd 57 SHA256 41941d406f48b5eca55d9146928eee185820fe27a3708d3fcaa71c3f78bf4adc SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55 WHIRLPOOL 80165d5cf5347dd3abeeec53f4df64d51f7f78445363574b2bc1b8f2fec9f1a0798c4986319dabe6d6a4b6b499c577fc8679b2fc65554107e48e3e13dac4e68b
+AUX diamond.initd 447 SHA256 3f429f97ffef0a72c30be17b6dcc4dacfc1f92a905dce4b8e5ddf7f6c77c3b29 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3 WHIRLPOOL 843fc4b73a8999a1ea20368791af0d3dbd51fc773f1d760a62a52551de5a3f7783a3ca00a850016316c588826b6e5741e2e55d7cd7dcb18b6e9f5057648bbb46
+DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e
+DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
+EBUILD diamond-4.0-r1.ebuild 2007 SHA256 c3a0524fe2685d32444da72f7fd92ae2d0dbe23a97ba1d6b88dd73e708a40eef SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a WHIRLPOOL 26075b82b3c56853a42db8b66a0fb8953451f8898e71e18b400d23365247e6e9ae61654cc21401f6f93573706c4115c8a5e5b69b7daecb298cefe1a1c71d89b7
+EBUILD diamond-4.0.515.ebuild 1891 SHA256 678f904d75b67c1259905cb22231b3ef0a1b38509771a94457b74490ee0c7f43 SHA512 344ad91933e15d9d93fd7bd796650f98dc7bfd1a57a38053346251f852b7b6e9fdb56bcd386cf7310c87a56c847724b6dd91a13116fa9010f80f4662008230e2 WHIRLPOOL 5c485b5b623f6f04fdfb2d117306a7c8096c4b73f21f6f349fd200abcec63ccb199691843951e130fe19c062ee94763a398e75a662449dbdcfd43744921e1e0d
+EBUILD diamond-9999.ebuild 1663 SHA256 3c9121848e3c14f571b3c9dfa5fa004fbc7aa0d823bc18895a8a3f9affb8cf36 SHA512 d2b16d9339b1c724eda84377fe78d8abfb1c31f37f5363ae6718662ae4d1d02d7af0edc52247802da8dd449928ad17ef34028933e0d8fa52f7d0310eef3a1c2f WHIRLPOOL bcc965307301fb343b4dc4fac18b4867d54a28077ea06e36a6e3d04177fb2405ffb376c4b37fa69189546342f0f63902eebed296d07aec7d6fa0c58fe1ed257d
+MISC ChangeLog 2721 SHA256 9dd553d60e647e0537f925c20c607df3fe113fa2dd6bf587a87491451d13b0f9 SHA512 0c0a81087e1c021cdff56c4fc7301901d7985290ee1a51777e2d1a2b037116e3b54f8aaf78992a7911fbdec4caa0adae8faa78d1a56aaf71671400d45797ed95 WHIRLPOOL 43e069d320df9c7ae628aebd4f36a83d7de00aa3b3b8d258fd31097d974ae317a5b363824b5cf5171e7989b0a9e9fc0e1dff081d5fe10d39f5b8e555e0fac423
+MISC ChangeLog-2015 1669 SHA256 c3c0f1c7e902586b2beb10dc5cc61c430b08249babe64a8737d198f48b24ad98 SHA512 fcbf84aeb38c15657663bebf3f5a07175d477e54a450fee3316bb6fecb8bbb1faa421c81aa2831d43a5751a9463fce7a4530501ccb1da755f8eaa639bd3f6386 WHIRLPOOL ebbb5b4294a45c170862c70a98e043f47b14a2d464ef0740396005387528aeb463e68904c34454fd76b761c1dc033c5fd3f2a51c2c11388fbd61ff122199c4d6
+MISC metadata.xml 819 SHA256 27842866d9a6cea1f7c25ab9b498ae6c7db741fb22536e88773560cb530eec4a SHA512 9b6bdef19e94d5edd29301e79fd64f838f796baff373ae4a988e4428484561fc38a7d85c2dd7475b751655c8c6c974682d79e97f1ce1260222eb5a550db09b6f WHIRLPOOL 4a53cb31a20359ba60b1883c684f8966a9f868c3a00c6d803e6a40952b9ad014d10ad0efbe4d44a33ceeb2e761acc74b46abc1820f29d3870eca5bc82d07e6fb
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
new file mode 100644
index 000000000000..90c4c2549e94
--- /dev/null
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+ S=${WORKDIR}/diamond-${PV}
+else
+ SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+ KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+ dev-python/setproctitle
+ mongo? ( dev-python/pymongo )
+ mysql? ( dev-python/mysql-python )
+ snmp? ( dev-python/pysnmp )
+ redis? ( dev-python/redis-py )
+ !kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock )"
+
+src_prepare() {
+ # adjust for Prefix
+ hprefixify bin/diamond*
+
+ # fix necessary to make handlers honour their config, simple sed
+ # doing the same as upstream
+ # https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch
+ sed -i \
+ -e '/cls_name =/s/\.__class__//' \
+ src/diamond/utils/classes.py \
+ || die
+
+ epatch "${FILESDIR}"/${P}-psutil.patch
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+ export VIRTUAL_ENV=1
+ distutils-r1_python_install
+ mv "${ED}"/usr/etc "${ED}"/ || die
+ rm "${ED}"/etc/diamond/*.windows # won't need these
+ sed -i \
+ -e '/pid_file =/s:/var/run:/run:' \
+ "${ED}"/etc/diamond/diamond.conf.example || die
+ hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+ distutils-r1_src_install
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
new file mode 100644
index 000000000000..a10298e45b41
--- /dev/null
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+ S=${WORKDIR}/diamond-${PV}
+else
+ SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+ dev-python/setproctitle
+ mongo? ( dev-python/pymongo )
+ mysql? ( dev-python/mysql-python )
+ snmp? ( dev-python/pysnmp )
+ redis? ( dev-python/redis-py )
+ !kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock )"
+
+src_prepare() {
+ # adjust for Prefix
+ hprefixify bin/diamond*
+
+ # fix the version (not set in GitHub archive)
+ sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+ # fix symlink out of place
+ rm README.md || die
+ cp docs/index.md README.md || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+ export VIRTUAL_ENV=1
+ distutils-r1_python_install
+ mv "${ED}"/usr/etc "${ED}"/ || die
+ rm "${ED}"/etc/diamond/*.windows # won't need these
+ sed -i \
+ -e '/pid_file =/s:/var/run:/run:' \
+ "${ED}"/etc/diamond/diamond.conf.example || die
+ hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+ distutils-r1_src_install
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
new file mode 100644
index 000000000000..c37ee683c298
--- /dev/null
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+ S=${WORKDIR}/diamond-${PV}
+else
+ SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+ dev-python/setproctitle
+ mongo? ( dev-python/pymongo )
+ mysql? ( dev-python/mysql-python )
+ snmp? ( dev-python/pysnmp )
+ redis? ( dev-python/redis-py )
+ !kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock )"
+
+src_prepare() {
+ # adjust for Prefix
+ hprefixify bin/diamond*
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+ export VIRTUAL_ENV=1
+ distutils-r1_python_install
+ mv "${ED}"/usr/etc "${ED}"/ || die
+ rm "${ED}"/etc/diamond/*.windows # won't need these
+ sed -i \
+ -e '/pid_file =/s:/var/run:/run:' \
+ "${ED}"/etc/diamond/diamond.conf.example || die
+ hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+ distutils-r1_src_install
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ keepdir /var/log/diamond
+}
diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch
new file mode 100644
index 000000000000..e5f5d3bfb392
--- /dev/null
+++ b/app-admin/diamond/files/diamond-4.0-psutil.patch
@@ -0,0 +1,48 @@
+From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:40:59 +0200
+Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed
+
+---
+ src/collectors/network/network.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py
+index d835162..90c2f59 100644
+--- a/src/collectors/network/network.py
++++ b/src/collectors/network/network.py
+@@ -96,7 +96,7 @@ def collect(self):
+ self.log.error('No network metrics retrieved')
+ return None
+
+- network_stats = psutil.network_io_counters(True)
++ network_stats = psutil.net_io_counters(True)
+ for device in network_stats.keys():
+ network_stat = network_stats[device]
+ results[device] = {}
+
+From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:41:20 +0200
+Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and
+ virtmem_usage
+
+---
+ src/collectors/memory/memory.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py
+index 7c9b1fb..9057115 100644
+--- a/src/collectors/memory/memory.py
++++ b/src/collectors/memory/memory.py
+@@ -103,8 +103,8 @@ def collect(self):
+ self.log.error('No memory metrics retrieved')
+ return None
+
+- phymem_usage = psutil.phymem_usage()
+- virtmem_usage = psutil.virtmem_usage()
++ phymem_usage = psutil.virtual_memory()
++ virtmem_usage = psutil.swap_memory()
+ units = 'B'
+
+ for unit in self.config['byte_unit']:
diff --git a/app-admin/diamond/files/diamond.confd b/app-admin/diamond/files/diamond.confd
new file mode 100644
index 000000000000..ad9939223182
--- /dev/null
+++ b/app-admin/diamond/files/diamond.confd
@@ -0,0 +1,2 @@
+# command line options for running diamond
+DIAMOND_OPTS=
diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd
new file mode 100644
index 000000000000..168b175a788c
--- /dev/null
+++ b/app-admin/diamond/files/diamond.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --exec /usr/bin/diamond --pidfile /run/${SVCNAME}.pid -- -c /etc/diamond/${SVCNAME}.conf ${DIAMOND_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid
+ eend $?
+}
diff --git a/app-admin/diamond/metadata.xml b/app-admin/diamond/metadata.xml
new file mode 100644
index 000000000000..835af2947917
--- /dev/null
+++ b/app-admin/diamond/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>grobian@gentoo.org</email>
+ <name>Fabian Groffen</name>
+ </maintainer>
+ <longdescription lang="en">
+ Diamond is a python daemon that collects system metrics and
+ publishes them to Graphite (and others). It is capable of
+ collecting cpu, memory, network, i/o, load and disk metrics.
+ Additionally, it features an API for implementing custom
+ collectors for gathering metrics from almost any source.
+ </longdescription>
+ <use>
+ <flag name="mongo">Enable MongoDB support</flag>
+ <flag name="redis">Enable Redis support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">python-diamond/Diamond</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
new file mode 100644
index 000000000000..be86d79684ab
--- /dev/null
+++ b/app-admin/dio/Manifest
@@ -0,0 +1,5 @@
+DIST dio-1.5.2.tar.gz 44344 SHA256 c9241fe3cc8e51a1ada2a4c95d44a10dd306ef67f205bd9439bc2b95db31163b SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba WHIRLPOOL 777471d3ec30e97449ddb05cc743ded208e752806cdc3022be99c5d240e6b817cd4b014d377761fb2fa3e32e51a7b70f95bab23c29016996d29c4e21ce0a96c1
+EBUILD dio-1.5.2.ebuild 549 SHA256 5e5d4ee9d897763ebb2d407085c13a3277a5ae001aa9801f02dca0ae5b54d2b8 SHA512 4554efe518dc9a795a07751a85950bcc0b6edfa6cc35ce71cd0401ad84d63db832d9864a5f7144f9d28c320008ab06246b2dcaa7afbb37a29d213547e0399709 WHIRLPOOL 81f347d33a13968b62db56dacfb7fa5cb1bcf7e2bc300a2bc6c3f2b14af8f6d7a53f29e436d3394359c26b80596f705cca985b7098312eac3fcf32ea380d7bda
+MISC ChangeLog 2820 SHA256 1944933b9e28fdefc56f69e69e54de12bc2b6a417a062a3446c14ee11b6f55d5 SHA512 4facd723764997feaf1582ab5ef6f979570bbce5a4a31d376c19a3c927a6707acc076ddd6e88843f4f5f9d00a3fd20080df83e89410037a8123b8cab87126202 WHIRLPOOL ae8ebb92fed6fcf085349a439304d5b4ea02ef69d32e91d37dc7c79a449e37af9b4d3373325492d6c40688dc2fd7c517d686cb1ed02480dc02734239bb24f08d
+MISC ChangeLog-2015 453 SHA256 d2f9a05d4db7fedd53bf729240df569ca89aef9400aa57c997fc79630dce6753 SHA512 e199b323ad92c70946ab09c1341f7d506d206d6249f5da6a3ab073128518ac0b416ffdeb4ed0e321e1a484584371d36e7edb8c8fbded3e97fb849d6ee7639d6e WHIRLPOOL a2c4a249ef1e25e508f589da89938f68a0906765321bdefef99f80a05357af22fb499d506b256cf82167b80de81028a947bfb7050df07cfc610e196c1e2c220a
+MISC metadata.xml 553 SHA256 40476d944e6e1ea6527a18a7396b76d86301f4a5a4f9c8928c9b0dee95cf1d49 SHA512 470f2e142cf47129818d29d08ffc0f27911e2da70c249793af7ef80171b5cb009d9f9c1e6dd2caf0f038b3b77248975083f950aaa79de4f96e9b1e3b7c0051c6 WHIRLPOOL aaa19668ae5e268065a8164a3dc87911fa718144ff95bacd18458af7041c080e9f4d0e9541d2b94bf5ae2c47991fdbeadac80ad1a269c416c0ef9e717f5b1aaa
diff --git a/app-admin/dio/dio-1.5.2.ebuild b/app-admin/dio/dio-1.5.2.ebuild
new file mode 100644
index 000000000000..6087eb8c5354
--- /dev/null
+++ b/app-admin/dio/dio-1.5.2.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="dio - Device I/O monitoring tool"
+HOMEPAGE="https://github.com/donaldmcintosh/dio"
+SRC_URI="https://github.com/donaldmcintosh/dio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin dio
+ doman dio.1
+}
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
new file mode 100644
index 000000000000..4d0ce07be8e0
--- /dev/null
+++ b/app-admin/dio/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>donaldbmcintosh@yahoo.co.uk</email>
+ <name>Donald McIntosh</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">donaldmcintosh/dio</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
new file mode 100644
index 000000000000..16d38f4216f5
--- /dev/null
+++ b/app-admin/diradm/Manifest
@@ -0,0 +1,5 @@
+DIST diradm-2.9.7.1.tar.bz2 126172 SHA256 0a10f8b8b872a1f985c1f73da0109e8ba5ebde09ccb4760b56e67d4a1b88f2bf SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f WHIRLPOOL 31c2b6eaa913aa0a273652958233e0ace3b309063448add6b446a41e48903b984810f0ce668b27efbbca8c558a20a379692a3d7d3997d8481d0dbfe19827adee
+EBUILD diradm-2.9.7.1.ebuild 2059 SHA256 175a10fcc242a7dc347fb3d18e49d5aa548bbc6982e2a3c654494eacd78fa996 SHA512 ba5875849b9297f0a07cae5a2511b5907763f2d6b9dc922224bfc4576d4f0dfbd151e7fc984f05460e1f36c0af91da46a27a11c4da2447620044eb448da2b287 WHIRLPOOL 98bb5aa6c287a6ded8eeef3389d8072d8a5f27c0b88cadbc4172c07b386cd95be517e12924d15d138adb184ca5e7cec4230fb4a4676e1847aaedb27a27921583
+MISC ChangeLog 2571 SHA256 57be63be51c2170db972b40dfd5ac19913e38b6df6dbfadfd88e9b602178f852 SHA512 2a46476b0746837bdcc2768a55d0f1ebd9b0fe5e0bd97000d2d1db55c33b7bb869a8ba71c247a118694e218b2aeda34169fa588fb84898cc11b0e02a5f923a5a WHIRLPOOL 39736b62af3027ea179899aff2371f81af8aca861d8b09420fd16eac5f6969cbd469390e35d51d66127f078914ab513bdf9cffbc444a87393d7c3c93c3e42c77
+MISC ChangeLog-2015 7535 SHA256 34044284c11e3e4aa9a39a3cc64214fe2497fe8ebce3385b1c824464319de3c0 SHA512 60433cb3dfde17720c978b32b1e2aa198b4b66e8214c8d5aa5ce2b5e2a440687e0789e505bdd06531e8caf402ff675569d613fa83c9f47352e4ab6e090d342b7 WHIRLPOOL 87cead42d337403e19ff9c2e9c2b77b22ce49e051acbeb2bb957f04644b841bbddb62bbf05b001f91ef151979eefb54b73f349a7f947285a259e33632803ac2b
+MISC metadata.xml 427 SHA256 74f539080d344da7f90db5c0c21d90d57885c700926ec399d88762a51355fec2 SHA512 e870567a2c1855cd2cbb9d2982ec967c34f78ef0b5d9c32570c2f13b1c8275b77626e9467a95b632db5ef459b1c706451e8f64440629f76ec56fb423b7a2b2a4 WHIRLPOOL 21af92d92cf81cee65b1c9b4e413c0cbc51b5905f74b2f1de50050fcd00b6c5c66d9e9973c1bc14dc9c9aee972fcea045bde0bf64af0bc237669fa1588eb2ac9
diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
new file mode 100644
index 000000000000..40dd1892dcc6
--- /dev/null
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
+#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
+#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
+SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="samba irixpasswd automount test"
+RDEPEND=">=net-nds/openldap-2.3
+ sys-apps/gawk
+ sys-apps/coreutils
+ sys-apps/grep
+ dev-lang/perl
+ app-shells/bash
+ sys-apps/sed
+ virtual/perl-MIME-Base64
+ samba? (
+ dev-perl/Crypt-SmbHash
+ >=net-fs/samba-3.0.6
+ )"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Crypt-SmbHash
+ >=net-fs/samba-3.0.6
+ dev-util/dejagnu
+ net-nds/openldap[-minimal]
+ )"
+
+pkg_setup() {
+ use test && elog "Warning, for test usage, diradm is built with all optional features!"
+}
+
+src_configure() {
+ local myconf
+ if use test; then
+ myconf="--enable-samba --enable-automount --enable-irixpasswd"
+ else
+ myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
+ fi
+ econf ${myconf} || die "econf failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
+ THANKS TODO KNOWN-BUGS || die
+ if use irixpasswd; then
+ insinto /etc/openldap/schema
+ doins irixpassword.schema || die "Failed irixpassword.schema"
+ fi
+}
+
+pkg_postinst() {
+ elog "The new diradm pulls many settings from your LDAP configuration."
+ elog "But don't forget to customize /etc/diradm.conf for other settings."
+ elog "Please see the README to instructions if you problems."
+ elog "This package is primarily intended for use with nss_ldap & pam_ldap"
+ elog "and populates many default settings from the /etc/ldap.conf used by"
+ elog "those packages, with a further fallback to /etc/openldap/ldap.conf"
+ elog "for server connection settings only."
+}
+
+src_test() {
+ emake -j1 check
+}
diff --git a/app-admin/diradm/metadata.xml b/app-admin/diradm/metadata.xml
new file mode 100644
index 000000000000..c8b2751e5fe0
--- /dev/null
+++ b/app-admin/diradm/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>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <use>
+ <flag name="automount">Support for automount data in LDAP</flag>
+ <flag name="irixpasswd">Support for storing separate IRIX passwords</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
new file mode 100644
index 000000000000..116ad6a190b3
--- /dev/null
+++ b/app-admin/doas/Manifest
@@ -0,0 +1,4 @@
+DIST OpenDoas-6.0.tar.gz 28482 SHA256 59b5ce734591e0e5142f9cb27aaa56a4d5ce470d1f7ad85e9679cd91d2dd2058 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60 WHIRLPOOL 037154c8aa81dd33a253a7d8837183d9cd4652ad1a333c1a8771a31cb31fc4721fdcdfc29c786c4bb9f011a61ef978b8e04e75336ea4628673405a68b3a2b839
+EBUILD doas-6.0.ebuild 761 SHA256 9366b7b83d10a669be639118cc8fc4cfa8459bb36e2b310bc81f174040f0105c SHA512 13231d84919f3f3b4b157637a122428556cc95096531761a99f8e76d993538e1f3a90f2ed1bf05ddd583283b9b266e0d9541185a999495d46040e256d1c4a0de WHIRLPOOL 324cfa751646df18b589a66b04dc1bab8ab17154ca4f9932cb833026b3acb9051607b4d7718242988692355bd7074fc33963ef13fd00a18462a935c3b1d7fabe
+MISC ChangeLog 521 SHA256 d6de4637048278079e9174cdd1e72d47f17070f88d9d6cb5b2e0674e129487d8 SHA512 ba45cf37f549fbb3bf799aec239a637c4a805014c224b1ad5f02226a369a20799006c34028d2665973fd40fb2a6c23ad872177e7fc19e8843de2295ad9ba65a5 WHIRLPOOL ff1e785bab78ae46d338bac9cd9ff1ba0de9c2e77dd26473ae1a69359b111f4e077a11611471d85f115685a038f9bd06205cb99c4ca2c71da563a38accad631c
+MISC metadata.xml 435 SHA256 f81e1157ae981b37adb77efd8fc7beeda831ba6947be1c39e64d890c3961d134 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec WHIRLPOOL 4a80e7549a5a1291eb7cfdca6f566f848e961f42c9d607a434234aa76a1d9b7d87659a092eabaa8d26d42d3aa3ec6153ec81dc01df35ddd65f686f0704b50553
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
new file mode 100644
index 000000000000..e07d93c03e03
--- /dev/null
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+
+MY_PN=OpenDoas
+MY_P=${MY_PN}-${PV}
+HOMEPAGE="https://github.com/Duncaen/OpenDoas"
+SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="pam"
+
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ virtual/yacc"
+
+src_prepare()
+{
+ default
+ sed -i 's/-Werror //' Makefile || die
+}
+
+src_configure()
+{
+ tc-export CC AR
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --sysconfdir="${EPREFIX}"/etc \
+ $(use_with pam) \
+ || die
+}
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
new file mode 100644
index 000000000000..90a63f874100
--- /dev/null
+++ b/app-admin/doas/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>felix.janda@posteo.de</email>
+ <name>Felix Janda</name>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">Duncaen/OpenDoas</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
new file mode 100644
index 000000000000..2346566fe178
--- /dev/null
+++ b/app-admin/drush/Manifest
@@ -0,0 +1,7 @@
+AUX update-bash-completion-script-for-2.1.patch 1332 SHA256 9bab3ce5bbe7611bc7483cfd2c7926c6d443d3af772c5b241fd94a438fb1316a SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0 WHIRLPOOL cddf67a8834ed4d01fd5215f2044388628360e7613cfb54c45a3cbbea7c36659f0bd5a8399008e971d2fca48560ed16115dc3b55d0f707776a5c569efe41d901
+DIST drush-6.7.0.tar.gz 511581 SHA256 f3ba2a6847f83b1b8a61207b1a514617612a75261e7b39ffc2606b6958f79e8c SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5 WHIRLPOOL 87eb20be4b6bb8280dd1e91c422bdfc7a2181d6eabd37a212ce7b95ef863cd7c526531d98eca09d032f8e8cf3201d746dd615dfcb858dfadfaef41869dc22500
+EBUILD drush-6.7.0-r1.ebuild 1716 SHA256 650e2e169d49e134411cb759759e316a3f77bd4d2b236549bf6a2688ca5ccbee SHA512 b766666dfce86612ae691db158f0ca340025cfca28e5d8ca55020bdc762cf0ccb73cb41d37318c962974df40695b3d8fab5fef6c9f1bd4a453806d0c79d7aab8 WHIRLPOOL 3cd374540dbc19cef2f0866f3361e7db205f5129994f694259415f2039caed0933fefa9a26f6c50ce57847be0c859bb3c61395e988eac516a1968b35dfc3ffea
+EBUILD drush-6.7.0.ebuild 1705 SHA256 2b42945b485c781541c491d068ad7c8305fb46238ade5718b6d1a55806c2b448 SHA512 1c6bd5d2c9af395751d9deefb08fcd35dbe38be0c7d9df2e5db68d6aa9a732dbb326da1b6d2f9b548a16c14120b2f7c6d59ed810c53f4f75c24ff02827da97f0 WHIRLPOOL 8d08f3e6f1511e94d2d35a8afda6b08dd3498352ba2c3800750bd711e468ad5ca9d69d03e9c50dea34537a5bb1ba21f39d92c0732d44e6b9018ee8feebb0c924
+MISC ChangeLog 3977 SHA256 0532e96c4c8667ed5d16a6d73d35f1a25b901763d4faec9a5ca5294e777b25fc SHA512 ad785c5f0b44eb2ccab42b70d2826e8747aac8cfb2f0b381f7cbe441f81178f8c7775a48424b07b0b4c56e159d9d04f1f69ad5a410b8498342bb690c62284525 WHIRLPOOL 69eed8d236136fde24882f4bb27a42a890b38367962bbeafa5bc31f650e12a1a487406c65511b76ea9e89c37415825d3bb6762c99a4419b335cc6e4e85bf1bc4
+MISC ChangeLog-2015 2376 SHA256 1c59279d88781a3f927086c2c692aea5666e149a9604ad6eb89fd326f5f901fa SHA512 8f5948a9e05a96934c07df74a612d0740419e11143b732a2817c39119326fdb71bbf884726a0976ec665714c727ccc7b552dc55cede4ac90dc60b694760f69c8 WHIRLPOOL d81b2c1f8ae62a6fead1a361b9b9fb33a7cc24ff2205c721d12fcf11e912b0f4166f41728f107e195593529eb832a780bcf256a64b5531a59d57feb2387a1b50
+MISC metadata.xml 531 SHA256 c177512601aafe47fff0e583e71ea0a02b9bf3b75378d37bb6f0b641b4801441 SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4 WHIRLPOOL 9a5f730e1139e26422d23df83499053f0ac70b95cd086de3b39ee7a1a1f7cb3d883f8203c8762b64183ca004e27cd392cb2b36e3d41689748e321e3ff3fcc9be
diff --git a/app-admin/drush/drush-6.7.0-r1.ebuild b/app-admin/drush/drush-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..41d92ea52559
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+ dev-php/PEAR-Console_Table"
+
+# Fixes the bash completion script, check the patch for Gentoo/upstream
+# bug numbers.
+PATCHES=( "${FILESDIR}/update-bash-completion-script-for-2.1.patch" )
+
+src_prepare() {
+ default
+
+ # dodoc compresses all of the documentation, so we fix the filenames
+ # in a few places.
+ #
+ # First, the README location in bootstrap.inc.
+ sed -i -e \
+ "s!/share/doc/drush!/share/doc/${PF}!" \
+ -e "s!README\.md!\0.bz2!g" \
+ includes/bootstrap.inc || die
+
+ # Next, the list of documentation in docs.drush.inc. Note that
+ # html files don't get compressed.
+ sed -i \
+ -e "s!\.bashrc'!.bashrc.bz2'!" \
+ -e "s!\.inc'!.inc.bz2'!" \
+ -e "s!\.ini'!.ini.bz2'!" \
+ -e "s!\.md'!.md.bz2'!" \
+ -e "s!\.php'!.php.bz2'!" \
+ -e "s!\.script'!.script.bz2'!" \
+ -e "s!\.txt'!.txt.bz2'!" \
+ commands/core/docs.drush.inc || die
+}
+
+src_install() {
+ # Always install the examples; they're referenced within the source
+ # code and too difficult to exorcise.
+ dodoc -r README.md docs examples
+
+ insinto /usr/share/drush
+ doins -r classes commands includes lib misc
+ doins drush_logo-black.png drush.info drush.php
+
+ exeinto /usr/share/drush
+ doexe drush
+ dosym ../share/drush/drush /usr/bin/drush
+
+ keepdir /etc/drush
+ newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/drush-6.7.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
new file mode 100644
index 000000000000..9052c38c745c
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+ dev-php/PEAR-Console_Table"
+
+src_prepare() {
+ # Fix the bash completion script, check the patch for Gentoo/upstream
+ # bug numbers.
+ epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+
+ # dodoc compresses all of the documentation, so we fix the filenames
+ # in a few places.
+
+ # First, the README location in bootstrap.inc.
+ sed -i -e \
+ "s!/share/doc/drush!/share/doc/${PF}!" \
+ -e "s!README\.md!\0.bz2!g" \
+ includes/bootstrap.inc || die
+
+ # Next, the list of documentation in docs.drush.inc. Note that
+ # html files don't get compressed.
+ sed -i \
+ -e "s!\.bashrc'!.bashrc.bz2'!" \
+ -e "s!\.inc'!.inc.bz2'!" \
+ -e "s!\.ini'!.ini.bz2'!" \
+ -e "s!\.md'!.md.bz2'!" \
+ -e "s!\.php'!.php.bz2'!" \
+ -e "s!\.script'!.script.bz2'!" \
+ -e "s!\.txt'!.txt.bz2'!" \
+ commands/core/docs.drush.inc || die
+}
+
+src_install() {
+ # Always install the examples; they're referenced within the source
+ # code and too difficult to exorcise.
+ dodoc -r README.md docs examples
+
+ insinto /usr/share/drush
+ doins -r classes commands includes lib misc
+ doins drush_logo-black.png drush.info drush.php
+
+ exeinto /usr/share/drush
+ doexe drush
+ dosym ../share/drush/drush /usr/bin/drush
+
+ keepdir /etc/drush
+ newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/update-bash-completion-script-for-2.1.patch b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
new file mode 100644
index 000000000000..a6a9b6a0ff43
--- /dev/null
+++ b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
@@ -0,0 +1,39 @@
+From e0f53949d35f32d251ab003d6e9e70a7f8c0e69a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <mjo@gentoo.org>
+Date: Tue, 21 Oct 2014 19:48:37 -0400
+Subject: [PATCH 1/1] Update bash completion script for new
+ bash-completion-2.1 (Gentoo bug #526222).
+
+* Don't use `which drush ...` to detect the presence of drush in the
+ bash-completion script (https://github.com/drush-ops/drush/issues/521).
+
+* Don't install completions for commands that we don't "own"
+ (https://github.com/drush-ops/drush/issues/915).
+
+---
+ drush.complete.sh | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drush.complete.sh b/drush.complete.sh
+index 067a67c..2f97317 100644
+--- a/drush.complete.sh
++++ b/drush.complete.sh
+@@ -5,9 +5,6 @@
+ # examples/example.bashrc instead, as it will automatically find and source
+ # this file.
+
+-# Ensure drush is available.
+-which drush > /dev/null || alias drush &> /dev/null || return
+-
+ __drush_ps1() {
+ f="${TMPDIR:-/tmp/}/drush-env/drush-drupal-site-$$"
+ if [ -f $f ]
+@@ -31,4 +28,4 @@ _drush_completion() {
+ }
+
+ # Register our completion function. We include common short aliases for Drush.
+-complete -o bashdefault -o default -o nospace -F _drush_completion d dr drush drush5 drush6 drush7 drush.php
++complete -o bashdefault -o default -o nospace -F _drush_completion drush
+--
+2.0.4
+
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
new file mode 100644
index 000000000000..dade88fc1985
--- /dev/null
+++ b/app-admin/drush/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 -->
+ <longdescription lang="en">
+ Drush is a command line shell and scripting interface for Drupal,
+ a veritable Swiss Army knife designed to make life easier for
+ those of us who spend some of our working hours hacking away at
+ the command prompt.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">drush-ops/drush</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/durep/Manifest b/app-admin/durep/Manifest
new file mode 100644
index 000000000000..d3cf284740ec
--- /dev/null
+++ b/app-admin/durep/Manifest
@@ -0,0 +1,8 @@
+AUX durep-0.9-dirhandle.patch 848 SHA256 4fbdd5659421f39e689f070278e619327beeb4b4ad286ebcf195c8e498c7d3b5 SHA512 8e887393bab2c011cdf9ae096fc4f8b077c02c471203768c9f51b59df0a36f94aad797ffc017cf03ab0ddd2eed5e290d3ec65c90774bebacb5c35673ac3f176d WHIRLPOOL 7c2083a22ac52563735f1d616c96207d5e92abb1ad56fae8d127188568db8a3b27b54d4d168d7bcc822bbc72074628ef0ffff563c80a300080599aa371a61c10
+AUX durep-0.9-gigabyte.patch 327 SHA256 2d953915390811eb1e9cf3470760a5c03012956dafa07b32effb1a3e524a64ad SHA512 2bb28c5956cc6f8b301890f82eb86255f84ed6f93d1dc61e96bacb840ae0181feed76e992bca86249e9003701666784fdf7a40331c6c1731c55b3e3d2a4897b8 WHIRLPOOL f3922aea532fd14c9cd164ffe6245b6d64667c16d22795c85950ab6e8ff75e6989ba1dcbc85bf91545ca8aab17222041b3ec205a16d874211399cf33d0e1b385
+AUX durep-0.9-r4-color-output.patch 3477 SHA256 5d8eda3ced6776725b6843861db9fcb73158b98858ae2a33ecda7585f39c5dca SHA512 18bd766f706bf2036b1da35c0daf1add0adb6603a6cd0c68277efff8e1f2f8224cc2d79ca6c4afc70db9a01b5eec8a4ca7899c7c92b0bd38f709e7736731937a WHIRLPOOL 05170473d8b0700e10e66030e7741fe7fbaf497a642cf496c275c8c649143837d70f65c16c7d98b8c81bf6d773ab5f8b0805664b5691d34ba36cb8cbb5ad202e
+DIST durep-0.9.tar.gz 13713 SHA256 71605ebc4d25f6452e2aaa0119e9a6b7e753fe46ec2999e17311389a03016825 SHA512 a8a58cf4a77fa43e06eb22ce70e566fe9c5dd6921677dbe4691a6dd95e2fad3735778a9858e3b80957ba6efd20293fcd2ba4ddc9cfe29f5813997de0f9c96b6d WHIRLPOOL a64f822cae74934e45eb9c5acf87f708feb84854f6912a6c9342ffb79cee9569d4685fbe09f78144404695995dc454e25603cd2720e1618cfdf98376e907c18f
+EBUILD durep-0.9-r4.ebuild 746 SHA256 296dc826f3bf59e35f94b33b83f05a9936c25ae3f0393950ecd3971751f6eaa8 SHA512 73458ffd706804959eddaabc0a06b879562e0855a4b75d47a8dcee0b1c24109740efede4d6c846192b6fe6b9ecea00306fe86abdf83261658f337da00b1fc138 WHIRLPOOL e7611dc2ef1ec5796e957963ef509caaaabe2dadd46683719e5ded29d8114f01079b30edd0e19adda4dfef506709dd3020bb75196f4c9a49c9637dfc87db65cc
+MISC ChangeLog 2770 SHA256 65ff84acc37436ba901355abeff9891482403204f31a9d9bc6322ff94c78aeb6 SHA512 79409697f9b21a6d40353b3d17859da7f4b54e2f598bab08934b8ad45ad514b282dd1f864fc7f4f86cc46a26392035f9dd769db30bbd3daea3afe11eea8f0dd4 WHIRLPOOL 42dd2b351f7ca02cebe2f2361ff46d81e00eb9cc0eea1961410676e8fc2f6b689a63b634379e7e21983ced8d209347dd6016a1866e4bd2dfa08a033eff72aa43
+MISC ChangeLog-2015 2951 SHA256 c47ff28ab16e2d753be61a562acf3446e1be3fb1171c541a6fa39d819bf63f1a SHA512 7afa44ac913de3025112cfff8dea40871dcee802d8e577d64a6f00842c55cd7611062285347c6dbb8d9104bf4b6e2d4ef1a82611ee3b760e526502fda672f63d WHIRLPOOL 194d92a70c33d74b6c482b73f1d7a229441682ec88120bf4085a4bf03b16a7d16b40dc306ca2ffa7e7914f79ba6f8b692d912aa9325ccdf24d523381133d243b
+MISC metadata.xml 267 SHA256 4bb73a10b6399693ead0865a1a131e315c633d95dcc1b94e78d70ecd8642d51d SHA512 cbdeb6992e6acb977746b55685ae3d60dcf00915b48002a5e7eb47830207e7cad52ae212cd8831282274c454e45faa65422dcd5ac50185f429642fb34818609c WHIRLPOOL 2ee03e7b264415bdf06492b893d030aa247b1c21a696a3f44193be4bdcd02988b2bf928304e9a51070669ec4c80fbc7b908a2e4f059d16daae2b1e4e5c572029
diff --git a/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild
new file mode 100644
index 000000000000..8a1b40e1159e
--- /dev/null
+++ b/app-admin/durep/durep-0.9-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A perl script designed for monitoring disk usage in a more visual way than du"
+HOMEPAGE="https://gentoo.org"
+SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+ dev-perl/MLDBM
+ virtual/perl-Getopt-Long
+ virtual/perl-Term-ANSIColor"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gigabyte.patch \
+ "${FILESDIR}"/${PF}-color-output.patch \
+ "${FILESDIR}"/${P}-dirhandle.patch
+}
+
+src_install() {
+ dobin durep
+ doman durep.1
+ dodoc BUGS CHANGES README THANKS
+ dohtml -A cgi *.cgi *.css *.png
+}
diff --git a/app-admin/durep/files/durep-0.9-dirhandle.patch b/app-admin/durep/files/durep-0.9-dirhandle.patch
new file mode 100644
index 000000000000..ee2930622370
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-dirhandle.patch
@@ -0,0 +1,31 @@
+--- durep 2007-09-08 11:44:05.000000000 -0500
++++ durep.new 2008-12-15 10:04:14.907825184 -0600
+@@ -175,6 +175,7 @@
+ my $coalesced_size = 0;
+ my $node = {};
+ my $temp;
++ my $dirhandle;
+
+ $node->{ID} = $next_id++;
+ if(defined $parent) {
+@@ -196,9 +197,9 @@
+
+ $node->{TYPE} &= $TYPE_COLLAPSED unless $store;
+
+- opendir(DIR, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
++ opendir($dirhandle, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
+
+- foreach(readdir(DIR)) {
++ foreach(readdir($dirhandle)) {
+ @stats = lstat "$dir/$_" or warn "Unable to lstat '$dir/$_': $!\n" and next;
+
+ $node->{MTIME} = $stats[9] if($_ eq ".");
+@@ -247,7 +248,7 @@
+ $file_count++;
+ $node->{FCOUNT}++;
+ }
+- closedir(DIR);
++ closedir($dirhandle);
+
+ if($coalesced_count) {
+ if($store) {
diff --git a/app-admin/durep/files/durep-0.9-gigabyte.patch b/app-admin/durep/files/durep-0.9-gigabyte.patch
new file mode 100644
index 000000000000..315cb1c7c813
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-gigabyte.patch
@@ -0,0 +1,17 @@
+fix `durep -hs 1g` output
+
+Patch by Stephen Tallowitz
+
+http://bugs.gentoo.org/108942
+
+--- durep
++++ durep
+@@ -468,7 +468,7 @@
+ elsif ($temp =~ m/^[mM]/) {
+ return $size * 1048576;
+ }
+- elsif ($temp =~ m/^[mM]/) {
++ elsif ($temp =~ m/^[gG]/) {
+ return $size * 1048576 * 1024;
+ }
+ return $size;
diff --git a/app-admin/durep/files/durep-0.9-r4-color-output.patch b/app-admin/durep/files/durep-0.9-r4-color-output.patch
new file mode 100644
index 000000000000..6b8956199406
--- /dev/null
+++ b/app-admin/durep/files/durep-0.9-r4-color-output.patch
@@ -0,0 +1,98 @@
+--- durep
++++ durep
+@@ -14,6 +14,8 @@
+ #############################################################################
+
+ use Getopt::Long;
++use feature 'switch';
++use Term::ANSIColor qw(:constants);
+ use File::Basename;
+ use MLDBM qw(DB_File Storable);
+ use Fcntl;
+@@ -27,6 +29,7 @@
+ our ($root_node, $filesystem_id, @stats);
+ our ($opt_help, $opt_version, $opt_textdepth, $opt_hidesize, $opt_showdate, $opt_nosort, $opt_quiet);
+ our ($opt_savefile, $opt_loadfile, $opt_desc, $opt_collate);
++our ($opt_nocolor);
+ our ($opt_files, $opt_onefilesystem, $opt_collapsepath, $opt_excludepath, $opt_coalescefiles);
+ our ($root_dir, $file_count, $dir_count, $next_id);
+ our ($TYPE_FILE, $TYPE_DIR, $TYPE_EMPTY, $TYPE_COALESCED, $TYPE_COLLAPSED);
+@@ -56,6 +59,8 @@
+ "d|desc=s" => \$opt_desc,
+ "c|collate=s" => \$opt_collate,
+
++ "nc|nocolor" => \$opt_nocolor,
++
+ "f|files" => \$opt_files,
+ "x|one-file-system" => \$opt_onefilesystem,
+ "cp|collapse-path=s" => \$opt_collapsepath,
+@@ -332,13 +337,58 @@
+ printf(" [%s%s] ", "#" x $numofchars, " " x (30-$numofchars));
+ printf("%6.2f%% ", $percent);
+ printf("%s ", shortDate($entry->{MTIME})) if $opt_showdate;
+- printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
++
++ printColor( $entry ) unless ( $opt_nocolor );
++ printNoColor( $entry ) if ( $opt_nocolor );
+ if($entry->{TYPE} & $TYPE_DIR) {
+ printDir($entry, $indent+1) if(!defined $opt_textdepth || ($opt_textdepth > $indent+1));
+ }
+ }
+ }
+
++sub printColor {
++ my $entry = shift;
++
++ my @tmp = split /\./, $entry->{NAME};
++
++ if ( $entry->{TYPE} & $TYPE_DIR ) {
++ print BLUE, BOLD, $entry->{NAME}."/\n", RESET
++ }
++ else {
++ given ($tmp[$#tmp]) {
++ #executable (bright green)
++ when([ qw(cmd exe com btm bat sh csh) ]) {
++ print BOLD, GREEN, $entry->{NAME}."\n", RESET
++ }
++ #archives / compressed (bright red)
++ when([ qw(tar tgz arj taz lzh zip z Z gz bz2 tbz2 tz deb rpm rar ace zoo cpio 7z rz) ]) {
++ print BOLD, RED, $entry->{NAME}."\n", RESET
++ }
++ #image formats
++ when([ qw(jpg jpeg gif bmp ppm tga xbm xpm tif tiff png mng xcf pcx mpg mpeg m2v avi mkv
++ ogm mp4 mp4v mov qt wmv asf rm rmvb flc fli gl dl) ]) {
++ print BOLD, MAGENTA, $entry->{NAME}."\n", RESET
++ }
++ #misc.
++ when([ qw(pdf ps txt patch diff log tex doc) ]) {
++ print GREEN, $entry->{NAME}."\n", RESET
++ }
++ when([ qw(mp3 wav mid midi au ogg flac aac) ]) {
++ print CYAN, $entry->{NAME}."\n", RESET
++ }
++ default {
++ print $entry->{NAME}."\n", RESET
++ }
++ }
++ }
++}
++
++sub printNoColor {
++ my $entry = shift;
++
++ printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
++}
++
+ sub processSizeOption {
+ my ($size, $temp);
+
+@@ -438,6 +488,9 @@
+ -d, --desc=<description> give description of save file
+ -c, --collate=<dir> collate save files in dir for web report
+
++Color Option:
++ -nc, --nocolor no color output
++ By default durep color outpu
+ Inclusion Options:
+ -f, --files do not descend into subdirs, only report files
+ -x, --one-file-system do not traverse file systems
diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
new file mode 100644
index 000000000000..a1d1cac5ab79
--- /dev/null
+++ b/app-admin/durep/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>A perl script designed for monitoring disk usage. Similar to du</longdescription>
+</pkgmetadata>
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
new file mode 100644
index 000000000000..70874348acc5
--- /dev/null
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -0,0 +1,5 @@
+DIST ec2-ami-tools-1.5.7.zip 156611 SHA256 5a45d9f393d2e144124d23d2312b3a8918c5a3f7463b48d55f8db3d56a3fb29f SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2 WHIRLPOOL d88c0259683d7823fd911e357e2b13516cb845972e728a2ae93d29741be3cfa49a1604cfea47f815c5d104bdd71b6c162a26224b3c632d4836976a56d1b640e4
+EBUILD ec2-ami-tools-1.5.7.ebuild 1178 SHA256 72479f8735b751c3bf03855307e446d58e52bdb787fad48c7ff30e0a38abc635 SHA512 d42d67da311a4fadfbf0cd3e509faa413f1b4c112ec599a57f6cb7cc3e64edd432bacf62b9510cdfbffb40aab5577e2991e1d398ab6ae599c8abb6692b173b6d WHIRLPOOL e7f3edcd591667ddb122bf6214f59d0bf54bd87d8f7db1e6beb09dd297907fb6cd1130593acc01c8f7943fe785e4d31a3c77575d4dea2134bb33ec7d85400ff0
+MISC ChangeLog 2765 SHA256 b6565bfeef9600faf6950a6b3a80decb2226924f652ea8d9eecee1868044b3f2 SHA512 315b45e701b57cc5c92c10fa032c1df3464ff065c09db88121458e6196a8a3c4f5936814ffe77eb12dd15449c8584abea675d1c50eca116b1b8a94aef3a5b27f WHIRLPOOL f975b72060363df270a589fb3c2825e779062746a8fc4d1945ddc7744a3eb480279d09c4454fa71a45bdf0231dd874d2d3e49019f82827ec5bb1efd6027e6e6d
+MISC ChangeLog-2015 4271 SHA256 f8d9388a1d7d3d626edcbab2e9c754c2a77a6470f508d5bf0e2af3b9d2327f83 SHA512 b77748cc2b5b3863d7f92163115363e1efe0e68a7d622a6bd9b5b89151bcad4f8d5dc0c583c77e9ef884c0b9fa7be20a443a2b67d45ae280b395e0f312cd7a98 WHIRLPOOL ff374258c45c771519e270e9f13781d8ae08ee96fd3f29bdd615b40c355386e7fccbe04308761f0304a377c3a1e658c094c411449f8ccfc4611ea717acae41b7
+MISC metadata.xml 299 SHA256 553463c80b33af529432b11c8fda758cf02fa9e5b4668687e4df991719a376b8 SHA512 32d0280896d9452574a1ca6ef923aee59cf559e2b9023a4b6986c735bc327df57eb2c73183f5cb660a991e2f41268f0477b24a7e68a81d283fd68c1d2a6ff6a8 WHIRLPOOL 74af766068316cbf1626361cbe9f01dbd98021babe94309c88ae5d5957d6ae3be87cfb5a24baaa8600d6ae8f13acc76f501dd23f83b9b6be57e196aa5b6b8c78
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
new file mode 100644
index 000000000000..d8d78205f46e
--- /dev/null
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23"
+
+inherit ruby-single versionator
+
+DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service"
+HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
+SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
+
+LICENSE="Amazon
+ || ( Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+ ${RUBY_DEPS}
+ virtual/ruby-ssl
+ net-misc/rsync
+ net-misc/curl"
+
+src_prepare() {
+ # Remove a left behind license file.
+ rm -f lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
+
+ eapply_user
+}
+
+src_install() {
+ dobin bin/*
+
+ insinto /usr
+ doins -r lib
+
+ insinto /etc/ec2/amitools
+ doins etc/ec2/amitools/*
+
+ dodir /etc/env.d
+ echo "EC2_AMITOOL_HOME=/usr" >> "${T}"/99${PN} || die "Can't write environment variable."
+ doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+ ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+ ewarn "to use these tools in a shell before logging out (or restarting"
+ ewarn "your login manager)."
+}
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
new file mode 100644
index 000000000000..73ba6fbc9254
--- /dev/null
+++ b/app-admin/ec2-ami-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-needed -->
+ <longdescription>
+ These command-line tools serve as the client interface to the Amazon EC2 web service.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
new file mode 100644
index 000000000000..716498ff692f
--- /dev/null
+++ b/app-admin/eclean-kernel/Manifest
@@ -0,0 +1,12 @@
+DIST eclean-kernel-0.4.1.tar.bz2 9540 SHA256 be877b4a9686abb665077e32e22dee7ad85bb5514f3db5ac6e179d3d3bc92dbb SHA512 8274c299221a1472b9408a8f3bbe547daba1c6377594ac0f5a6c5874a35235977b8b956232952d4b14296d11ebe2bd91c547ddd4de42dc2ed5f7f13970c8f15f WHIRLPOOL 49990795ae8061423985c8a96e213062124a1f5258872a26ad259835d1bf4aff44d3a621cdde74161fa801673c4e1995e69b466b77e6dcbad0130b19e65eadfe
+DIST eclean-kernel-0.4.2.tar.bz2 9666 SHA256 42df20f9117707e48973a362b262093c1de239b27190e75b60576de0ef9e82d4 SHA512 6a69cfd54ee72a13a3a1a6ca460d73377170ef7731d3598b7cb1fc6263c95cd64dfbe0f260d1a8739d7c032e431523493a1fc8032bd92d1a537e672eb7436dec WHIRLPOOL a78c52c74ec071984634dae64ab42bde0660e90d8d418b205fe4ed0f01f6386c1529c5b8da35b5982a8b9c75338877e8031fd5a27dfa032f2e54df9c4e21fa55
+DIST eclean-kernel-0.4.tar.bz2 9408 SHA256 be9d85fcb0c0cd4c70b3e3e7793bcacf9673faf9069356ef0af9661c050cf928 SHA512 f7f4a1a910594bb28bf37792c87a7ee96daecea006376cf98d0eeeb4d4c3c2a59e46fd986a5c7d34d0a54520bef58b225a498f926d4858d5ba2a4d3941ed3f36 WHIRLPOOL 3f8a168562082a12de34d5cca1e8fda2a5730607678bea55ff5c68f96399e3500681efccfe16201017f510ef916376b9da2495b39913ae5183f81ed8fae97b57
+DIST eclean-kernel-1.99.3.tar.bz2 75550 SHA256 30d2985ff77e010b6f72bcac27ff172c08806408805df03e9e37326a0d159222 SHA512 5f6b5efafdb398de0d407461c8660ce4a7b4f040655fa9575cc317f401bcfdbf3a68c4dd74baa82979433962aa07186e725f322d6f7a0713c13fd634d32f332c WHIRLPOOL df35f47111ee74a97bbd507b947fece9c656113b8f33fc129d598c3613c4478f8512c96ff45576991212988429b4c6fbed801e40ea141967ea29ca1f2cf22a84
+EBUILD eclean-kernel-0.4.1.ebuild 489 SHA256 0be72ecd8dd9a42a6f2a80ac33d35bf9586f926e8078debf2c75ad5ae2c6595a SHA512 dae6ca41aabd9d1ca8803fd4668f403211256ec55f6aceab08d974cec2044f5873f60d13e80fd3f47b639308aa2aa624a0e4bcf1db30f09e6bba14a3fda623c4 WHIRLPOOL 037b7f82d8fa40712cd19b5f184571c610654a0c972e098630645b880a48dd272e3196d79c2f78b10a9904cbcdf9c0d1af5e0275dc7475fc86afe78f18b1cb44
+EBUILD eclean-kernel-0.4.2.ebuild 487 SHA256 bb3165b174671d36433f77dac15bd540d677e4641da92ba48caf7a4a960d5380 SHA512 48f07f9f55631293ebe71790f8b4b1f761003374e7f5399ebcce6a99bdd16cf608192ec42ba49146dfc34a1bf86fb0e2b4e2f3378ae6498925e02e799734c167 WHIRLPOOL 1a0410eb8ee2c5558695f7b143235e09f97419dbebfbc9ec7e9c777ef12b6070aab1c8e6c10e8fac20e6048c56eada239a23a816e1d40610da6021e3c01b1d29
+EBUILD eclean-kernel-0.4.ebuild 483 SHA256 e5b4495c98289cf615f8d2ebc0666df9876baf636c05b828ea39f9a7778a61ed SHA512 4cafc672ae067826527ac07e2029ec3d04732932edd05bcf2345c61e34f226565d56a99bf6ad24639ea75c8107ec69b45e749445d9c5b9eeff828e14c8e6f97c WHIRLPOOL d7c6248539e51d63842cdf24d43f5f15646ceaac23541b33fce6c096269e91e4aedfe385de2fe8ada4cff0a15d28da314439e3f7e96e46e2d7a0a7e6fbcd68fd
+EBUILD eclean-kernel-1.99.3.ebuild 362 SHA256 6b204c47d519b2743368f70dd485230e38b3a9c7f263c2259d6a22e430768f8b SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85 WHIRLPOOL 742450712a277451e3129d5c5babd9f2a9623a2a25521490a6f01156f5d4cbf72ffe241bbd052a3a3495d1e1b3cb087ebe4d07bf8c9d2986e7083b5217201d40
+EBUILD eclean-kernel-9999.ebuild 401 SHA256 ef1c98e62c2344ec9da80106990b78af21716957e0706f1db639b24cb29aef42 SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843 WHIRLPOOL 76a4f047ce32c2f3f3d3521a8cf4f65af5afaa8c1582679d8ff737e4979c725ff5f0f6b45fbe9f07c4823b1c6d3d69d67629ee7c9be7449daa87eb27d6dbf4d7
+MISC ChangeLog 3229 SHA256 8744f23f04c71d5716f9672cf0366fce4178fd4f2be7f8c775362d5a19921827 SHA512 94c16a342de6812a489e1cb8a4c5d4c4dadf18aeaa2f6f1dddd6bd02adbdb3c6570f05140d6ed1049ea5a1418085bb215014eec16ad14ddf52c9769ccaecb0e3 WHIRLPOOL 3780ebb4fcca5181814d93b6a4b26cb07929ebbf3673b74bc78d3fab524437b5bc982682233fa9908b27b459043ab04d6e4406faad0f2fc3a507eb6a7ab7ba71
+MISC ChangeLog-2015 6123 SHA256 c1341f547a41b37277c9a8ab89697e6096e7f846464c31eca4c4a94f44716054 SHA512 9607f6ca53cc099517690b8e7ba26928a81e7e359ddf07d80b9a32e783ea3090aa9fa6fd0fd17b1bddec893fbeea29c4b25609dc49392bd8fda37c4c150144ca WHIRLPOOL 493a712e7d2bde579af4b2edc54e7fba6f863e088972a3a1b62e1503cfb6101c3dbbde8f42b9e882abff0dd8856f808a19a8e96e6a6962e67570fa55c5874c25
+MISC metadata.xml 604 SHA256 e5355d305e6723f4e62437215c11c1b9a38211aa3b2ff1b6940961580154c8ec SHA512 200b7e7f81f7ef1138137a8e147864ac9de0d5c325a63969a8e569dd21028e5e0dc3e1427ad1161ef8afdf2de787a45df393ddebf2526b5cbb2953255122b76d WHIRLPOOL 69a1a9784a005f6865d78402320a7b253b7b22a87361d3496d43e75bc750507c2918ab8549a1b1d85162322d0e600af0d2b7cd058f706179c7a740bd0484ca44
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild
new file mode 100644
index 000000000000..2f1d60a8f25e
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.1.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=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
new file mode 100644
index 000000000000..5d0d900e4d4f
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
new file mode 100644
index 000000000000..52d6470e4b71
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.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 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://bitbucket.org/mgorny/eclean-kernel/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
diff --git a/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild
new file mode 100644
index 000000000000..ae41700c874d
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Clean up old and stale kernel files"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
+SRC_URI="https://github.com/mgorny/eclean-kernel2/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
new file mode 100644
index 000000000000..164b0f493958
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/eclean-kernel2.git"
+inherit autotools git-r3
+
+DESCRIPTION="Clean up old and stale kernel files"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel2"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
new file mode 100644
index 000000000000..daf333dcf17c
--- /dev/null
+++ b/app-admin/eclean-kernel/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>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <bugs-to>https://github.com/mgorny/eclean-kernel2/issues/</bugs-to>
+ <remote-id type="github">mgorny/eclean-kernel2</remote-id>
+ <remote-id type="bitbucket">mgorny/eclean-kernel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
new file mode 100644
index 000000000000..94a1ea69970e
--- /dev/null
+++ b/app-admin/elektra/Manifest
@@ -0,0 +1,10 @@
+AUX elektra-0.8.15-conditional-glob-tests.patch 415 SHA256 db679f8c4a555461f33468c139fecb3221f212dbb2fd0e6bb3b004a503565c76 SHA512 e57b317716979a5cb94e11094db8eeaac2941640262eec011329d1f6b1cda27c19999099e0b9a5bc9a7131de730a7065ac9256d965bf8d553afbadb94172a27c WHIRLPOOL 41dde47a20d84ef8800051b2d1baa977ed65111f86a430a12c7b2678fe845aaabfcb6ae914dbdc399935cfd3b4e70b8bbfd67a02768053aa6903817590f6f7da
+AUX elektra-0.8.15-gcc-5.4.0.patch 639 SHA256 d950b5dc795ccf668290eb549f7b9f550b128af93a509409309995cca21d131b SHA512 8b6eeec8f46fc92db86e19f1401a49fa129c5658a7c63e1307e990be69b873d2c1099fce0bca8224ea20ae4ff30b71c4dd6b69dc5bc9fd12ec45add6d2e76960 WHIRLPOOL 8911c9f74b40262c9a9998a3333827c6e57dc613dc3f9fa5e723092aaa89fd1d96cedde65f9c07fa3c0e61bfbc5018ce76bb2172f2b8d0f7c1047b9c00b2fa85
+DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
+DIST elektra-0.8.16.tar.gz 2405443 SHA256 3cf0624eb027e533192ca9d612618df3d38ec3674c9cd20474f04ff269fad77e SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 WHIRLPOOL 3230dbe2f613b5eee71c01ce7afeac3cca02ffbf45cba7a9300f8f3347d5d4c3baf0f8339ecaaaeb3ca747523229292738f1e94660187c1a9c23b4aaa02f0b6f
+EBUILD elektra-0.8.15.ebuild 3649 SHA256 afc615b5e239035b57441cf399bf78737638e0182bac1f8e2ce671d98885b11f SHA512 417dbe1eb1e1fb76dd88a8e916974b58a60308ee39ce16077344e0da43dca9589c94bb3eb6ed53550fc07c00c9b304b926de42ea219128f95d469244b60332d9 WHIRLPOOL e7aecd716f83e7c95960ffdbaaf800ff6885773d6a2c7e1c95583d79bfc39e55432831194641d7ddca67e2ec0b819860759c323cc99ba00f0f0315cbb54e3bfb
+EBUILD elektra-0.8.16.ebuild 3622 SHA256 8f2547c55ad799e63a2988c636daa465c40f9536518454fed653d196bc2992ba SHA512 f27a11d7298d202200356989cb22c8168ef54f67eee0a166e80453da6415392c290880f5001b159212c4d685ce9f59b3edcc095ef0fb265f0cd331276c9736bf WHIRLPOOL 6961b4941d09122aea2bc36bcb97b6cf65ab8a9c7921b7c895a7f5aba480b6e09fd84e09a8d1adb263725f7e2a8fb2e191f882097a5943fca7c55d48b51f185f
+EBUILD elektra-9999.ebuild 3578 SHA256 99362246cdfddf26f366ed7b5d155da3dbf9460f5de4ba7f8af3940c7c783f69 SHA512 6cb27ec847a1f9047a8846fb769e8303f2f69ff283bfc2c80f489951a01423e940227d23962eb92d3275209c9a1a98ecb9141e7845e13e4b9c8b89d7e29d91f0 WHIRLPOOL e4f4241f57c4ff4269ef1246d890c908e0666b60b9753e9f5982a2cc3072870bc943e0c3262137e0d8729e39806448df373cd887249a995c645a83d82559c705
+MISC ChangeLog 6021 SHA256 ba0496b96ac5f83c760d6436d119ae65bc453d02e224a97bd104492d1c6062da SHA512 13489f8317a5050af199beaaec27819d9f24d546a1501e5c6dfb39b99e3cf488e00ea7e815f3fae660043cb537d369924aa785bc44d5397e22f59cd587bd95b9 WHIRLPOOL 8ececdfe3d61471ae78bb135df5e887c9367f9822b6f1fab87a0e55b436a7b34930fe21cab33ab8cd7c7bf88a7555d8cafca475b6c5c7c2165b78d209c7847e7
+MISC ChangeLog-2015 4412 SHA256 3de214eae0b0bf73ee8ab2bc080efd7074185c598ec620f2f29632089dfe2041 SHA512 daa6f2bdc84e47a88814c4f1ca5d4f8aafa1c16b6195cb8d9e31d57d1ee5c2d7bd236f8e30dbbbac6c43414863e4df162791b331a8ded2902d432a9befee733d WHIRLPOOL 1c4cef8a03e139332d59e4226e6ba8fe98f61c9aa18845bd70390b3208e7594d8be17bd5a8a66711cbc2f090febcf5911e27c113ac1076fba8b89ce73989df77
+MISC metadata.xml 604 SHA256 0fae053fa98cf180c5b8580fa59907b7b0f7c4edd99bd10861e9fbb6cad5db9b SHA512 5bc058ef5858f1a2916c9fffa87fbd11b4e7017498db402dd0e782d098ef7f71f098184d9aa936023cfde538ce4c2fe93402b2d5f7ba12c7ea52700d3301ffe3 WHIRLPOOL 4c4a8c7263b514d211ed5f0efab61c6f25ee10c378a36cae354418adccd6b4f6b051b1af1b2be61bb12b74678c9f63991a907f3f275087d8b80b83b3e9461c77
diff --git a/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild
new file mode 100644
index 000000000000..8319b317bc5e
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ augeas? ( app-admin/augeas )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jdk-1.8.0 )
+ qt5? (
+ >=dev-qt/qtdeclarative-5.3:5
+ >=dev-qt/qtgui-5.3:5
+ >=dev-qt/qttest-5.3:5
+ >=dev-qt/qtwidgets-5.3:5
+ )
+ uname? ( sys-apps/coreutils )
+ systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+ yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+PATCHES=(
+ "${FILESDIR}/${P}"-conditional-glob-tests.patch
+ "${FILESDIR}/${P}"-gcc-5.4.0.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ einfo remove bundled libs
+ # TODO: Remove bundled inih from src/plugins/ini (add to portage):
+ # https://code.google.com/p/inih/
+ rm -rf src/external || die
+
+ # move doc files to correct location
+ sed -e "s/elektra-api/${PF}/" \
+ -i cmake/ElektraCache.cmake || die
+
+ # avoid useless build time, nothing ends up installed
+ comment_add_subdirectory benchmarks
+ comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+ local my_plugins="ALL"
+
+ if multilib_is_native_abi ; then
+ use augeas || my_plugins+=";-augeas"
+ use java || my_plugins+=";-jni"
+ else
+ my_plugins+=";-augeas;-jni"
+ fi
+
+ use dbus || my_plugins+=";-dbus"
+ use iconv || my_plugins+=";-iconv"
+ use ini || my_plugins+=";-ini" # bundles inih
+ use simpleini || my_plugins+=";-simpleini"
+ use syslog || my_plugins+=";-syslog"
+ use systemd || my_plugins+=";-journald"
+ use tcl || my_plugins+=";-tcl"
+ use uname || my_plugins+=";-uname"
+ use xml || my_plugins+=";-xmltool"
+ use yajl || my_plugins+=";-yajl"
+
+ # Disabling for good (?):
+ # counter - Only useful for debugging the plugin framework
+ # doc - Explaining basic makeup of a function //bug #514402
+ # noresolver - Does not resolve, but can act as one
+ # template - Template for new plugin written in C
+ # wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+ my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+ local my_tools
+
+ if multilib_is_native_abi ; then
+ my_tools="kdb"
+ use qt5 && my_tools+=";qt-gui"
+ fi
+
+ mycmakeargs=(
+ "-DBUILD_PDF=OFF"
+ "-DBUILD_SHARED=ON"
+ "-DPLUGINS=${my_plugins}"
+ "-DTOOLS=${my_tools}"
+ "-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
+ -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
+ $(cmake-utils_use static-libs BUILD_STATIC)
+ $(cmake-utils_use test BUILD_TESTING)
+ $(cmake-utils_use test ENABLE_TESTING)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ einfo remove test_data
+ rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+ einfo remove tool_exec
+ rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
new file mode 100644
index 000000000000..a87cd518643c
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ augeas? ( app-admin/augeas )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jdk-1.8.0 )
+ qt5? (
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ uname? ( sys-apps/coreutils )
+ systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+ yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch
+ "${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ einfo remove bundled libs
+ # TODO: Remove bundled inih from src/plugins/ini (add to portage):
+ # https://code.google.com/p/inih/
+ rm -rf src/external || die
+
+ # move doc files to correct location
+ sed -e "s/elektra-api/${PF}/" \
+ -i cmake/ElektraCache.cmake || die
+
+ # avoid useless build time, nothing ends up installed
+ cmake_comment_add_subdirectory benchmarks
+ cmake_comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+ local my_plugins="ALL"
+
+ if multilib_is_native_abi ; then
+ use augeas || my_plugins+=";-augeas"
+ use java || my_plugins+=";-jni"
+ else
+ my_plugins+=";-augeas;-jni"
+ fi
+
+ use dbus || my_plugins+=";-dbus"
+ use iconv || my_plugins+=";-iconv"
+ use ini || my_plugins+=";-ini" # bundles inih
+ use simpleini || my_plugins+=";-simpleini"
+ use syslog || my_plugins+=";-syslog"
+ use systemd || my_plugins+=";-journald"
+ use tcl || my_plugins+=";-tcl"
+ use uname || my_plugins+=";-uname"
+ use xml || my_plugins+=";-xmltool"
+ use yajl || my_plugins+=";-yajl"
+
+ # Disabling for good (?):
+ # counter - Only useful for debugging the plugin framework
+ # doc - Explaining basic makeup of a function //bug #514402
+ # noresolver - Does not resolve, but can act as one
+ # template - Template for new plugin written in C
+ # wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+ my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+ local my_tools
+
+ if multilib_is_native_abi ; then
+ my_tools="kdb"
+ use qt5 && my_tools+=";qt-gui"
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_PDF=OFF
+ -DBUILD_SHARED=ON
+ -DBUILD_STATIC=$(usex static-libs)
+ -DBUILD_TESTING=$(usex test)
+ -DENABLE_TESTING=$(usex test)
+ -DPLUGINS=${my_plugins}
+ -DTOOLS=${my_tools}
+ -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
+ -DTARGET_CMAKE_FOLDER=share/cmake/Modules
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ einfo remove test_data
+ rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+ einfo remove tool_exec
+ rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild
new file mode 100644
index 000000000000..79ef408969f7
--- /dev/null
+++ b/app-admin/elektra/elektra-9999.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib eutils java-pkg-opt-2 git-r3
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
+EGIT_REPO_URI="https://github.com/ElektraInitiative/libelektra.git"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS=""
+PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+ augeas? ( app-admin/augeas )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jdk-1.8.0 )
+ qt5? (
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ )
+ uname? ( sys-apps/coreutils )
+ systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+ yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-cpp/gtest-1.7.0 )"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
+
+PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ einfo remove bundled libs
+ # TODO: Remove bundled inih from src/plugins/ini (add to portage):
+ # https://code.google.com/p/inih/
+ rm -rf src/external || die
+
+ # move doc files to correct location
+ sed -e "s/elektra-api/${PF}/" \
+ -i cmake/ElektraCache.cmake || die
+
+ # avoid useless build time, nothing ends up installed
+ cmake_comment_add_subdirectory benchmarks
+ cmake_comment_add_subdirectory examples
+}
+
+multilib_src_configure() {
+ local my_plugins="ALL"
+
+ if multilib_is_native_abi ; then
+ use augeas || my_plugins+=";-augeas"
+ use java || my_plugins+=";-jni"
+ else
+ my_plugins+=";-augeas;-jni"
+ fi
+
+ use dbus || my_plugins+=";-dbus"
+ use iconv || my_plugins+=";-iconv"
+ use ini || my_plugins+=";-ini" # bundles inih
+ use simpleini || my_plugins+=";-simpleini"
+ use syslog || my_plugins+=";-syslog"
+ use systemd || my_plugins+=";-journald"
+ use tcl || my_plugins+=";-tcl"
+ use uname || my_plugins+=";-uname"
+ use xml || my_plugins+=";-xmltool"
+ use yajl || my_plugins+=";-yajl"
+
+ # Disabling for good (?):
+ # counter - Only useful for debugging the plugin framework
+ # doc - Explaining basic makeup of a function //bug #514402
+ # noresolver - Does not resolve, but can act as one
+ # template - Template for new plugin written in C
+ # wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+ my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+ local my_tools
+
+ if multilib_is_native_abi ; then
+ my_tools="kdb"
+ use qt5 && my_tools+=";qt-gui"
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_PDF=OFF
+ -DBUILD_SHARED=ON
+ -DBUILD_STATIC=$(usex static-libs)
+ -DBUILD_TESTING=$(usex test)
+ -DENABLE_TESTING=$(usex test)
+ -DPLUGINS=${my_plugins}
+ -DTOOLS=${my_tools}
+ -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
+ -DTARGET_CMAKE_FOLDER=share/cmake/Modules
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ einfo remove test_data
+ rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+ einfo remove tool_exec
+ rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
new file mode 100644
index 000000000000..413515e05605
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
@@ -0,0 +1,15 @@
+--- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
++++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ add_cppheaders (HDR_FILES)
+ add_toolheaders (HDR_FILES)
+
++if (ENABLE_TESTING)
+ include (LibAddTest)
+
+ file (GLOB TESTS testtool_*.cpp)
+@@ -11,3 +12,4 @@
+ get_filename_component (name ${file} NAME_WE)
+ add_gtest (${name} LINK_TOOLS)
+ endforeach (file ${TESTS})
++endif (ENABLE_TESTING)
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
new file mode 100644
index 000000000000..9bab2a61c9f5
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
@@ -0,0 +1,20 @@
+commit 05c925972224afd3fa28f34b9a762364a38f6850
+Author: Markus Raab <elektra@markus-raab.org>
+Date: Tue May 3 14:25:54 2016 +0200
+
+ add vector kdbtimer
+
+ fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
+
+diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
+index ae4c242..b7f731e 100644
+--- a/src/bindings/cpp/include/kdbtimer.hpp
++++ b/src/bindings/cpp/include/kdbtimer.hpp
+@@ -13,6 +13,7 @@
+ #include <sstream>
+ #include <string>
+ #include <sys/time.h>
++#include <vector>
+
+ #ifdef __GNUC__
+ #define TIMER_NOINLINE __attribute__ ((noinline))
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
new file mode 100644
index 000000000000..0cc6943fa1fb
--- /dev/null
+++ b/app-admin/elektra/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>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <use>
+ <flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
+ <flag name="ini">Enable new, advanced ini support</flag>
+ <flag name="simpleini">Enable simpleini support</flag>
+ <flag name="uname">Enable uname information for the key database</flag>
+ <flag name="yajl">Enable yajl support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
new file mode 100644
index 000000000000..f6251ad2c53f
--- /dev/null
+++ b/app-admin/emacs-updater/Manifest
@@ -0,0 +1,5 @@
+DIST emacs-updater-1.15.tar.xz 7020 SHA256 6554e01eddf8cf1e7074e492ddb1a89bfe49b57fe7c3f20fe9aa92b110f97d48 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a WHIRLPOOL faa4f62c85ec7103e17c95676f758c123b0de966e2df78067f9628122f69d8e92a3dd3eeac080f24c988b5ba30b811b27df8f7c001d46a50cde9a0e845d0fd20
+EBUILD emacs-updater-1.15.ebuild 969 SHA256 78b7ed103e7fae2d321fc0445840c3d1f47092e422173ac2b7f2a302272b7998 SHA512 30e75f83c944a730a58ad8dbc36f640fe1e87d378db2ba4465678737f77e8f29156eb50b0ac6b07ba084f0b13d5ff216fb90d0db8a28301b81c4fdaaa03bf684 WHIRLPOOL 5c9151ba335b8f79999e4308b69c294196066014b2de1d4f7ee835a681178232aec5851077baa7f3ec47d17a75855fba6dbdac53afaf4a38dfc0bf79b64a8e6d
+MISC ChangeLog 4265 SHA256 44b70f30b6caaed0d496f1ea89ef2bbb8031caab7cae3b95417850508c39103f SHA512 5f6de709033b4209e10fdf66958744eeb7f05f42c4ec722e3e0ddc9853251ee0ce087e7aa44b28e90ceeaf82b149f806e8eb26e6a7a034136f3ee3162b4b7229 WHIRLPOOL 218eadba312843b4a48c7b590f2aa36c18b0b9cd46facf6809d12465c8252e792634b2b62f1a6242018fd43444c05f18ae7198b252bcd5408338e605b817fd30
+MISC ChangeLog-2015 10960 SHA256 b73852971703b5143177854016f9762e76f23550f94f897cc4f39921cf9c5d06 SHA512 4107a7f5d260e996573cfe4a0557cd09edb3d0479709d3d888e5d5d3ee776be4001eb95b7f1b2a0b325b0e501cf53c41f9f5aceb30395e54976ddb2e4d98f1d9 WHIRLPOOL 9fc7a41e807f5ac8a7f72a7e2f354f9d252fcaf4bc21c6598fc0aee3b6bd6dd3ed0c49125b7facfc81d406774211a1f22290bb282410fdd09d7601d05a540de7
+MISC metadata.xml 259 SHA256 4d59c14917cb31648858cb06bc3c7f224cf1c3906dc3166f8f0d8b8e02970928 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3 WHIRLPOOL 08c68f505a8cc685c52f3a54a07582b64ff7c0b4682c8f9333286fbb5caf4a8d406933c7937fe8c9611f456b5a549ee100657a1c9dc766c8965772f277bf31fb
diff --git a/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
new file mode 100644
index 000000000000..5f285a56dcac
--- /dev/null
+++ b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
+RDEPEND="${DEPEND}
+ >=app-portage/portage-utils-0.3
+ virtual/emacs"
+
+src_prepare() {
+ default
+
+ if ! has_version sys-apps/util-linux; then
+ # BSD ships a dumb getopt(1), so use getopt-long instead
+ sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
+ fi
+
+ if [[ -n ${EPREFIX} ]]; then
+ sed -i -e "1s:/:${EPREFIX%/}/:" \
+ -e "s:^\([[:upper:]]*=\)/:\1${EPREFIX%/}/:" \
+ emacs-updater || die
+ fi
+}
+
+src_install() {
+ dosbin emacs-updater
+ doman emacs-updater.8
+}
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-admin/emacs-updater/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>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
new file mode 100644
index 000000000000..af535daf14aa
--- /dev/null
+++ b/app-admin/entr/Manifest
@@ -0,0 +1,8 @@
+DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8
+DIST entr-3.8.tar.gz 24251 SHA256 ebb1e793d948db76481f081011bf1dad8b4449e067f4e5fe68176191f84b26bd SHA512 8530a40eefc78571f3a2ab09f63d25d880167ec2d76e0c32fb25dce40e22b3f9f3b5f27874c1b95480206628e314298f001a4c0b487485ac88f2996002b41a2a WHIRLPOOL 27ccd2d4be2758c765ccf834df45b53db8ca7a0de1c880dee5183f37e6838b1a2764801b33b4ecbb4ec890b97b90c720aba0dbc66d37c4dc943ffb61b21af320
+DIST entr-3.9.tar.gz 24554 SHA256 02d78f18ae530e64bfbb9d8e0250962f85946e10850dd065899d03af15f26876 SHA512 e0d58b7f4dc20ba9cfb12a165172817dfd647e859e2133b01b59427f9bb9612ee5b8e8f6563f31cc15b57251e60b2cb639c764f65d6daeb4456ecbccc7b39c12 WHIRLPOOL 46ca452280537e08b04616b6ce31dde463788328fb6e283d6a55d486dda97ec2dc4b0a23f67e925be66dd76bebb6e5a1aad19c8d8973e3c2faa19f5397082b19
+EBUILD entr-3.7.ebuild 494 SHA256 eedfa642f37a6da546d59443fd28b2c0210284de4c93a925775654e78f68f4ac SHA512 55c8fd3f5ac2f7ae70e361305b13c47da886355b226bb44165414bc70ab704825bfcf1c9eb3753f24e132d0105c6200c4b609c5e7bf69fc9aa35ffdf6083daf0 WHIRLPOOL 9ac9d2044d013033e83c69d2eaf2b27d8644951caeb18d5086678130f002da179f31d36803d63697c6763721f568e41528554b0f1f1574de37fc51c06555af76
+EBUILD entr-3.8.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4
+EBUILD entr-3.9.ebuild 498 SHA256 0e882d6f5aec79c496845917b9441beb809a49415f82da6647c14d22a6bc5842 SHA512 6e4b45c4f3310b2ffbe6fe5fe855be3815ae92ae224b217aa55064764ba2c9daf6e7e45d80d01a2e03c2617d36bd0904fd243c06ed949fe27271fd79c686a594 WHIRLPOOL 5865118fa4626294d138afe2dcaacf413c6f0a27c495b294b0c451a2d76bec065e260869fdb0a0603627462a48a8e4fe378b74df4ed20e66912299ea72052bf4
+MISC ChangeLog 2314 SHA256 9a8785a05834cf43f24194acf41d833d54944b38c8fda098b58b9a38a0709a5b SHA512 4f2c635609b7dc022a58bce143f7851b4b2692eb3ac1c4c1aa2be9835fb798c4c1dcecd63dafcddfba5a5ffc24e5ca74c05c2d2396cd56fcba79427911059dc3 WHIRLPOOL 82c4b02c27f5f6d4d070bc2145a8b4224065507fb4f44bd21b2b3bc208c8a9dbdd6ba786b12e772cc813ff0bac6cf5e0454f36287b2ffbffbfc01436c1c63827
+MISC metadata.xml 377 SHA256 3684c43060a9b340ca7710c1697b9c3cd8b6218f6bda4ebadd23cc6661dc4748 SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6 WHIRLPOOL c704ca2f5573778786616e592f36f8cd6ed3003f981ecdb5287bfbd882fff0d93e423f38999fb24e7f0e5e813e922e7f64c0de7c364974637141514062af6b61
diff --git a/app-admin/entr/entr-3.7.ebuild b/app-admin/entr/entr-3.7.ebuild
new file mode 100644
index 000000000000..448abf84b1fb
--- /dev/null
+++ b/app-admin/entr/entr-3.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="test"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv eradman-* "${P}" || die
+}
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
diff --git a/app-admin/entr/entr-3.8.ebuild b/app-admin/entr/entr-3.8.ebuild
new file mode 100644
index 000000000000..3acbed282720
--- /dev/null
+++ b/app-admin/entr/entr-3.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv eradman-* "${P}" || die
+}
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
diff --git a/app-admin/entr/entr-3.9.ebuild b/app-admin/entr/entr-3.9.ebuild
new file mode 100644
index 000000000000..3acbed282720
--- /dev/null
+++ b/app-admin/entr/entr-3.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv eradman-* "${P}" || die
+}
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
new file mode 100644
index 000000000000..94248608af4d
--- /dev/null
+++ b/app-admin/entr/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-admin/equo/Manifest b/app-admin/equo/Manifest
new file mode 100644
index 000000000000..978ceefd34b6
--- /dev/null
+++ b/app-admin/equo/Manifest
@@ -0,0 +1,5 @@
+DIST entropy-302.tar.bz2 1701434 SHA256 968267d65d3a4f1480fb1d4eac43f33777efe0b4486c80f9b3baef093f052f95 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e WHIRLPOOL e03a7669d9c98a2a060822f5000d859158724730d172e536da7577c365864109990ea9e7fe143f5a8fa496474d637b57a93e18dc39f6282037e0f7941a4eba43
+EBUILD equo-302.ebuild 937 SHA256 2303cd38dc4afe05d07321d79f22f75e4228bfd7fc15789f1fd918645b3fa7ea SHA512 4c9be7016d4a190812a8df5361ab3bea74a29b0a400275d7395c757867e6411c6915f723fca59a0ded43022407a61ec593487d9275f06b4b29d93c297902361b WHIRLPOOL 20b063b687be5ff636b84b2a1a8c7aa02fa8afa020df7d548e411175458c21fd13c32d411c697b39a389899df4db3541333ff77389a6fa8a4d2ca0f51223841b
+MISC ChangeLog 3466 SHA256 b29427bfebcc940ad9f04886ab89ab2ccea0b5165a2eddfda1f4fc361687f1e9 SHA512 19c45f8e3748efdd28dd324bc863319f011e3da07ba32e94d533877af7532daf577285e0195e00bfba436bf9133c5d40c57bc540df9f8b340d0e7bd8e536ec82 WHIRLPOOL d054b04721e388217978d418f5ce70cb367939544bfa8fc8d0ca48be971bbb3b2d91151dcaab35db0d277c6e2d4ecb59495bbca64be20b947b1a41e3bcec8326
+MISC ChangeLog-2015 4079 SHA256 7d9cbe57ea5fa78bafdd14870fbd348deb1a991c392f5cf8687aeb9fd9facb18 SHA512 fa29d48f28787063b6413c5284bcf02b1df464f22c2205172a7a0f7d3697c788fbb59ec28e63e183f208312f90f74efddb93e6577069efd6d5acdbee1a0ddef4 WHIRLPOOL 6fa979877570f93d00d5ed294a2b58bdc8e20181e1754fd966f78125a75f80f068e0d40f1726394aa004c9aa7c6e1cbe472b0f1299c3ccd89007c20ae141ece0
+MISC metadata.xml 447 SHA256 48a210571aa712b6016dc95f4c2a15f3e1d5996fbde224ce950b4fa4d74906a3 SHA512 2101f474c05885ff071c20a3feff1a6135a350f646b2799bba9c7f88ee64c36097cb4a8b4913d9e2042282d05cc148d75e7157c9ce7e9658396484b4a61f87d6 WHIRLPOOL ecfb1ed2079f00b6fddfbcba41b958cf859f11fe6871d4a31338bbc0272d2d7997c487b87b9f1d8494b74df2dbf116b49f4bcb6f14ade01dadd0509574c15323
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
new file mode 100644
index 000000000000..1c5924a18e98
--- /dev/null
+++ b/app-admin/equo/equo-302.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager text-based client"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/file[python]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_compile() {
+ cd "${S}"/client || die
+ emake || die "make failed"
+}
+
+src_install() {
+ cd "${S}"/client || die
+ emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+ newbashcomp "${S}/misc/equo-completion.bash" equo
+
+ python_optimize "${D}/usr/lib/entropy/client"
+}
diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
new file mode 100644
index 000000000000..2c94a04481eb
--- /dev/null
+++ b/app-admin/equo/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>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
new file mode 100644
index 000000000000..8788822b8b7e
--- /dev/null
+++ b/app-admin/eselect/Manifest
@@ -0,0 +1,8 @@
+DIST eselect-1.4.8.tar.xz 176692 SHA256 68f0de3e47895859dcbfcaab71175714f366891c8d2da4561121f48f2fff71eb SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194 WHIRLPOOL 3c026bb5e743263ea67a41e4f151775c6e5007617f902ebe734ba5c7c837ac9fd6f74c67ffce5e3f192861190da986d38016df4ad9e8e6ce4fe7e66235d95806
+DIST eselect-1.4.9.tar.xz 176776 SHA256 50f7a8f319f7615d07c2f395414af5a39dbc2db8602869714c14609a663a1216 SHA512 88e9d81086596849ef6daf87da3f782886286b1b829d0d6378c3c3c7d9f044a2eb2dc4e1596c2f49eb2ee4e443eebaab3be4bdb223a36bb5f7b66ac0686e2640 WHIRLPOOL ec7f9242f67876a7e228504e28607745dbacae57e659b8cfba857a55f998de2ad571bd1f45e69a99b6510922a7a51f2793b6be27e03632d32adda4d20d84de92
+EBUILD eselect-1.4.8.ebuild 1656 SHA256 50d957d8ac9c89c31360fd6a1417ad8bf08ad89c1f83bdf81b1b9ddc9a46629e SHA512 4fb3a040832c75da4389cd20ee315cbf8e8d0b85e7a7964cc461fbec008c4e87616b4e33ed0d0d8e0ed84a5fdf170125e415a292eb94195782394efa14472aa4 WHIRLPOOL ac34a4e366b7aedb2b87240c71e3926b67a349aecdf55317a8799fbbe697180c224b68a3ac8c7c48a693e1d15e0813d7af86beabaa78ffbbac16d05a4723f12a
+EBUILD eselect-1.4.9.ebuild 1666 SHA256 d27eb2f02877a6d7c40d2c9bde8e19a9a11b83e9716c90eb705b3bbfb70e6b8a SHA512 37ff35a9765872c8d96fa2129f1e7632106d40d6439dc85da2cd612fba4d198f47c4911ec1096a5ae199f0ef2315c4eb38fa9be04760e6469b975587060b66c7 WHIRLPOOL 7d2a8875d1dcd25e7a7ec3a7474e6723c1fa517ef710e309202f4ca97a9dd6bcc4d35c45aee26611951306d5854759eaa5d8d256c8ca48e25cc46a42aae84853
+EBUILD eselect-9999.ebuild 1381 SHA256 384bf9a62e7d9d11a21c44d18fee2cdf8593af32c349ec2e381ff29c1e5b3725 SHA512 275045fa854a7857f7db9fa8974add64248c588d461b5fb94ab148d3bf869a10206e1c0a95b1084fb4d2a92ebcb1bf7a974e33fd9b280d5bb1d6926759a991f4 WHIRLPOOL be868897ef7f8b9e3e787b09b0f1c2218a84e4fdbb6960c288d1a4ad2931365bdd4eaa0e0dc440fffb0916927040edbcea2a6dc09ed676d19855b074c97bb479
+MISC ChangeLog 6656 SHA256 14c28a6ceca13f237c91a684db4881a2a1587032bfce8f486e0781e7d3cfcfbe SHA512 40408733604a108ae02c5789cdbb25a190d554d1366eaeb3e2f45e3a68591497229f6e9e784a07a793322f3a80f63de4272612d146c970aa6f32553c7c7f543f WHIRLPOOL 1da48eb599f5f09cd0110025043ce7584f9e25e1b73829ebc33598505073298a72248bcfe4e9e05fe49a6b5e299ed8d9a8010f8919b3ecff448a8f721e5881b0
+MISC ChangeLog-2015 41123 SHA256 68047fcf47094e671982bd393071ad15a977b00b16ef76bc4aaf7d6c1e79053a SHA512 16593624a1a55f32082fac2b11791f8b745605e48d5d719dc92b0889ed80a0671f25c2ce702e345d3d6a9c92e263e0544da2742a657d56c90e7b78380d1b3f2a WHIRLPOOL 6a05ea4b82701b0e4d139728df69093f669c5ebcd1611d94c8261a68e42d9c6b131a8e5b7a12749707e0f7b054e835742fdd0ea8bf2aa4393640a65b8cd31c38
+MISC metadata.xml 272 SHA256 ff2692c2a9d608c5644a9921c1d604b4f42cbdb0de54b2309e51bdd19f973c97 SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3 WHIRLPOOL 7c3ce11ae48f83ce4546d0ed2e43b617a42d515dd3167e7239ae0b4351ffd1fe8658bd53f5b3e3a094bbd33b20da7b49507c5003f3d374bf5182520e25392cfd
diff --git a/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
new file mode 100644
index 000000000000..f6c61c068cae
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+ || (
+ sys-apps/coreutils
+ sys-freebsd/freebsd-bin
+ app-misc/realpath
+ )"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+ sys-apps/file
+ sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+ vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newbashcomp misc/${PN}.bashcomp ${PN}
+ dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+ if use doc; then
+ docinto html
+ dodoc *.html doc/*.html doc/*.css
+ fi
+
+ # needed by news module
+ keepdir /var/lib/gentoo/news
+ if ! use prefix; then
+ fowners root:portage /var/lib/gentoo/news
+ fperms g+w /var/lib/gentoo/news
+ fi
+}
+
+pkg_postinst() {
+ # fowners in src_install doesn't work for the portage group:
+ # merging changes the group back to root
+ if ! use prefix; then
+ chgrp portage "${EROOT}/var/lib/gentoo/news" \
+ && chmod g+w "${EROOT}/var/lib/gentoo/news"
+ fi
+}
diff --git a/app-admin/eselect/eselect-1.4.9.ebuild b/app-admin/eselect/eselect-1.4.9.ebuild
new file mode 100644
index 000000000000..40722df6b35f
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+ || (
+ sys-apps/coreutils
+ sys-freebsd/freebsd-bin
+ app-misc/realpath
+ )"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+ sys-apps/file
+ sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+ vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newbashcomp misc/${PN}.bashcomp ${PN}
+ dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+ if use doc; then
+ docinto html
+ dodoc *.html doc/*.html doc/*.css
+ fi
+
+ # needed by news module
+ keepdir /var/lib/gentoo/news
+ if ! use prefix; then
+ fowners root:portage /var/lib/gentoo/news
+ fperms g+w /var/lib/gentoo/news
+ fi
+}
+
+pkg_postinst() {
+ # fowners in src_install doesn't work for the portage group:
+ # merging changes the group back to root
+ if ! use prefix; then
+ chgrp portage "${EROOT}/var/lib/gentoo/news" \
+ && chmod g+w "${EROOT}/var/lib/gentoo/news"
+ fi
+}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
new file mode 100644
index 000000000000..cf5d48bc58ce
--- /dev/null
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/eselect.git"
+
+inherit autotools git-r3 bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
+SLOT="0"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+ || (
+ sys-apps/coreutils
+ sys-freebsd/freebsd-bin
+ app-misc/realpath
+ )"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+ sys-apps/file
+ sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+ vim-syntax? ( app-vim/eselect-syntax )"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newbashcomp misc/${PN}.bashcomp ${PN}
+ dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+ use doc && dohtml *.html doc/*
+
+ # needed by news module
+ keepdir /var/lib/gentoo/news
+ if ! use prefix; then
+ fowners root:portage /var/lib/gentoo/news
+ fperms g+w /var/lib/gentoo/news
+ fi
+}
+
+pkg_postinst() {
+ # fowners in src_install doesn't work for the portage group:
+ # merging changes the group back to root
+ if ! use prefix; then
+ chgrp portage "${EROOT}/var/lib/gentoo/news" \
+ && chmod g+w "${EROOT}/var/lib/gentoo/news"
+ fi
+}
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
new file mode 100644
index 000000000000..1935b3149bde
--- /dev/null
+++ b/app-admin/eselect/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>eselect@gentoo.org</email>
+ <name>eselect configuration and management tool</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/evtxtools/Manifest b/app-admin/evtxtools/Manifest
new file mode 100644
index 000000000000..6bec0825c596
--- /dev/null
+++ b/app-admin/evtxtools/Manifest
@@ -0,0 +1,5 @@
+DIST Parse-Evtx-1.1.1.zip 71351 SHA256 a1909810bedc709e2fa87f6603e52c62e60086bf1ce064bd839fc5873abf8512 SHA512 308fc3da4e9291f5f84cfbb0a2a17f92d45a2314d6b1806acb59e1a2d521041487a51a6e88e70c03a683df5a9442a30d8dc2483cf684cb96bb86f0a05f27e752 WHIRLPOOL 7f63774477d8497a7e54480341c6c51753c36173acb29d660f99225a9942a0ce77f279f61c63ac3cc8009afa721352daa32e647850e251466887fd8bbb98d07b
+EBUILD evtxtools-1.1.1-r1.ebuild 779 SHA256 4e3e1e6e476fd7e1743af5565e5b8ad7d0ccd78c44dce6d059006d9c260b4905 SHA512 80bf828201683d733564491eb27e6771c8b40e0068470b83c97fb8fbfe042c9b2d32a0e5430ab44660302a655fb2f18dd22bed246b2fb941b072005171c1f4f3 WHIRLPOOL 29e18ab703679ee3ea978fb17d75ac8f8f0eee5cc11d608c5ce128d8a2aa4b5da418d69693f21b305e30afdcec8ac98d53eec056fe0baf7d4a1223b051f4ba78
+MISC ChangeLog 2189 SHA256 bba8c50505038892e40d34cb6e3c07b3236402d11f6d4c0a6b28c38025bc5052 SHA512 58866acdbf2253674ff1b645a7f0936f065a5ab7f2da593a917fd8f28958839e65c6557885f9adb47fc16e8834499311965bd2d23b979241a2cee449f6007b4f WHIRLPOOL aecc4eedf1d89de43b17ecd814c8b254bd010affa881e06d1daeed5327d9ddd423f4a35c31290cb293dcba5996ac26001f26f5477d59bb23a4161c8102c0c6ea
+MISC ChangeLog-2015 2033 SHA256 ef18e5c7bfdda75383ed37612c34efbfd460d93c2285fb45a15afcfc18b493c2 SHA512 4b90c01a313f43ea88bfea28aed27fc55c77328415c53ddf248e60ac875887ec733e76a0ffdb181a9655c8495e614854fac596ab0e64e272d12f8a4ddebc1ea6 WHIRLPOOL 0426ea88420dfad99b0fe47b98f2504330fbf543ccd66a1c54cf2f73e63e38d385f008ef89354ab71d0ebae80612fec3bba533a0e41be063db21d9191ec92a50
+MISC metadata.xml 249 SHA256 55ffdd336603bceaaeb38a9c1d7a5b3214b2f0ff4e94d855a7f7a0c8bc9c9087 SHA512 78d9639fe287fca679deae80d24842a35c05135cb038ba37a13668a43b431074d06bac2c77fc9118c52832fe78bf2c2b4e3eb415c205af51559eaaadb534e2f3 WHIRLPOOL cd63e65f95ae67c68cbae7278ba7293957316cf0eebbf8787af8042d678d268947ba4a7690fcb8362b736b49da6b69ac331519db96f44c0a2427449c97ec67ca
diff --git a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..972e084d7673
--- /dev/null
+++ b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-app perl-module
+
+MY_PN="Parse-Evtx"
+DESCRIPTION="Read, decode and dump Windows Vista/2008/7 event log file "
+HOMEPAGE="http://computer.forensikblog.de/en/topics/windows/vista_event_log"
+SRC_URI="http://computer.forensikblog.de/files/evtx/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+ dev-perl/DateTime
+ dev-perl/Digest-CRC
+ dev-perl/DateTime
+ dev-perl/Carp-Assert
+ dev-perl/Data-Hexify"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_postinst() {
+ einfo "Consider the following as how-to:"
+ einfo "http://rwmj.wordpress.com/2011/04/17/decoding-the-windows-event-log-using-guestfish/"
+}
diff --git a/app-admin/evtxtools/metadata.xml b/app-admin/evtxtools/metadata.xml
new file mode 100644
index 000000000000..9a6e0b87d381
--- /dev/null
+++ b/app-admin/evtxtools/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>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
new file mode 100644
index 000000000000..c6bac5a0cabd
--- /dev/null
+++ b/app-admin/fam/Manifest
@@ -0,0 +1,9 @@
+AUX fam-2.7.0-out-of-tree.patch 262 SHA256 279adff902b870134182955c9fa50f64491d4321d398c201f703397920929912 SHA512 20e92a60b67167aa29e699dd61731e5564a22243cbc0634903421545f6918033bce9849de2d3f665ecf3fd24406dd9fef98c98e3d49759b632293c773c4ac813 WHIRLPOOL 2c48dba0cb3b4b0dfb7bf66d3d40aeb694bb2231dcbf5abf6b545cd1307eb918c25ba2ce0f82cd116a9d7a3c0ae329e083227cbc8fec611aa34688850cdcfb88
+AUX fam-2.7.0-sysmacros.patch 343 SHA256 c4956026df068e445bd3aff21d132a16b2e56db455003edd6f39798f5c485d71 SHA512 474ab9d24175d6b3a58d05bc463a53979dfafbd67cf92f892cbf0e9f9330cc8e4b5a34aff261c052fd1080c09c936c0195432404d608b669a824b455d243f3c3 WHIRLPOOL a186d6978c16bb15cd4a8e8fbc8bc270106d6a9d333011a1dda9e6c39f8d6b12c1f2dfbb8affc01416554ec4347a74f55e2dfdea1266264fbe56c561fe720d24
+AUX famd 393 SHA256 d8c2e1b56d6ade86a8f792d10fbd8128549998f495a507c3549f8e47bd49cf18 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1 WHIRLPOOL 91176476471e8c29270d4c5a6397c8ebb0a9ec9497606096849a71df0aeda30eac5dabbac3fe4e1c4e40c6895389ccb05bdf14024aec8d9dfc87d23bc5a370c6
+DIST fam-2.7.0.tar.gz 301974 SHA256 1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2 WHIRLPOOL de90043aaaa6fd792975c13589564f85feb735738b9476b57e80d26a224fcb6f3a858ae383417e5ea48c2fa28b1a7e9c33d729caff5bb417bfbfa840ec228e47
+DIST fam_2.7.0-17.diff.gz 28056 SHA256 2362384d1fbde5dcbccf70f617aedbcae44d3f826a5b9df1331b070da1e0d5c2 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209 WHIRLPOOL 59ed522ccfc8825051d1b281ced215c8b045dc0021bf0f28755aeb1f580ebb6eddb09934128aed51e91ea3d0ac24bfd976f0733ac90b7ef0e377fa982996efbd
+EBUILD fam-2.7.0-r7.ebuild 1477 SHA256 3f4ce4ed3175f2ec7c8e9412b580034cbf093ae8714988b4da58db5805e5417c SHA512 e3ab8591d5bb3cced1c603e1379195f7f0826a019e1cee7902239116d625db383023d9ee3581f0258477f88ea191f353425f817771303e5916dca1234d2a1ac8 WHIRLPOOL ea23f513d156e0c89d7489ef078c0b93d1b1f030fc810ec12dea11c6b60f496674148e2715452a6247e22e1475cabc3c1fc9153b8351fb089fd931671cd37920
+MISC ChangeLog 2880 SHA256 028ea950bccb8d862803b66a8254f5b78a140a6d33a7e2e20dfe4b15a0295306 SHA512 1c30ec8ded9e9d1fb43b3103673de502b0008e1c3d36d8436eadb0b86946a4dec7a8491ee4b093b626f68f960be24db252cafe0feb0e8d3fba5fedc207a5d099 WHIRLPOOL f82aa9f935612785d7f4434a48f6b74331ab91a348bb4eaa949eb3a3cbd947d3a3caa0cf98481e62dd04795c20a26c2b1cccbd37e264c88f2a34f362a1bcbb0f
+MISC ChangeLog-2015 14701 SHA256 d51b5701d243f9e1f127e75024d434c10cc9a4afb86514c1f7eed49beb2eea16 SHA512 5d08e686ed1ceb61162643991b66e375f538d69b919662abe85fae842d67c257fcab85c560328593bc3135356b0c1f64c55652fb47542db82659d3ae3d45edfa WHIRLPOOL efbb550a4559909d2087accdf34d59412a1b783fac2460a49b17632e26a774de2e630feaa9e2667a7205187ff9ffd546d4eab94065e161f9323e20c151c95426
+MISC metadata.xml 244 SHA256 a65bfec176330796e1eeb3bb589b78ff60a123b947537decd4705ea71ca4e906 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db WHIRLPOOL 1164de6a99d8931ca3ae60cbb397be80b802eb473943ef777dbe8473d8d665a5f93d8b99175709bf09d8af856b3ea7aaf7c95a87aad37e48b85c06e618431a1f
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
new file mode 100644
index 000000000000..9aea258bf7a3
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools multilib-minimal
+
+DEBIAN_PATCH="17"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
+ mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="static-libs"
+
+DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
+ !app-admin/gamin"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+
+src_prepare() {
+ epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
+ edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
+ EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
+ sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+
+ epatch "${FILESDIR}"/${P}-out-of-tree.patch
+ epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+ # These are thrown away later
+ if ! multilib_is_native_abi ; then
+ sed -i -e 's/src conf man//' Makefile || die
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+ einstalldocs
+
+ sed -i "${D}"/etc/fam.conf \
+ -e "s:local_only = false:local_only = true:g" \
+ || die "sed fam.conf"
+
+ doinitd "${FILESDIR}/famd"
+}
diff --git a/app-admin/fam/files/fam-2.7.0-out-of-tree.patch b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
new file mode 100644
index 000000000000..51fdadf38fe6
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
@@ -0,0 +1,13 @@
+fix out of tree builds
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@
+ Client.h \
+ fam.c++
+
+-libfam_la_LDFLAGS = -export-symbols fam.sym
++libfam_la_LDFLAGS = -export-symbols $(srcdir)/fam.sym
+ libfam_la_LIBADD = -lstdc++
+
+ EXTRA_DIST = fam.sym
diff --git a/app-admin/fam/files/fam-2.7.0-sysmacros.patch b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
new file mode 100644
index 000000000000..ac42dca3bea6
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-sysmacros.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580702
+
+fix build with newer glibc where sys/sysmacros.h isn't implicitly included
+by sys/types.h
+
+--- a/src/DNotify.c++
++++ b/src/DNotify.c++
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <libgen.h>
diff --git a/app-admin/fam/files/famd b/app-admin/fam/files/famd
new file mode 100644
index 000000000000..da3d745b244a
--- /dev/null
+++ b/app-admin/fam/files/famd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+
+ need portmap
+
+}
+
+start() {
+
+ ebegin "Starting famd"
+ start-stop-daemon --start --quiet --exec /usr/sbin/famd \
+ -- -T 0 -c /etc/fam.conf
+ eend $?
+
+}
+
+stop() {
+
+ ebegin "Stopping famd"
+ start-stop-daemon --stop --quiet --exec /usr/sbin/famd
+ eend $?
+
+}
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
new file mode 100644
index 000000000000..f8bd6f3f34f9
--- /dev/null
+++ b/app-admin/fam/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>jer@gentoo.org</email>
+ <name>Jeroen Roovers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
new file mode 100644
index 000000000000..c83cb19a940c
--- /dev/null
+++ b/app-admin/fetchlog/Manifest
@@ -0,0 +1,7 @@
+DIST fetchlog-1.0.tar.gz 24016 SHA256 eba8150015cf43ebd41c8d8f8eaa598967ceafcd288a65ea1da4f21aa9fe3f79 SHA512 66a7a456ebb5353171b2f53071a73cccd66d42dafc2740bafd7c9db860f68176dffe10e556fde52048f2b198c2eaf8299d1fd6094726f7a003987b5ce0be7415 WHIRLPOOL 6197e06024b4228f29ff9c35ef26bd81352c836ab33e003c479482e270d54f79526e515a13f93ba1983c9e538aa96704e45cdd44cec530e28bc724a9caa9e915
+DIST fetchlog-1.4.tar.gz 32393 SHA256 2017cba285b4167fb9f148b4509d7463402820e4e7a04865cec0fe887bd5e13a SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad WHIRLPOOL b6ed75be2c70a361ea569030386e6a14519f3102950cf23a291689a37d69dc49a9f3f2698b7ff5d640f29450496e37315772ff18946b1b7e0d374cba0b7b41f4
+EBUILD fetchlog-1.0.ebuild 904 SHA256 4eacef5c5b174ab4e8e2f21d38eae04a2d98e662a8ea0e9f90167c807dca681d SHA512 ce1a7d38d71c48fbc7a98ebad164701596fe32cbe8754c472ac37eff1448c89f8d73eaab5bcf9545b11019afee82780339e44575ed66d811b2aeb6d274ff114f WHIRLPOOL 224f00a4d99f6c41e6a3440dee573b52d9ca24c07bb3699d3a2a708cd0b3a4cef8ee30023719493c5478b9dfce0005ab41f6b233c3294407295051b480fa5b06
+EBUILD fetchlog-1.4-r1.ebuild 921 SHA256 78817a8ee24126a1fec6c7b3baf587a64980d060f131d6973086b6a58c7189c3 SHA512 fb740e43998b05e924e8f6818dfd4e2faba6c946a23bbf1300d1913cf11ab17e4c089622aa2f4dacdddcc6058c1b75aeb9708f2ead6105415bbd42c26e59693b WHIRLPOOL eed9d4d4c55856b5697e711ea18f52bcde2472fc7280ade821e45da3f3bc0a544ef8dbe2842838ddf991f2193b040efca0700dbac7acdb23d396467164f476b1
+MISC ChangeLog 2572 SHA256 e07551c23061c866289a5be43f16f0df9972717bbbf946716c36ea4db6fb9c0b SHA512 f65b005fd198b21e741cd753e39dcee7935a4af20709944f9a3910bc0d4e155cac839b0464be9ba2310591fdc9af85c8849d41646f073787074c5efcfc0c835a WHIRLPOOL c6f60b3b8fc5e494cd4492f8e5fb96a06c3cca7fca87adbf8837d3cbb53579b8593e6beb8beb910c85ea43f094c187e1b674b721034dfcc01d04825c2d2a4a4b
+MISC ChangeLog-2015 1829 SHA256 99176ee6a84b259f57f91a56e59d3d0c10f48ec301af7e619a730fa304871875 SHA512 4235cd134851cb42caf75f87f4e7c5e411f8155d92a6d0c4e4f6eb4d0c6688d9ceab8adb545bcea596462c91b4fecdeff79ad090f2728173b7b5f0013480f676 WHIRLPOOL 22fd2b92ed4e403d5cd3eae63d7b28a221a5a1ccf1738bd215986d2b42e5d6c86a236929177029d5f2fa8c2a20e3565d06bffe6ad7974dc840b850cbe7b05ec4
+MISC metadata.xml 250 SHA256 20cbd4e042c2a918e69c12f4d0bda7f891f109b61b513f7503b98b6ed6b87b64 SHA512 c4bde4a741bd01c371d3a4dec51ba522ad6ccb2fb95214e41f93366bedd37d7ca1729e638a5aee8e6af9e2280ce6c06c80e404428516e6a5c86264a629e87fe9 WHIRLPOOL 9751368b90299c7a784ef2ca14f3001bc04e9a1d3f7297e92f6233486b7c3c6b32b4db558cc50178f4d9ffdd537341de893bc3b48ce24eae4b5f6d3a8750ab8d
diff --git a/app-admin/fetchlog/fetchlog-1.0.ebuild b/app-admin/fetchlog/fetchlog-1.0.ebuild
new file mode 100644
index 000000000000..85b9ef56513c
--- /dev/null
+++ b/app-admin/fetchlog/fetchlog-1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Displays the last new messages of a logfile"
+HOMEPAGE="http://fetchlog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~ppc64"
+
+IUSE="snmp"
+
+RDEPEND="snmp? (
+ >=dev-perl/Net-SNMP-4.0.1-r2
+ >=net-analyzer/net-snmp-5.0.6
+ )"
+
+pkg_preinst() {
+ elog
+ elog "This utility can be used together with Nagios"
+ elog "To make use of these features you need to"
+ elog "install net-analyzer/nagios."
+ elog "This feature depends on SNMP, so make use you"
+ elog "have 'snmp' in your USE flags"
+ elog
+}
+
+src_compile() {
+ # Links the .c file straight to the binary
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die
+}
+
+src_install() {
+ dodoc CHANGES README*
+ dobin fetchlog
+ doman fetchlog.1
+}
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
new file mode 100644
index 000000000000..0893accd6e63
--- /dev/null
+++ b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Displays the last new messages of a logfile"
+HOMEPAGE="http://fetchlog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
+
+IUSE="snmp"
+
+RDEPEND="snmp? (
+ >=dev-perl/Net-SNMP-4.0.1-r2
+ >=net-analyzer/net-snmp-5.0.6
+ )"
+
+pkg_preinst() {
+ elog
+ elog "This utility can be used together with Nagios"
+ elog "To make use of these features you need to"
+ elog "install net-analyzer/nagios."
+ elog "This feature depends on SNMP, so make use you"
+ elog "have 'snmp' in your USE flags"
+ elog
+}
+
+src_compile() {
+ # Links the .c file straight to the binary
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dodoc CHANGES README*
+ dodoc *cfg*
+ dobin fetchlog
+ doman fetchlog.1
+}
diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
new file mode 100644
index 000000000000..f45d03726427
--- /dev/null
+++ b/app-admin/fetchlog/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">fetchlog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
new file mode 100644
index 000000000000..4e00adfc0727
--- /dev/null
+++ b/app-admin/fifo-cronolog/Manifest
@@ -0,0 +1,5 @@
+DIST fifo-cronolog-1.1.1.tar.bz2 3124 SHA256 bdaa57e67b32bdf3c26a776e4e16b04f8fb21a514ae27fa798537e8bdaa4da1c SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90 WHIRLPOOL 9d878065760d55fa87b0d9434ffbd0696da278086174200daf8074854cf3d56d1424d7cf533c902e7d85eba7059c3c431bd68ba55c76ea0e70c185f9887c23e3
+EBUILD fifo-cronolog-1.1.1-r1.ebuild 816 SHA256 14da0502073fcd8c25fdcd5b5eb09657a3b68e26de0f614725904e1da8f7ff3b SHA512 ace0fca2b8e11d99dc9b0ac51d10c9a06089c0aa6912804c0fa78ca51fc4786735eb6d6c8b0cd3f9887feff7112a1f6f9bba647b2585e72309bbb75a1ca943f3 WHIRLPOOL 3111837e1cadfd1b189ad56f7c76ae55d6fd470210b9174e5989d209d04c8e2004c8d7d6e227b21a55ea1eb89d6151832fee9ecc64f66251a4dfcc26e67baabc
+MISC ChangeLog 2697 SHA256 138243c8d6b6dec78da4e590a39a957c816e2c04b276e6594d0ed30b22f5c800 SHA512 c94f0f6956314080ce278be62d99d5de94697eb2a786a2cecb7cd705bd515e81006c75f2b8f9044afe6437711cd9a7bcd096384c4ec631ad575564e50eda4cd7 WHIRLPOOL 82dc487dc48dabb9acd39babe09fbc89cfd467725e8934e44072b7964354f74737a63722f330d56a394aca184acaa3bf974be03e909ae667453618f50407564a
+MISC ChangeLog-2015 954 SHA256 0ec79017e960ee7dca561689f3af30057cc34e1710917ccdcea75f56768cd5d6 SHA512 8708fdbed6a4fc0faec676ca4636423128273e6928faa7d541b807f1a44cfac222e71b22803cff41d1d41d5fa6d4a76baefda15fda57cb34724b22e4b118478c WHIRLPOOL 8f04714f117d610ea828440bc29820de69a985d9ba6b98cb30abee9cba5d8a385fe9f5e0666b0cfb2a6905dc5678e371ed49d2258feb9a2ddb013d025d258213
+MISC metadata.xml 480 SHA256 3224c72e005e320bd9fd75ea11624ea4d3391294c637e7d894d6a36c4797e801 SHA512 5b40d5fec153d6883069f56d93397f9fdf664fb7c59a6c9ee8734d66aacc50be78ab7a76000292412e157ca79275e8b91bae7a133feef19f967c972b7f5ba793 WHIRLPOOL e746a35bd9ec2057aeb6bb9f728d2df90b4b9caf6170d402e68248d231d0403d7f2f6609d6e1ee3d7adc56c2d6ee4943ec67a8ee17e461ba5918800603170fc3
diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..93447d0b0efb
--- /dev/null
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="cronolog wrapper for use with dumb daemons like squid, varnish and so on"
+HOMEPAGE="https://cgit.gentoo.org/proj/fifo-cronolog.git"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/cronolog"
+
+src_install() {
+ dosbin fifo-cronolog
+
+ newinitd fifo-cronolog.initd fifo-cronolog
+ newconfd fifo-cronolog.confd fifo-cronolog
+
+ dosym fifo-cronolog /usr/sbin/squid-cronolog
+}
+
+pkg_postinst() {
+ elog "Warning: app-admin/squid-cronolog has been renamed to app-admin/fifo-cronolog."
+ elog "This also applies to the binary 'squid-cronolog' but there is a symlink for now"
+ elog "Please fix your scripts/configs."
+}
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
new file mode 100644
index 000000000000..479c97a41559
--- /dev/null
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription>
+ fifo-cronolog is based on app-admin/cronolog, but uses a FIFO for input
+ instead of stdin. This package is used for the Gentoo infrastructure.
+ </longdescription>
+ <maintainer type="person">
+ <email>idl0r@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
new file mode 100644
index 000000000000..a98ee15f4cd7
--- /dev/null
+++ b/app-admin/filebeat/Manifest
@@ -0,0 +1,8 @@
+AUX filebeat.confd 269 SHA256 c0de5c04228bc7eb683aacba029407238ff8ec66cc1dedb3decf16653791523a SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff WHIRLPOOL aad29bbd4ba57dad89f002c2c2535aa0b9d61b7caf594345e95290de451eba99eb6015605fc705729ceaeaf1833c09527521535e53be7d8b09e310cea4492abe
+AUX filebeat.initd 1388 SHA256 e971b72d85f82d94c604fcc647e208110f9d6d85d117cc99c8352ce0624ad1fd SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12 WHIRLPOOL 64afa8526619f7f30149b4befae10e1b2706e29b76f12de1793caeeb7d1d84d25e48639eb5beafb22ffb8ba5d86a231e399a7e2427d30112430bbff416066756
+DIST filebeat-5.5.2.tar.gz 18075191 SHA256 39e792324a35fe84ef9a63cd5324252bc71d1c665188e8d597e12ca170cfde7a SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48 WHIRLPOOL 46d182bd339abd26f3c4cf3f8d3a716180fc00147458f571eec34aefcaa67d9e88a561988e37c47083528024e4e0559b255c7a17efa43e0e4b21b653a575f7fd
+DIST filebeat-5.6.2.tar.gz 18142395 SHA256 72e247d6ec3586883cd58bc6465d18b7eb0857763ff422259205abf090557e45 SHA512 0132be77bfa51aa43b7d0ca9466bd7ab602bddffe163bd63270a3192601c9f9bc9f85f1ad18bf2e90ba5df1f6a4b14be0fc08148c2e75c264e5da7268b9fb92a WHIRLPOOL e25ebf7594fe54c325d72a8f5db09bfb21ed33df42d682cbff6383390f3daebbf57bd15d687bfff6bc740f44ebad9e4d4e5a1329bd18c213aefdea5de7b8d2dd
+EBUILD filebeat-5.5.2.ebuild 1646 SHA256 b9281e14fd3e6acf96adb966e2c1b4c276f45da05548705fb2d298677d161ee9 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029 WHIRLPOOL c80379faf373477d2936b0168dda1e6152e1baf4f7246694664c129c5d8d501d1d015ef912beeeee2eaafc95d863a245e206ac0e8ee41b755f82a8639192a9f8
+EBUILD filebeat-5.6.2.ebuild 1647 SHA256 bb6e6f33a5a6f529bd41f027be1cddce3a71db391a3d64098a137b4ad1c5b7ab SHA512 b64da8481ef50ffc13f51dc82ae0d4cf0101b6b27f502e3341a6513d62984c23b31bcf0ca0f8c4a214f133b19c4eb73d83dcb5ad0c73dc54d8a8131caf866c9c WHIRLPOOL 10c1e883a69517990d050485e0d7dc1c9815cbeaf81642068f40cbc7c8ce708fe40ebc8588e055c2f49926afe7b89aae4350b2cdb525430fe758972903b47a5c
+MISC ChangeLog 1060 SHA256 6576a8df817222dcb6b4dd928de9b7a133af968b50f164ce7f2791cafac947da SHA512 69aac439a83b3c58daf3be4d4434eb4715c22c3a1c41e8a250107627eb464f37fee52e2af20ea00a71b703344f4e4f2155c0fccd915c96fb88dc070e26f8f71f WHIRLPOOL b80429d4faf932ca42b3bf8433b03cd3d33a986245e3879c5716aae1caf514899ccc8ab4a26eaa06e254d4dfb185da92d84cc2adccc993822a5efbee86be2e91
+MISC metadata.xml 461 SHA256 94fffc864abb707e5594de973d0bf23fdf364533744acab01d2629e679967889 SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8 WHIRLPOOL b3e19ddf3062d2903cf3e86a726e82eaf5a3d7c9b247f33b92017a591fc598aace0b65f9d6acba5ed592f6f9d374447fa7b5d4931ffedb41adea057d37a5058c
diff --git a/app-admin/filebeat/filebeat-5.5.2.ebuild b/app-admin/filebeat/filebeat-5.5.2.ebuild
new file mode 100644
index 000000000000..b61d0fb18c21
--- /dev/null
+++ b/app-admin/filebeat/filebeat-5.5.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.8.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+ mkdir -p "${ELASTIC}" || die
+ unpack ${P}.tar.gz
+ mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+ cd ${BEATS}/filebeat || die
+ GOPATH="${WORKDIR}" emake
+}
+
+src_test() {
+ cd ${BEATS}/filebeat || die
+ GOPATH="${WORKDIR}" emake check
+}
+
+src_install() {
+ keepdir /var/{lib,log}/${PN}
+
+ fperms 0750 /var/{lib,log}/${PN}
+
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+ insinto "/usr/share/doc/${PF}/examples"
+ doins ${PN}/{filebeat.yml,filebeat.full.yml}
+
+ insinto "/etc/${PN}"
+ doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
+
+ exeinto "/usr/share/${PN}"
+ doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
+
+ dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "Please read the migration guide at:"
+ elog "https://www.elastic.co/guide/en/beats/libbeat/5.0/upgrading.html"
+ elog ""
+ elog "The migration script:"
+ elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+ elog ""
+ fi
+
+ elog "Example configurations:"
+ elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-5.6.2.ebuild b/app-admin/filebeat/filebeat-5.6.2.ebuild
new file mode 100644
index 000000000000..451e2191c7ae
--- /dev/null
+++ b/app-admin/filebeat/filebeat-5.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.8.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+ mkdir -p "${ELASTIC}" || die
+ unpack ${P}.tar.gz
+ mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+ cd ${BEATS}/filebeat || die
+ GOPATH="${WORKDIR}" emake
+}
+
+src_test() {
+ cd ${BEATS}/filebeat || die
+ GOPATH="${WORKDIR}" emake check
+}
+
+src_install() {
+ keepdir /var/{lib,log}/${PN}
+
+ fperms 0750 /var/{lib,log}/${PN}
+
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+ insinto "/usr/share/doc/${PF}/examples"
+ doins ${PN}/{filebeat.yml,filebeat.full.yml}
+
+ insinto "/etc/${PN}"
+ doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}
+
+ exeinto "/usr/share/${PN}"
+ doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
+
+ dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "Please read the migration guide at:"
+ elog "https://www.elastic.co/guide/en/beats/libbeat/5.0/upgrading.html"
+ elog ""
+ elog "The migration script:"
+ elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+ elog ""
+ fi
+
+ elog "Example configurations:"
+ elog "${EROOT%/}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/files/filebeat.confd b/app-admin/filebeat/files/filebeat.confd
new file mode 100644
index 000000000000..2fcf41aa3322
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.confd
@@ -0,0 +1,15 @@
+# Run filebeat under this user/group
+#FILEBEAT_USER=""
+#FILEBEAT_GROUP=""
+
+# Configuration path
+#FILEBEAT_CONFIG=""
+
+# Path to data directory
+#FILEBEAT_DATADIR=""
+
+# Path to log directory
+#FILEBEAT_LOGDIR=""
+
+# Additional arguments passed to filebeat
+#FILEBEAT_OPTS=""
diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
new file mode 100644
index 000000000000..92b8369a41d7
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
+FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
+ -path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
+command_background="true"
+command_user="${FILEBEAT_USER}:${FILEBEAT_GROUP}"
+extra_commands="checkconfig"
+pidfile="/run/filebeat.pid"
+retry="TERM/5/KILL/5"
+start_stop_daemon_args="--chdir ${FILEBEAT_DATADIR}"
+
+depend() {
+ use net
+ after elasticsearch
+}
+
+checkconfig() {
+ if [ ! -e ${FILEBEAT_CONFIG} ]; then
+ eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+ return 1
+ fi
+
+ ebegin "Checking your configuration"
+ ${command} ${command_args} -configtest
+ eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
+ checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
+}
diff --git a/app-admin/filebeat/metadata.xml b/app-admin/filebeat/metadata.xml
new file mode 100644
index 000000000000..cd032aa33d27
--- /dev/null
+++ b/app-admin/filebeat/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">elastic/beats</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/filewatcher/Manifest b/app-admin/filewatcher/Manifest
new file mode 100644
index 000000000000..763c1256a32e
--- /dev/null
+++ b/app-admin/filewatcher/Manifest
@@ -0,0 +1,6 @@
+AUX filewatcher.conf 567 SHA256 a2cdc87ec46e3ad4a7f2be2a37aeca5ec9eacc5b777ea09d44c5ea0a6a8a4952 SHA512 74108243a29e3993cf2c1b6bc4821907918e978a0bd7e6ca76c62172485ac94587a685c504fbb0a32a326e5537ebe00d0418f56229dc2031e3142773571ced14 WHIRLPOOL d60b3cbf1e83fe3c8a0ba2a2bc0dacb929d47e239c16b7b04a68344e65ec6fb38e149ca18e6c82d6a4c8ffbfbd34cc7bb9cdbdd8d0281e6d8d591a7e2b660dc3
+DIST filewatcher-2.4.6.tar.gz 37459 SHA256 abff119b18cb915d0116aa910e0cc54f1a8e97ceb47d37c02bd58fde86d9829c SHA512 a6e1d2fb11f54352f963c21a1cbb42ceadcf3aff0ebf2b0e629d7827fada12c03531ecc9b9400afc65937830f92a0f16c54abd1cc034392351b72326943d6442 WHIRLPOOL ba23f0f230d78fd335e9897dfd0b25876996ba5ded1ef80eeb69021d65f6f2a0bf2aa8ceadfd229c09712f0616fd55f625b9b2b3999733aa0d80dcbc33a6fe55
+EBUILD filewatcher-2.4.6-r1.ebuild 890 SHA256 4a8c6a83e18278f0b8046252e98c7efc0e5306a2a9166c238efa4dfcdf04b824 SHA512 b0c53b07b6291277346de663325a8a88a1782ef752efe7a36a34d5d6584a0c154095ccb2ff56c3afab0711bbe866977ae40ba9c4213048f59c3e65b3361d28d4 WHIRLPOOL 17a86804a4c34909c06e649fe5958b0ce1c277d932f1a325ba4a7de6c18b0d0edbfbf7526e4b4f4735732b005e9601058171adbeb24d58898758159c0f58a97f
+MISC ChangeLog 2676 SHA256 06661f5f230bce06a8225134bd565b54928d7bd351ddb558a5dca370eba04276 SHA512 0b056c2dd2fa01bcb0a80893b1c52b0765a20d0b4b10a69ce8529053df290e435715112d7b6523e60faaacba3c771051003a8b3484e12c966559f2c6faf3daa4 WHIRLPOOL f46eb15ba8b9611e75157c8fb633eef8b744789533b568a97f50a2df18dc513d4abe4060df07383d71f07f36e104c924cd9c2a2ae470d830c355ef773455502d
+MISC ChangeLog-2015 2115 SHA256 cb8e4383dac71e4f2c8603189ad0aa3452c4664db17620a238a11d3c80e7141b SHA512 b80718e321fb098510c08441483e24081c7b11b70ccc77a0e6aac13bb3d2955a7a5e7d15d4979895165be5f9b4f746cd39e81e4a124f34ee6d372edc889f740e WHIRLPOOL 9e1a9f0c7f4342792ddb680a58079707585785675cb33c2b304a697e51cf1d34fef0f29ad46d5a2a45b5af78579f1fe702aa110b071b5f484025ee671e8aa44e
+MISC metadata.xml 248 SHA256 d905942523422a3bcd5b920b290603f3cf606f14c6e728353df8bbb8d07b75ab SHA512 b9359e11a093d5e57800889f12683be0fc228d18dc9a63bd258d428185d825475089911629a9e34c53ae27cea7591caeb8ab8dee92d9bfe05d7037f48c3ee75e WHIRLPOOL bd692b465d0bb843c7a70d55d4fb22b31c7b15333c857b40f516dd33ad7a905e965e95d016af9c14c764a6776482c7214c556e7e5d76c0aa7a3f187558f9f1fe
diff --git a/app-admin/filewatcher/files/filewatcher.conf b/app-admin/filewatcher/files/filewatcher.conf
new file mode 100644
index 000000000000..e3358242759a
--- /dev/null
+++ b/app-admin/filewatcher/files/filewatcher.conf
@@ -0,0 +1,24 @@
+option archive-root /var/lib/filewatcher/archive
+option state-file /var/lib/filewatcher/state
+option warn-if-missing true
+option include-autopush true
+option skip-binary true
+
+# default notify via email to sysadm address
+option notify mailto:root
+# scan for archived files deleted from the filesystem
+option scan-frequency 4h
+watch ARCHIVE
+
+# system security files
+option scan-frequency 5m
+watch /etc/passwd
+watch /etc/group
+watch /sudoers
+
+
+# filewatcher and its configuration files
+option scan-frequency 30m
+watch /etc/filewatcher.conf
+watch /usr/sbin/filewatcher
+
diff --git a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..db9d3becf660
--- /dev/null
+++ b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="File control configuration system and IDS"
+HOMEPAGE="https://sourceforge.net/projects/filewatcher/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ dev-perl/MailTools
+ dev-vcs/rcs
+ virtual/mta"
+
+DOCS=( Changes README )
+
+src_install() {
+ keepdir /var/lib/filewatcher /var/lib/filewatcher/archive
+ dosbin filewatcher
+ doman filewatcher.1
+ insinto /etc
+ doins "${FILESDIR}"/filewatcher.conf
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog " A basic configuration has been provided in"
+ elog " /etc/filewatcher.conf. It is strongly"
+ elog " recommended that you invoke filewatcher via"
+ elog " crontab."
+ elog
+ elog " 55,25,40 * * * * root /usr/sbin/filewatcher"
+ elog " --config=/etc/filewatcher.conf"
+}
diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
new file mode 100644
index 000000000000..78a26da23d19
--- /dev/null
+++ b/app-admin/filewatcher/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">filewatcher</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
new file mode 100644
index 000000000000..08b1ba60c211
--- /dev/null
+++ b/app-admin/fleet/Manifest
@@ -0,0 +1,12 @@
+AUX fleet.service 195 SHA256 26145c97b77e18ec6d4e6e637bb627750878554b310fa7b7cc8150aa4d6d8dc8 SHA512 a654cc4f72a5b49c2383713660acfbc127dbc21d363f063a88d0afe02a76c191100b18b6f93bbbce26452458d7afd532a24b44e20bbd321787a63b25178182e5 WHIRLPOOL cf6e50d4d4f0a57b66a7d14f3f4032dda1a4c957ad963b52bba89680fab1678701108cf46a860e2a0e04b008bd2c2f44c259d07c7b301935d00e671ce39174d0
+AUX fleet.socket 42 SHA256 edfda462dda060d70696b5f6df4c875eea3dccb04c5c997e1515b8c335498fae SHA512 85a9bd9bd93c61726ee59e2d00fe3cc7abd91d2f20b1ef2fbb8ad7522f682a2a5376070fa360f3e8c1d19011050fe822445bda4015ed2838efd343242b778230 WHIRLPOOL 5a4878d6cb590dbe1995234fa60a0521edd975e190a204e1deec24e55ad26c4a09794ebe3e3814660c56e3da57a7206d29d9900da49107cc0d10be602260b160
+DIST fleet-0.11.5.tar.gz 456152 SHA256 a6a785099df71645b5fe8755a36baa6c11138749bc02ae4990fd3f52663c0394 SHA512 1d97e386430db948d8730ec26b7d55a1dad00343600400bf21f9a1cb855e068063244ffe55774e72920c210181ff80bd9706ec99fd9eeb2ac28be14bba1dfbf9 WHIRLPOOL 0a9274cc6077eec1790c3fa9ca1ada71723e392cf50f47d17019edc78fe202893053908ba4565beca7f5f6a0bae97d676304df4cd952ff8e06cb0797f41cea89
+DIST fleet-0.11.8.tar.gz 443257 SHA256 22f2f40c1c2938504b31e9dbb54eb6eb54569458a4dffe5e0020e917a5e1f66f SHA512 637332716928efba0f49af1234cfccd1d3979982ad974eb86980263230db5f2bce4eed5dcd80546e371653678e3d3ec448edb50d04b8f336d7402525dfb4ef2f WHIRLPOOL e516a7c0d21455b3a3be2a116473acc255af72c8f03b2eda9fe201b61e259689c536ef7d7f7f1385b42b7e99cce88183a151b33cf85d1f2c42a97e3ddd0e153d
+DIST fleet-1.0.0.tar.gz 4865693 SHA256 671326e84b39714c513a6a6e36ba8375a52ff7114f62eb81fa4b0f8c44c44424 SHA512 77f38b605e37499e31effd82c3c4f0efd6adda73e9ded86db68efcd19a34bdc44b9f6f88b7fc94f7ea4f55b2027a1270d3c87897bf12b121614384a91bd9a3cf WHIRLPOOL 05abd679a5bf232f903ca1d1bf20ed663a6a2fd9b32c2804a9528353200088e04861c348d1d8c2ac9671577188547eef23c1e267dad5fb3d6673fc3e5498335a
+EBUILD fleet-0.11.5.ebuild 892 SHA256 5c00480285aa7a89304d923662b5887ff64d620c5eb80a75f3d3eed4c8bfefa1 SHA512 13dfa0acbaf68d1db6ca15b00850b49a070356447d23e2726f744ffc40a602130add718f60a8e8765f4a9488649db8413aec59bbbfc79a69ef23ad2c63006fba WHIRLPOOL 3bd5536f5d9f44aba5aca16c423862d84babfe0c8bc0630395d9c827b58e04818df2ec7e306a54ba2eae41cb4ec9d2149059b994ec12a988d3f725450cb3f073
+EBUILD fleet-0.11.8.ebuild 892 SHA256 aa3653094fac360fc4660a919691b6158a757200892f091d33ef2158264ec518 SHA512 64ce91a85bea30df7feaf172506a229e2d52e7e352031d493cae58dffdeada77c2761d36cd5422f6198a0f829e05c194de75fa2dce1f242d325b39bd729ff988 WHIRLPOOL 84ba9fdc492a535d5780fc69105e024124e9a28b7c9d6f1a91d7b6f5523b88a0c09c63af0c3615e29f8cb5356216ac4c33ebd4d6b78b62855acb35021ab46d7a
+EBUILD fleet-1.0.0.ebuild 892 SHA256 52f3b90adce4a02580497db7fbf0473efd0f6c4e48a06bffa11ef845b3bc81c6 SHA512 770ca8ab09535293f0811072e0982dab8169ad20341ff4d50882fd3fdaf68aef0ed7f3f7c916e51f519da8878833ed641fce3969e4d6ff9f56d5d431c53848df WHIRLPOOL 1acd227613631d88b307a99045df0e2bb490b65616ee0c53a0876ae540f9288886bccf6aa03a65151f6e3d8a3027278b22415a913d66670e0750cb9e15fd7139
+EBUILD fleet-9999.ebuild 828 SHA256 9433e72340d27f564e8528ed6941ebf17a51e5b9d531b43458d44fbc40eaf279 SHA512 4b61f4138e8eb306f38a9cc1aaa637bb75d4d779e000cbe481313576151bd47a1d5f1bbdbe752b283ead3d0cfa0646db62d4e93f018763d9b5e2007b75a10e5a WHIRLPOOL 04c00c2af66bdb79fca70dbff8d141ee05ad9e3c310c6806f91ceb045464377740fe34254aea246d9e493822ed299441ab04f40d76987880c12ace07b6da2dcf
+MISC ChangeLog 3864 SHA256 deda46c56b2595b0c0f3946e964e96556a94299fe9de5fa7437c7e6c83eb50ea SHA512 c12015b78989174b57bbcfeff3f2784100c63faa157e32200771053079d9ff1236b165c4b1b30f9e1ed21484e910594c1b8d4010fce90cd9d2e80c5822eb2dc4 WHIRLPOOL 4fe53deb1731581ffab78ce9718c5921c2bd9f54844ffa09010788f65c265b208fc949fadf400cff3989eefe33ab79617b6843de7a3ef296ae6c84ba6dfd16bf
+MISC ChangeLog-2015 4039 SHA256 88b3196fd6f19c6377b9c5b7ab90efdebb13226717cd4d5360241ead7d38661c SHA512 043111b214f54aa223d233fdfd27a914d3edd415b5f55b451c422d39d2902f44ea614ed1f084cdf5a06a5e244cafdda97f5b7f69b9eddb7e8477ad5911709fa5 WHIRLPOOL d39c4968a9e9f6f9a4d91f09fc41b47b458b48cba18b48cdd5a0e4fea30f9d3f1f86a0a6d0f9981ece0ee50df0eedab7ccd4575bc64cd9688fab4a6b8d405b32
+MISC metadata.xml 249 SHA256 6a593831b4080a44b377d41494a6aa21036b23318f6298dbc3174632e0c26cd5 SHA512 a7cb996459f6adb6863fa7d51363ebcc5e4bee2a62b0416b1fc17767aa145442de6d3bceb69aa19cc59e3b5e7b51f06ee87bc4d2a4b1cc5f2b7c9c7caa60cac9 WHIRLPOOL 78c7d73c4c4c17368db7c6117fb8430dc52574d1016ab909aeca4e1581d1fd3931fb70443beed14a26e698dcb32fd1727980315d86793823cd14560033ceb238
diff --git a/app-admin/fleet/files/fleet.service b/app-admin/fleet/files/fleet.service
new file mode 100644
index 000000000000..1f44fe9df62c
--- /dev/null
+++ b/app-admin/fleet/files/fleet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=fleet daemon
+Wants=etcd.service
+
+Wants=fleet.socket
+After=fleet.socket
+
+[Service]
+ExecStart=/usr/bin/fleetd
+Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/fleet/files/fleet.socket b/app-admin/fleet/files/fleet.socket
new file mode 100644
index 000000000000..4fc446e8fe37
--- /dev/null
+++ b/app-admin/fleet/files/fleet.socket
@@ -0,0 +1,2 @@
+[Socket]
+ListenStream=/var/run/fleet.sock
diff --git a/app-admin/fleet/fleet-0.11.5.ebuild b/app-admin/fleet/fleet-0.11.5.ebuild
new file mode 100644
index 000000000000..b983d3184a10
--- /dev/null
+++ b/app-admin/fleet/fleet-0.11.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN="github.com/coreos/fleet"
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+ >=dev-lang/go-1.4:=
+ test? ( dev-go/go-tools )
+"
+RDEPEND=""
+
+src_compile() {
+ ./build || die 'Build failed'
+}
+
+src_test() {
+ ./test || die 'Tests failed'
+}
+
+src_install() {
+ dobin "${S}"/bin/fleetd
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/fleet.service
+ systemd_dounit "${FILESDIR}"/fleet.socket
+
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+
+ insinto /etc/${PN}
+ newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/fleet-0.11.8.ebuild b/app-admin/fleet/fleet-0.11.8.ebuild
new file mode 100644
index 000000000000..2de9c9d839c5
--- /dev/null
+++ b/app-admin/fleet/fleet-0.11.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN="github.com/coreos/fleet"
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+ >=dev-lang/go-1.4:=
+ test? ( dev-go/go-tools )
+"
+RDEPEND=""
+
+src_compile() {
+ ./build || die 'Build failed'
+}
+
+src_test() {
+ ./test || die 'Tests failed'
+}
+
+src_install() {
+ dobin "${S}"/bin/fleetd
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/fleet.service
+ systemd_dounit "${FILESDIR}"/fleet.socket
+
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+
+ insinto /etc/${PN}
+ newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/fleet-1.0.0.ebuild b/app-admin/fleet/fleet-1.0.0.ebuild
new file mode 100644
index 000000000000..9f43c632f33a
--- /dev/null
+++ b/app-admin/fleet/fleet-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGO_PN="github.com/coreos/fleet"
+
+inherit systemd vcs-snapshot
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+DEPEND="
+ >=dev-lang/go-1.5:=
+ test? ( dev-go/go-tools )
+"
+RDEPEND=""
+
+src_compile() {
+ ./build || die 'Build failed'
+}
+
+src_test() {
+ ./test || die 'Tests failed'
+}
+
+src_install() {
+ dobin "${S}"/bin/fleetd
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/fleet.service
+ systemd_dounit "${FILESDIR}"/fleet.socket
+
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+
+ insinto /etc/${PN}
+ newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
new file mode 100644
index 000000000000..07945ac690b8
--- /dev/null
+++ b/app-admin/fleet/fleet-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit git-r3 systemd
+
+EGIT_REPO_URI="https://github.com/coreos/fleet.git"
+
+DESCRIPTION="A Distributed init System"
+HOMEPAGE="https://github.com/coreos/fleet"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples test"
+
+DEPEND=">=dev-lang/go-1.3:=
+ test? ( dev-go/go-tools )"
+RDEPEND=""
+
+src_compile() {
+ ./build || die 'Build failed'
+}
+
+src_test() {
+ ./test || die 'Tests failed'
+}
+
+src_install() {
+ dobin "${S}"/bin/fleetd
+ dobin "${S}"/bin/fleetctl
+
+ systemd_dounit "${FILESDIR}"/fleet.service
+ systemd_dounit "${FILESDIR}"/fleet.socket
+
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ use examples && dodoc -r examples
+
+ insinto /etc/${PN}
+ newins "${PN}".conf.sample "${PN}".conf
+}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
new file mode 100644
index 000000000000..f9232c26e479
--- /dev/null
+++ b/app-admin/fleet/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">coreos/fleet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/fsvs/Manifest b/app-admin/fsvs/Manifest
new file mode 100644
index 000000000000..c66fec191904
--- /dev/null
+++ b/app-admin/fsvs/Manifest
@@ -0,0 +1,7 @@
+AUX fsvs-1.2.5-as-needed.patch 1125 SHA256 b0d2dff26b3e13265da08bc50009b104cb88e1b3753ef092fe32d63118940692 SHA512 b477dc3525eac7cf3d4377f61e7b471c16f346e2fd357969bf40141ebab7eff817a7d122ac0c707ba4b12177fa849f6f193a18540f0f7e8d251ec468a5435848 WHIRLPOOL 6ae767362474af8ad296b5e7493e0cf5188fd853f838c53485c43fe4989650b1cd428e46dddcd3ab1462cb5d71498aa69cff47927fc6d8594fdc159b51393adb
+DIST fsvs-1.2.5.tar.bz2 427494 SHA256 3c957d29e0e568d46ce2fd659a88ed6ea93a05267bdc11dc93131a88b7cb44d2 SHA512 36ab5d04491d506b2891548f3ad458e7977bbd2e7d4b03e135b13d07adb22aedb261c28d5ddd3df895771806ef54c1bca6a1ef7bc5aa2e50e4b234ddf6cbe19c WHIRLPOOL c44213b5f2ce42ad67914fe07198a4f8404b9303d59806e521059d1f5b6335ef6ba3b84862bb9b890b8a29ef2b4543f2e897ef341c16ccb96e6e7a6d1ac8dd66
+EBUILD fsvs-1.2.5-r1.ebuild 1332 SHA256 f64171d04915b19739bf7b788597655644b26f643b1f4c7839083f3ce3696493 SHA512 6672d334845d606c4559249db6afb756e9fb7491b2a9f0466427e0017f222d5dc9cd9dcd2fac1eae13ece00f4043d4e0b6de20dbb176529c835c6b7102bbf471 WHIRLPOOL b46dcf729c8c4b83d633d98a9805f353243d53c7cc502e2f51fe6a8fc6a59cb250b2b7f6156506d7784e135da585c9ba9151933beed7ddff468dbe1af713c349
+EBUILD fsvs-1.2.5-r2.ebuild 1420 SHA256 f7f38bb17d2bb0775c9d0ac85f2947591518d35af3e495b4691aa4c92928684b SHA512 822aba3587ec4871be28300ce3de3c2da7b4b5882a719aa6c2cbb4f97cdcc5e4d2c554e291125c795ccb746a886cfac49120a8070aec936b775a7e0af42769bc WHIRLPOOL 02e2efd9e381396f9239fffe883a577c1ca7eeff7168c1e410d6543446db2cf621578153e0c3dca5c75a5c7a8dd7d692b4b6f6fb58336253b58e4bb793b1b10a
+MISC ChangeLog 2817 SHA256 e0914d79407a41a4439a89a0a787ac8b8a22f312a9eee26b20cd369a8fb417ac SHA512 796767ec18af7a04e611c9092cf198df790168bbbf0afb1fadf6defe6f2cbcf0720dfe3e29c8817330c8f87193c1f99d5eac250295b56ecc891cc5708d1b3cea WHIRLPOOL 84ad23eb7f7c99451f7ceea07559abffb8df8cd07e6e569d2f9a434cc97f726ef4d91d405ab5e71aa484152fca0086212a78f879c47fc9afd0a58a12eef50c69
+MISC ChangeLog-2015 1742 SHA256 0f77d5993ae17b7c7e9160e8ce7fc99c543afad8399a75c1a726d842a257996f SHA512 86d2422ddc3865b1d3a1f7b02d5184b143f0058e875aa16e17358a375977cfb6ef5f14083981bfec9b1d47a6dfeef137267b913eb8a143ec98c7d323160d9664 WHIRLPOOL 2350ddebe1c007d95ab55f4d64705483593f2347a155deb1c304a0b224102d257f44ee3e8c249108ef6fed847a6eab66e18718a3c1aeb2a703744a91d2c377d1
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
new file mode 100644
index 000000000000..f06070f4beee
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -0,0 +1,31 @@
+Fixes --as-needed support(bug #294834)
+Verbose build
+Fixes underlinking(bug #463684) - patch went upstream
+
+--- fsvs-1.2.5/src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400
++++ fsvs-1.2.5/src/Makefile.in 2013-08-19 13:30:16.186082295 +0400
+@@ -18,7 +18,7 @@
+ CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
+ CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
+ LDFLAGS := @LDFLAGS@
+-FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm
++FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl
+ EXTRALIBS := @EXTRALIBS@
+ WAA_CHARS?= @WAA_WC_MD5_CHARS@
+
+@@ -146,13 +146,13 @@
+ ################################ Rules ######################################
+ %.o: %.c
+ @echo " CC $<"
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ # if the Makefile has changed, the output will (at least sometimes)
+ # change, too.
+ $(DEST): $(C_FILES:%.c=%.o)
+ @echo " Link $@"
+- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
++ $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
+ ifeq (@ENABLE_RELEASE@, 1)
+ -strip $@
+ endif
diff --git a/app-admin/fsvs/fsvs-1.2.5-r1.ebuild b/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..70dbab7a23c0
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+ dev-libs/libpcre
+ sys-libs/gdbm
+ dev-libs/apr-util
+ dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+ epatch_user
+}
+
+src_compile() {
+ # respect compiler
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/fsvs
+ dodir /etc/fsvs
+ keepdir /var/spool/fsvs
+ doman doc/*5 doc/*1
+ dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+ elog "Remember, this system works best when you're connecting to a remote"
+ elog "svn server."
+ elog
+ elog "Go to the base path for versioning:"
+ elog " cd /"
+ elog "Tell fsvs which URL it should use:"
+ elog " fsvs url svn+ssh://username@machine/path/to/repos"
+ elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+ elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+ elog " fsvs ignore DEVICE:0 ./tmp/*"
+ elog "And you're ready to play!"
+ elog "Check your data in:"
+ elog " fsvs commit -m \"First import\""
+}
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..35d79e90877b
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+ dev-libs/libpcre
+ sys-libs/gdbm
+ dev-libs/apr-util
+ dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+ # fix #570596 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ default
+}
+
+src_compile() {
+ # respect compiler
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/fsvs
+ dodir /etc/fsvs
+ keepdir /var/spool/fsvs
+ doman doc/*5 doc/*1
+ dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+ elog "Remember, this system works best when you're connecting to a remote"
+ elog "svn server."
+ elog
+ elog "Go to the base path for versioning:"
+ elog " cd /"
+ elog "Tell fsvs which URL it should use:"
+ elog " fsvs url svn+ssh://username@machine/path/to/repos"
+ elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+ elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+ elog " fsvs ignore DEVICE:0 ./tmp/*"
+ elog "And you're ready to play!"
+ elog "Check your data in:"
+ elog " fsvs commit -m \"First import\""
+}
diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/fsvs/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-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
new file mode 100644
index 000000000000..961a9647691f
--- /dev/null
+++ b/app-admin/gam-server/Manifest
@@ -0,0 +1,12 @@
+AUX gam-server-0.1.10-G_CONST_RETURN-removal.patch 2470 SHA256 adddd1f54bb33669d9163398308ebb732f33b6c12b1363a0dcf765ff28fc30ad SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c WHIRLPOOL 425495ec6bb9cc5993631b9c5ef24d33261f71e9a039120a373235bae3cb386b8a938cd06714a6fba57a2378f868d372b063efc325bc98faa43b3c136c4d00b1
+AUX gam-server-0.1.10-armel-features.patch 1490 SHA256 6b6faf3084ca2ddf577575395172901d637a96e5db8dd42bc5268d58a767d30e SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5 WHIRLPOOL 935fde8a3683a1cb9f7f44307fe136a7f8251982501e54209625bee681d8ef23cfbf27d5f8b127da200a800c778b91013124ddd8caf970810c018d7f44dc356a
+AUX gam-server-0.1.10-crosscompile-fix.patch 764 SHA256 27e92227c19a6ae61336f66cefe7d44fca43fe7e0c8122fe32c313b4d848f28c SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23 WHIRLPOOL 61c2c95cd7874eb106fcb1e474a10e21ce79d0c10220520810d904e4dac106ccfe12a09782d0ea7cb42c7369a1226fca9b7f4d826e5f62140713ea6a8ac967c2
+AUX gam-server-0.1.10-ih_sub_cancel-deadlock.patch 2090 SHA256 75cee6cb0210cec02be1e042454f561da20724c55810f968b0a5f4972f9cbfd5 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de WHIRLPOOL 9d5b26134ccd1e13c25f5bfe3295bdec7c1a8cdd73f21b1cb65ff50dc910e533c3ac5b28508cb7f93a15096e365aa25cdaf9f32d8d76cadf435215b8aebdb090
+AUX gam-server-0.1.10-noinst-lib.patch 2207 SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7 SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb WHIRLPOOL d3605973df5f148d03d65a6660925dd2c1bca5bda9574714fb3259f630341cdeb3d5d7c73986fa0a6eacb0f34c584eb25c8f6ed431d1b95df21a974241678124
+DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8
+DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
+DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
+EBUILD gam-server-0.1.10-r2.ebuild 2664 SHA256 93048b0a3b29666e5eef19656c6c00c7c97017ad732e5422800c3f6047e1161c SHA512 56b91a5835716984c15b245690be43c40fbca3218a872060c08923c48132d2eab092c963fe6ca6b7b0439801dbf0936191c22ab0ba1480059f4b616e6a25023a WHIRLPOOL ede95d14f6b72512e54157839e9024ea4e8a5eefaa4c4864ff335f57b2d47aee5395a273a583813036fcc62866c48988c168da10c0b553329e080e197995bebc
+MISC ChangeLog 3833 SHA256 7b00c8c70b9638eabde8fd2fa954e20afe4bd45befa9b05ae413d5ba664c6399 SHA512 0274ff8e3c8527d9957dbddb43a7926162e30579a2d56bbad614d19b9c856a70323fe78ff4d6b96d52e2936591ccb68d181c3d2fb1966b38ea8e83bd546df6a6 WHIRLPOOL 47e546419dc3fcfbabc53376307cc874136681ff1efd94e22dc71037aa1ca64c43090ae7eddf170a6338a4fafa552bb1fca6af70da98fe90bbf73aa5c515dd0f
+MISC ChangeLog-2015 5279 SHA256 d97b1bab3adac87503be5dd5d16026f19f4bd2e28d3d9dc42480ad7e0b753784 SHA512 e9b0581f2b72f65882b80c3731f5cd9aa753b54be90f08fceb6b529585ddd0b30fbeb2af4f990b8d3f98a233b5eec9fb5272ce6fa403fb99b72f16d06d10447b WHIRLPOOL d557d11c6823042219b7a80b380d01fe2249bbef558939ff68153be977a29e0ddb01bf5150dd679f9f1ba6b288947dac44516ec849e20ab85143502be4de0075
+MISC metadata.xml 232 SHA256 6f828dfe6278daec9b0b3a9eeb589d072d79dba873dca6a50422e554c2f3582c SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 WHIRLPOOL 95b029eb4fea616dbf4f41cb372a67a13b7f5d67d9dad52bc27b4597bd1cf73b00fa34ddd8637495337a469162e3086075e8e69734a2147eb89d940fe048159a
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch b/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch
new file mode 100644
index 000000000000..087312f5baae
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch
@@ -0,0 +1,67 @@
+From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
+From: Maciej Piechotka <uzytkownik2@gmail.com>
+Date: Tue, 13 Sep 2011 09:47:05 +0200
+Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN
+
+---
+ server/gam_node.c | 2 +-
+ server/gam_node.h | 2 +-
+ server/gam_subscription.c | 2 +-
+ server/gam_subscription.h | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/gam_node.c b/server/gam_node.c
+index 02358ba..d0302d2 100644
+--- a/server/gam_node.c
++++ b/server/gam_node.c
+@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
+ * it has finished with the string. If it must keep it longer, it
+ * should makes its own copy. The returned string must not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_node_get_path(GamNode * node)
+ {
+ g_assert(node);
+diff --git a/server/gam_node.h b/server/gam_node.h
+index 02c8692..83349a8 100644
+--- a/server/gam_node.h
++++ b/server/gam_node.h
+@@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node);
+ void gam_node_set_is_dir (GamNode *node,
+ gboolean is_dir);
+
+-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
++const char *gam_node_get_path (GamNode *node);
+
+ GList *gam_node_get_subscriptions (GamNode *node);
+
+diff --git a/server/gam_subscription.c b/server/gam_subscription.c
+index dfa3273..4675b34 100644
+--- a/server/gam_subscription.c
++++ b/server/gam_subscription.c
+@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
+ * @param sub the GamSubscription
+ * @returns The path being monitored. It should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ gam_subscription_get_path(GamSubscription * sub)
+ {
+ if (sub == NULL)
+diff --git a/server/gam_subscription.h b/server/gam_subscription.h
+index d894fbe..e6b4e15 100644
+--- a/server/gam_subscription.h
++++ b/server/gam_subscription.h
+@@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub);
+
+ int gam_subscription_get_reqno (GamSubscription *sub);
+
+-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
++const char *gam_subscription_get_path (GamSubscription *sub);
+
+ GamListener *gam_subscription_get_listener (GamSubscription *sub);
+
+--
+1.7.6.1
+
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch b/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch
new file mode 100644
index 000000000000..fdfcbd7e6db6
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch
@@ -0,0 +1,47 @@
+From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
+From: Sebastian Dröge <slomo@debian.org>
+Date: Tue, 15 Dec 2009 12:24:25 +0000
+Subject: Bug 588338 - Enable linux specific features on armel
+
+---
+diff --git a/configure.in b/configure.in
+index b0bbaec..e4b684e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -176,7 +176,7 @@ fi
+
+ dnl check what OS we're on
+ #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
+-if test x$target_os = xlinux-gnu; then
++if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
+ AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
+ fi
+
+@@ -223,7 +223,7 @@ fi
+ dnl check if inotify backend is enabled
+ AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
+
+-if test x$os = xlinux-gnu; then
++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
+ AC_ARG_ENABLE(dnotify,
+ AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
+ [dnotify="${enableval}"], [dnotify=true])
+@@ -297,10 +297,12 @@ else
+ fi
+
+ dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
+-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
+- if test "${CC}" = "gcc" ; then
+- echo Use weak symbols !
+- THREAD_LIBS=
++if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
++ if test x$WITH_THREADS = x1 ; then
++ if test "${CC}" = "gcc" ; then
++ echo Use weak symbols !
++ THREAD_LIBS=
++ fi
+ fi
+ fi
+ AC_SUBST(THREAD_LIBS)
+--
+cgit v0.9.0.2
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
new file mode 100644
index 000000000000..ce3a15b5e160
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
@@ -0,0 +1,38 @@
+--- configure.in.orig 2009-04-26 23:00:43.445135823 +0300
++++ configure.in 2009-04-26 23:25:04.042489243 +0300
+@@ -389,8 +389,7 @@
+
+ AC_MSG_CHECKING(abstract socket namespace)
+ AC_LANG_PUSH(C)
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-[[
++AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -398,8 +397,8 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <errno.h>
+-]],
+-[[
++
++int main() {
+ int listen_fd;
+ struct sockaddr_un addr;
+
+@@ -424,9 +423,11 @@
+ }
+ else
+ exit (0);
+-]])],
+- [have_abstract_sockets=yes],
+- [have_abstract_sockets=no])
++}
++],
++have_abstract_sockets=yes,
++have_abstract_sockets=no,
++have_abstract_sockets=no)
+ AC_LANG_POP(C)
+ AC_MSG_RESULT($have_abstract_sockets)
+
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch b/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch
new file mode 100644
index 000000000000..9f2b2a5150bd
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch
@@ -0,0 +1,65 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+---
+ server/inotify-helper.c | 7 ++-----
+ server/inotify-helper.h | 1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+
+ /**
+ * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+ */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+- G_LOCK(inotify_lock);
+-
+-
+ if (!sub->cancelled)
+ {
+ IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ sub_list = g_list_remove (sub_list, sub);
+ }
+
+- G_UNLOCK(inotify_lock);
+ return TRUE;
+ }
+
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
+ found_callback_t fcb);
+ gboolean ih_running (void);
+ gboolean ih_sub_add (ih_sub_t *sub);
+-gboolean ih_sub_cancel (ih_sub_t *sub);
+
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+--
+1.7.7.2
+
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch b/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch
new file mode 100644
index 000000000000..1f2fcff6f5b4
--- /dev/null
+++ b/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch
@@ -0,0 +1,76 @@
+From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Mon, 20 Oct 2008 19:17:36 +0200
+Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib
+
+---
+ lib/Makefile.am | 4 ++--
+ libgamin/Makefile.am | 15 ++-------------
+ server/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 3e2289c..af2152a 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,9 +7,9 @@ if GAMIN_DEBUG
+ INCLUDES += -DGAM_DEBUG_ENABLED
+ endif
+
+-lib_LIBRARIES = libgamin_shared.a
++noinst_LTLIBRARIES = libgamin_shared.la
+
+-libgamin_shared_a_SOURCES = \
++libgamin_shared_la_SOURCES = \
+ gam_event.c \
+ gam_event.h \
+ gam_error.c \
+diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am
+index 35aa740..14fc06b 100644
+--- a/libgamin/Makefile.am
++++ b/libgamin/Makefile.am
+@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES = \
+ gam_data.h \
+ gam_fork.c \
+ gam_fork.h \
+- gam_protocol.h \
+- gam_error.c \
+- gam_event.c
++ gam_protocol.h
+
+-gam_error.c: $(top_srcdir)/lib/gam_error.c
+- @(cp $(top_srcdir)/lib/gam_error.c gam_error.c)
+-
+-gam_event.c: $(top_srcdir)/lib/gam_event.c
+- @(cp $(top_srcdir)/lib/gam_event.c gam_event.c)
+-
+-CLEANFILES=gam_error.c gam_event.c
+-
+-libgamin_1_la_LIBADD =
++libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la
+
+ libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \
+ -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@
+@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin
+
+ gamin_SOURCES = gamin.c
+ gamin_LDFLAGS =
+-gamin_DEPENDENCIES = $(DEPS) libgamin-1.la
+ gamin_LDADD= $(LDADDS) libgamin-1.la
+
+diff --git a/server/Makefile.am b/server/Makefile.am
+index 37aed8b..6aa5e02 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -80,7 +80,7 @@ endif
+
+ gam_server_LDFLAGS =
+ gam_server_DEPENDENCIES = $(DEPS)
+-gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS)
++gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS)
+
+ if ENABLE_HURD_MACH_NOTIFY
+ gam_server_LDADD += -lports -lthreads
+--
+1.6.0.2
+
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
new file mode 100644
index 000000000000..1e702f0edf80
--- /dev/null
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils flag-o-matic libtool multilib gnome.org
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
+SRC_URI="${SRC_URI}
+ mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-solaris"
+IUSE="debug kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2:2
+ >=dev-libs/libgamin-0.1.10
+ !app-admin/fam
+ !<app-admin/gamin-0.1.10"
+
+DEPEND="${RDEPEND}"
+
+#S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+ # Fix compile warnings; bug #188923
+ epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
+
+ # Fix file-collision due to shared library, upstream bug #530635
+ epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
+
+ # Fix compilation with latest glib, bug #382783
+ epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
+
+ # Fix crosscompilation issues, bug #267604
+ epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
+
+ # Enable linux specific features on armel, upstream bug #588338
+ epatch "${FILESDIR}/${P}-armel-features.patch"
+
+ # Fix deadlocks with glib-2.32, bug #413331, upstream #667230
+ epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
+
+ # Drop DEPRECATED flags
+ sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
+
+ sed -i \
+ -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+ -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+ configure.in || die #466948
+
+ # autoconf is required as the user-cflags patch modifies configure.in
+ # however, elibtoolize is also required, so when the above patch is
+ # removed, replace the following call with a call to elibtoolize
+ AT_M4DIR="${WORKDIR}" eautoreconf
+}
+
+src_configure() {
+ # fixes bug 225403
+ #append-flags "-D_GNU_SOURCE"
+
+ # Solaris' patchs adds this to configure, but it conflicts with
+ # Gentoo's FreeBSD patch.
+ [[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
+
+ if ! has_version virtual/pkgconfig; then
+ export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+ export DAEMON_LIBS="-lglib-2.0"
+ fi
+
+ econf \
+ --disable-debug \
+ --disable-libgamin \
+ --without-python \
+ $(use_enable kernel_linux inotify) \
+ $(use_enable debug debug-api)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
new file mode 100644
index 000000000000..f3cab85cf603
--- /dev/null
+++ b/app-admin/gam-server/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="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
new file mode 100644
index 000000000000..fe23ae5961d1
--- /dev/null
+++ b/app-admin/gamin/Manifest
@@ -0,0 +1,4 @@
+EBUILD gamin-0.1.10-r1.ebuild 627 SHA256 4c1391578e4a7e53bb4133a8b2d2591827b93dbe545250548c166a9849ee4e51 SHA512 067f2d8c924dd8125db5e4ae3fcda1c31b2dcae72cecafc45871e666176d262f73fd107bb45580c6253dd215cc896d32e25aa9c8fcdf86c4fd013a397209a3e9 WHIRLPOOL d686999ac557c68f75a7d92d8cdb64ca4efa3501a57189f2f34f3df9faa460884ac422497e9b04f24287b36cb1c2fd8ff5fca39c00f5e79174d8b46e9988040d
+MISC ChangeLog 2602 SHA256 c2a8c8a52895ecb7e55aa86721375e22c137317e7698507b3168f5d05128773d SHA512 5c2307629a16cb6d9bdb51cf04bc5c74bdb64e4341330f45da360734573caee546633dcc63d064a933872042802bfb02962c3aab49652d7bef52c2208abd1c61 WHIRLPOOL f734814a151fa95d887e40db5b7f9aaf900a55c49f730fab8a877bb5eda50ca8056381ddca4eddf732fb1ff17460d21d4cd7d266dfde37912b7b5b94d9304060
+MISC ChangeLog-2015 15390 SHA256 b27a606a318ab4062a8f2c2c3641462a1ffd803c19f6cd0f5b69b15eb263c1cc SHA512 3a9538fed3c20d8f285e5508f8b37d700d7a23dd1f993607ae3ebb4943dd3d38560a30e5b8b58d61c37c74c0ad050eb6bf757084ab6a64d8cef3327a73db2cae WHIRLPOOL 57de2eef2da19e5e78eb671f2d10bf3048e3c6de87d3762d54d9692b58aaa510edd0d85f5668e16ed07bd5f004aedbedc83e8a0150ad2aa3c077bcdec51d3f8a
+MISC metadata.xml 224 SHA256 154bec891472fe5526579d16d7e5e5e9eb3f352512a17555a459aa6029bcbbb2 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 WHIRLPOOL 541aeaf2a7c858734aaae366846865ff70e6c898204bbfc9f39f58fbdb53d9b37dc8c898c23870859a9d4f5596e7898e21874c9ef529a447953a35e4d7bc13e5
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..3c16ea2b1317
--- /dev/null
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="Meta package providing the File Alteration Monitor API & Server"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
+SRC_URI=""
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!app-admin/fam
+ >=dev-libs/libgamin-0.1.10-r4[${MULTILIB_USEDEP}]"
+DEPEND=""
+
+PDEPEND=">=app-admin/gam-server-0.1.10"
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
new file mode 100644
index 000000000000..fb76b944f2da
--- /dev/null
+++ b/app-admin/gamin/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="project">
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
new file mode 100644
index 000000000000..6343d6d7e75c
--- /dev/null
+++ b/app-admin/genromfs/Manifest
@@ -0,0 +1,6 @@
+AUX genromfs-0.5.2-build.patch 547 SHA256 5d76afca199b950fd0abcfbceabbb1b02d7e43f3d0e99fc8f87fe41e9b344775 SHA512 b4d0f162c5605f0dedef2a08c0f6abe0ffc78e66dd74d2b8f2df33bcc190b002384e0f2c1394502564906553412aa8ab688d359ba435f6c43af5abae1d9970e3 WHIRLPOOL feb1baec180c5b7d2b7345bc924b4dd36d46db40d2249920047876fa8cd32ee77fe56e273ca3e3f922e84f67e1363998562f8dd35a64d81b91303d0357347386
+DIST genromfs-0.5.2.tar.gz 21069 SHA256 30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960 SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f WHIRLPOOL a3fbf809c62383268c1b1e728a29934e0b57caf72826918fffaeeea7e0485935ab79efd9cabb9018e4cc0934ef7cc2adfe6929e0f9c831e50dc0eb1f7f773139
+EBUILD genromfs-0.5.2.ebuild 568 SHA256 02617133367215b4c0b7f8b1feaa58d9c821d0e6c9a7946c6200e0836469a448 SHA512 50b3278bcb738b0a64ed6111299c184e9145f58dd7adccf42ce5b30cf1e1163e1e78d61dce36e6e49859db06ecfb7cf417b62132c41e8b27b251cebe271570d6 WHIRLPOOL c611327a9f660d427b1241a6229644e3e9a9a75c18c293e01ef46a4ecc29dea06088f2977ec310ba8d7b083c2196b7e6034a5fa1e402f94ea81105cdb10efe90
+MISC ChangeLog 2561 SHA256 cc5ad45baa164d78328544b0d2e2ca6ea4d31d6d55fb013fcea7650cf83aee94 SHA512 c4a522ce018c1c065f067fd88e7a794435421898ad73962cb31a5d79df4731e219103dba1593908fd81b801cef3240bea4103e6463b9199191ee59d1f7e0342c WHIRLPOOL 0515d2208be23917266dea7ea552a9c14835f3c539af54a9338d970a2b86b1c1cf0e03ca759cb64d17d67fbb21c49627bc09f194ac2ba2ffa15dde529d1684fd
+MISC ChangeLog-2015 2179 SHA256 8ded20bb90d74bdae1fdb0dedc6785fcf1c6ae1cafb8a3cc7f007a793eee0a34 SHA512 f65cb3a550a2de5539e7356f6958164cc676688464ec0f049a6f54aae236f423328b859d359327e7e500b52cedcf4b3ab40054fc9b702c16e74450bbfdf0fb02 WHIRLPOOL 8696a090a53efa4f0f56faf12048a5f7e63e8cfb9d267a29aae761f753291580e04b3fd6e0e1601205ec677b48b3479339996ccfc4862a73a5c23f2ceb30c065
+MISC metadata.xml 349 SHA256 fca86c4a090e6a85b183b76e2c4a94da23cb22cf8551eac414710a6699ca54ef SHA512 b86036d8e4288d5ae248bab2335ae74715950c2a6baf385c23b711a4700232961e504dcded46f39b57a520589e83c79c48111fa8c9635a63298acdcf21381912 WHIRLPOOL 4b547b535cdb0bf62a53e4c58cb37642588c0ca56111eaa7dd54ee57eba00648165f76510bb6b21f965c7dce6d6c3a055fbc0a922622c6f8f65ad7dbae8d7477
diff --git a/app-admin/genromfs/files/genromfs-0.5.2-build.patch b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
new file mode 100644
index 000000000000..1fbc29fb7d5c
--- /dev/null
+++ b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
@@ -0,0 +1,28 @@
+--- Makefile
++++ Makefile
+@@ -5,9 +5,10 @@
+
+ PACKAGE = genromfs
+ VERSION = 0.5.2
+-CC = gcc
+-CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g#
+-LDFLAGS = -s#-g
++CC ?= gcc
++CFLAGS ?= -O2
++CFLAGS += -Wall -DVERSION=\"$(VERSION)\"#-g#
++LDFLAGS ?= -s#-g
+
+ DISTDIR = $(PACKAGE)-$(VERSION)
+
+@@ -16,9 +17,9 @@
+ readme-kernel-patch genrommkdev romfs.txt \
+ checkdist
+
+-prefix = /usr
++prefix = $(DESTDIR)/usr
+ bindir = $(prefix)/bin
+-mandir = $(prefix)/man
++mandir = $(prefix)/share/man
+
+ genromfs: genromfs.o
+ $(CC) $(LDFLAGS) genromfs.o -o genromfs
diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
new file mode 100644
index 000000000000..3b3fd2b0b57b
--- /dev/null
+++ b/app-admin/genromfs/genromfs-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
+HOMEPAGE="http://romfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc ~ppc64 s390 x86"
+IUSE=""
+
+DOCS=( ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
new file mode 100644
index 000000000000..cf9dbee3a273
--- /dev/null
+++ b/app-admin/genromfs/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>A readonly filesystem designed to be small and very space
+ efficent</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">genromfs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
new file mode 100644
index 000000000000..6e74c4a86ac7
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -0,0 +1,9 @@
+DIST gentoo-perl-helpers-0.1.0.tar.xz 6692 SHA256 e2c0e3eabbdba194460547d4b2beb2b632ff12833bff2454fc7e8a1f57772158 SHA512 929921c4584d990b53163413b58d4fd7a8868073c03095e90914c3565e65d5ee3e86e2c5269079b4c683c9db6fe5e035358539f62091fbc24af818e6330d414b WHIRLPOOL 372f38e18e2c386ad535df36c686597cb9db51fe166d9946a3d10750d85052fd08c242a5c1c781722b63cb4d79d15bd1b6de8d9ce54553511f505d3ca29ade85
+DIST gentoo-perl-helpers-0.2.0.tar.xz 8876 SHA256 73ed0e54870ca3979067251c35750a21a034501894e07d0626f03dbb19b77250 SHA512 f9c534436dc3ad7bc2c50e47491ef3a76bf949e2065c182391b3526e259ce93e9eb4ef1b9d981d6dbf3924394150b90ee6460f51f67d79505039b826af374d95 WHIRLPOOL f8b3eb49ff34b4b43637069496ed396f1c34d4abebba773889268e4eab7ea0a0cec7d39389c501f8c1285893c4193b34e3b2a6eb7270a0daf53d9c81788f6efd
+DIST gentoo-perl-helpers-0.2.1.tar.xz 8904 SHA256 6e6e5e1a0162771cc7874dbd86910790bed9538e82355875308eafd3691d44c4 SHA512 f2815f0bc893faa815482333c79da0ea81eedb0919d9eec9d2403e0f6d886fa28561221a4f1b4b9d48b6182dea37a02ab79fcea2322a837817948428146a5ba3 WHIRLPOOL fe9742df1235a010a1c52249b510230d65668f3c95da75a0161e9d43431cc41336c77d9748126f77619a19fe0daec1bce0be7c1798b39ca57f52dab25e99f232
+DIST gentoo-perl-helpers-0.2.2.tar.xz 9096 SHA256 1b6479d573f14458e3daa7a4b75b8c30867b480d1f94ca70c03c261bbd867ba3 SHA512 97653cbcff01cb65b5aa8b5e56ecdafedddfed773b8f41120707066d8c3d837634b9d2996eeed069cf434175684ac38a0e829719dd88a3bfd14e2e0ab6f80a14 WHIRLPOOL cd0fa43068dd30b7ee971e14006cf6818fdd22c89a88937a39b64fdf73c29f4066a1f27673485bb406ca41acf6234c4a87e2283b18081041ac22683700892e6b
+EBUILD gentoo-perl-helpers-0.1.0.ebuild 1055 SHA256 7831f87f8f9c4f838f3f5b612dec4b3366448ca3066e9ca3563ed8e816495c4d SHA512 78c626c5652693877c5cbeca909ecc2e93a798af83b1b6fef70b7be0a41b2e8ada39b752fe0c982670eb7cfc77525d94fe5c5294725848d339dba8d3b96adcd1 WHIRLPOOL 5fa288ac3ff91c6bbf5e46f093b586825467094081a8b1473e17871b81dc2f6405a568c0d418c55caf2de850f4ae935fb52ae22e56600cbc260f3d40e7614fff
+EBUILD gentoo-perl-helpers-0.2.0.ebuild 1218 SHA256 2f9ed22d919d2b1760a535855463036fbb63849507893d4bfffb5d64ab1e955d SHA512 6a3381deac08ecca97f24f3ff2d8582658998167d18f6267a2ea83eb312b433c37803e3004038e02a2085e853f840cbb8ed1b6135db7d7abb68260ff9f962324 WHIRLPOOL 100214fd7e172d81d33267acc54839cdebcef927a44b028b4f8cd87cead2c1faaa64c69b0b2e35a85e4536b499492245e76a0d1c6d83c666e96331f1d7d11292
+EBUILD gentoo-perl-helpers-0.2.1.ebuild 1225 SHA256 8fba3a3dafac4fe88881af47991966599cc33ace40c5c4de95d86228750903a6 SHA512 60a21a692d621e44e0592576112d66ba14fc01b86874678ff56ee843cc27dbf1ca95d849b6aec6040ee76e0a58add2d07445d2be9be4293e61821464f1c4e426 WHIRLPOOL dc37e3b17a39afde2860bb5d8a51b07b522ae875d436a0f028fd1faac588affec7943314543b275b4c5ae8cf4a7763b8e5b2b41122f86396403ffa302ae1b69e
+EBUILD gentoo-perl-helpers-0.2.2-r1.ebuild 1255 SHA256 f6202930e24fe989b21265edf91af0eaa3453a97cdf497af42c9ea891d81ccc6 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c WHIRLPOOL a261bd76b8871123b21a619e1cfe6c28c5ab4ca6e35259a226995613f7abf8e801d804fac5390111efa5b6e955083e6de14fccdd4b55a67727910f263d8b0c75
+MISC metadata.xml 453 SHA256 5e5afa89bf0f47da3e7ab7e1f8a9833dc0f5a4a5d7a22cea7cfa5b6896cb0870 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201 WHIRLPOOL b7b4a097b1ef4441eadefb705f70365aeb0443cf600ad60067d45dd61a628f71f1b6663c2018fe24f9584ca3b849c7fb98a9869348bf33ea924a2f7248177424
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
new file mode 100644
index 000000000000..a5dad27b3230
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+
+RDEPEND="
+ app-portage/portage-utils
+ sys-apps/portage
+"
+DEPEND=""
+
+S="${WORKDIR}"
+src_prepare() {
+ sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \
+ -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+ "${S}/bin/gentoo-perl" || die "Can't patch bin/gentoo-perl"
+ default
+}
+src_compile() { :; }
+src_install() {
+ exeinto /usr/bin
+ doexe "${S}/bin/"*
+
+ exeinto /usr/libexec/gentoo-perl-helpers
+ doexe "${S}/libexec/"*
+
+ insinto /usr/lib/gentoo-perl-helpers
+ doins "${S}/lib/"*
+
+ dodoc "${S}/README.mkdn"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
new file mode 100644
index 000000000000..4a2b5e0ef725
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+ https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+ app-portage/portage-utils
+ sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+ sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \
+ -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+ "${S}/bin/gentoo-perl" \
+ "${S}/lib/core-functions.sh" \
+ || die "Can't patch bin/gentoo-perl"
+ default
+}
+src_compile() { :; }
+src_install() {
+ exeinto /usr/bin
+ doexe "${S}/bin/"*
+
+ exeinto /usr/libexec/gentoo-perl-helpers
+ doexe "${S}/libexec/"*
+
+ insinto /usr/lib/gentoo-perl-helpers
+ doins -r "${S}/lib/"*
+
+ dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
new file mode 100644
index 000000000000..573d0e36bc7c
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+ https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+ app-portage/portage-utils
+ sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+ sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \
+ -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+ "${S}/bin/gentoo-perl" \
+ "${S}/lib/core-functions.sh" \
+ || die "Can't patch bin/gentoo-perl"
+ default
+}
+src_compile() { :; }
+src_install() {
+ exeinto /usr/bin
+ doexe "${S}/bin/"*
+
+ exeinto /usr/libexec/gentoo-perl-helpers
+ doexe "${S}/libexec/"*
+
+ insinto /usr/lib/gentoo-perl-helpers
+ doins -r "${S}/lib/"*
+
+ dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..b725db35e2e2
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+ https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+ $(: --format support)
+ >=app-portage/portage-utils-0.60
+ sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+ sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" \
+ -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+ "${S}/bin/gentoo-perl" \
+ "${S}/lib/core-functions.sh" \
+ || die "Can't patch bin/gentoo-perl"
+ default
+}
+src_compile() { :; }
+src_install() {
+ exeinto /usr/bin
+ doexe "${S}/bin/"*
+
+ exeinto /usr/libexec/gentoo-perl-helpers
+ doexe "${S}/libexec/"*
+
+ insinto /usr/lib/gentoo-perl-helpers
+ doins -r "${S}/lib/"*
+
+ dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/gentoo-perl-helpers/metadata.xml b/app-admin/gentoo-perl-helpers/metadata.xml
new file mode 100644
index 000000000000..ddfded172487
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/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>kentnl@gentoo.org</email>
+ <name>Kent Fredric</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gentoo-perl/gentoo-perl-helpers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
new file mode 100644
index 000000000000..55bdffbe4e6a
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -0,0 +1,9 @@
+AUX gentoo-mirror.conf 467 SHA256 c8c3cf072749e12da77bf13f156ce24185227b0b637e566c170a0f6d29a3769d SHA512 9850e862b1795644bc376eef485bcfde8d72e06f40e587cf373e257a95383b95b64217263de62a92a8bc5b2b55adaea108d609803f71d708591b0d4ecdfed6ae WHIRLPOOL 3ebd112a622451b70d14b86355fe8e22a2bfd6cde10f647424581b505308a678a6ac5eb1725b6214d0db3b8e14f6e7702b48b1d043e291d15b2748ea9eff5337
+AUX rsync-gentoo-portage.sh 332 SHA256 cbae155745aa8c857985729c2a0d35ed515eb039a90a2a50488997c96158df67 SHA512 588ea9757167ae5baa72a0542d723be8ae574e3ad487f1ab260de2a419f0d36d29fa2a0c80924292a81f2a69e325fa08729008964de24e0b01189b1e9a04618b WHIRLPOOL fec8e9d32ccac704a7036b42caa550281d4032318982c8e40a13724c78e4c6019ff470ceb9bf5d0849cc9cd95c4198135e38e2ca34b67fad25100b6c98f9b1f4
+AUX rsyncd.conf 611 SHA256 bd96c615e607bf20205dc8300920176de5d8f52a9028505fbf566d1a3f266f79 SHA512 11af716d1741d482f11ec9a9a2d5edbf4c3c0bacd7ed357588f2a8398d313d47de880ae5c38f40ce940259cb741cd7695eab42249ca10e05c3f2654581ffc791 WHIRLPOOL 15bb97a0387df24d5f4049a7d093664a0ff95f7df248459f8ab43db20abc3555e67e6743b84c6f2a20bc3983a824ff013989395ca34308d55ba157a28a0ef292
+AUX rsyncd.motd 44 SHA256 38c8ed04808ce0f5c0deba00be8f14412de3b76e34ff5c0f5bf01d217f0dbc76 SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3 WHIRLPOOL fff28789a60ca80a6008d9eba32a47416826962b61e04132b244417d3113136092723c25e02260c93e12ad322f299528acfaa390fbafe41e6db14cf2a81b84fb
+AUX rsynclogparse-extended.pl 3476 SHA256 9b496670cc75f9fdd99c29fd3ff88627a4d145f2cdfdb3457b9524d66a702418 SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3 WHIRLPOOL 4d3f06b557cf6d3f0bfa4f76e1a00f427dff336319b405b702edf94aace60c4a31a43dd1b217af3dde7fba84b11742a8449beb417ec9b067ae925bbd9bafef25
+EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1980 SHA256 b1b9d9b6f3be38ae9c3800e4c4c019cb34c19eafb4fda4e9a950cbbc42325824 SHA512 b4ac3ad7600cd26c68cea2952991b7b07d39e4361b34bcd7e676a4f4e9ac3d1a8f2ec190fee8d1966b6400858b4bbea83c386a38a84489f9231cb2118334ba58 WHIRLPOOL b67e9ff80f3041e38178eb86143820ae1e068dc10e0124c219718f1f0e36e220ed2d74994ffb25979775b46438cd1ccdea9c74bd6557dcccc1cd63f83735c64b
+MISC ChangeLog 2835 SHA256 dffe7e8e1d3b5b20fea38572dbd96da5d498a2365195557664589813e9a68d3d SHA512 78e1c5a3972a1680c8be2242ceb33ce0e61cef75c42ad6d41bd7dc53f092ab8414fb7f2abaf937d8889ba1e766c8c5977de7708849cb0b547a14b2847bf9e445 WHIRLPOOL cc201c4c75185cdc91691f4a8759d70946563886277df72c670ae749b4a1bd224ae11e78d58038383c9c9b024054f6e3d12f4ef15235f6e19bb1f9e14c0c45af
+MISC ChangeLog-2015 5161 SHA256 a38c2d4354e266ab2b3bf0b038a87886adf07ccb6486a97703beeba16ac33d94 SHA512 70b1deadcecebd31d885657b8fe897375dc7fd42e6f02f49622a1a00239d4523b58aa96ad2dbe77b276c960a0b79418471e6ffc1ede8fd3281ca800c03297d94 WHIRLPOOL be6fb2ca3ed28f5d5ec10f3b0dd04e403aeea121e687e3f1a53971b2a252168406dbcce0906b576023d2d6dd2410515b474be4128a6d02f5f0f9217597826e71
+MISC metadata.xml 442 SHA256 f80adf3a53c101e749fecc208752eedae95c5ea377b478a4bb4805d7c88a12ec SHA512 40d1ffdeff3aca5c1aba521d8a5026e72f6d0d743cb98906d59045cc48794320e576703a9997285db151862cbd747d9f2e1c5c851b0d74e28f161e42a8d0d6fd WHIRLPOOL e2d45722c8ca42a056f9c7021b7db26268d8d968fd2256324d9988da2528d1c96ceec55a6124329989a1a24eb67693258b8d6e07dac529f5695822eb603a5ece
diff --git a/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
new file mode 100644
index 000000000000..d1af6ca014b7
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/gentoo-mirror.conf
@@ -0,0 +1,9 @@
+# Gentoo rsync mirror config
+
+RSYNC="/usr/bin/rsync"
+OPTS="--quiet --recursive --links --perms --times --devices --specials --delete --timeout=300"
+#Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org
+#SRC="rsync://rsync1.us.gentoo.org/gentoo-portage"
+#If you are waiting for access to our master mirror, select one of our mirrors to mirror from:
+SRC="rsync://rsync.de.gentoo.org/gentoo-portage"
+DST="/opt/gentoo-rsync/portage/"
diff --git a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
new file mode 100644
index 000000000000..e053fadab1ed
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+source /etc/rsync/gentoo-mirror.conf
+
+echo "Started update at" `date` >> $0.log 2>&1
+logger -t rsync "re-rsyncing the gentoo-portage tree"
+${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&1
+logger -t rsync "deleting spurious Changelog files"
+find ${DST} -iname ".ChangeLog*" | xargs rm -rf
+
+echo "End: "`date` >> $0.log 2>&1 \ No newline at end of file
diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.conf b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf
new file mode 100644
index 000000000000..54cace847488
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+uid = nobody
+gid = nobody
+use chroot = yes
+max connections = 20
+pid file = /var/run/rsyncd.pid
+motd file = /etc/rsync/rsyncd.motd
+transfer logging = no
+log format = %t %a %m %f %b
+syslog facility = local3
+timeout = 300
+
+[gentoo-x86-portage]
+#this entry is for compatibility
+path = /opt/gentoo-rsync/portage
+comment = Gentoo Linux Portage tree
+
+[gentoo-portage]
+#modern versions of portage use this entry
+path = /opt/gentoo-rsync/portage
+comment = Gentoo Linux Portage tree mirror
+exclude = distfiles
+
diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.motd b/app-admin/gentoo-rsync-mirror/files/rsyncd.motd
new file mode 100644
index 000000000000..35950dd898dd
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.motd
@@ -0,0 +1 @@
+This is rsync[number].[country].gentoo.org.
diff --git a/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
new file mode 100644
index 000000000000..b0befc31c7ab
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/files/rsynclogparse-extended.pl
@@ -0,0 +1,128 @@
+#!/usr/bin/env perl
+
+#
+# rsynclogparse-extended.pl, version 1.0
+# Script for producing daily or hourly stats from an rsync.log, in
+# plain text or XML output formats
+#
+# (C) Tim Haynes <gentoo@stirfried.vegetable.org.uk>, February 2003
+# Redistributable under the terms of the BSD licence
+# <http://www.opensource.org/licenses/bsd-license.php>
+#
+
+$|=1;
+
+#Determine whether we have a commandline option or not
+$arg="";
+$arg=shift
+ if $ARGV[0]=~/^-/;
+
+#Hash of variables to be output and descriptions
+%outputVars=(
+ "mirrorid" => "which mirror name this box is",
+ "contact" => "email address to contact the server administrator",
+ "read" => "total bytes read",
+ "wrote" => "total bytes served",
+ "total" => "total bytes both directions",
+ "count" => "number of connections",
+ "meanxfer" => "mean transfer size",
+ "biggestXfer" => "biggest individual transfer",
+ "speedupavg" => "mean speedup-a-like ratio for all conns",
+ "avgbandwidth" => "mean bandwith reequirement over 1d",
+ "interval" => "most recent n-seconds' worth of data",
+ "maxconns" => "number of times max-conns reached",
+ "percmaxconns" => "percentage of connections rejected",
+ "configmaxconns" => "max concurrent connections configured",
+ "timestamp" => "Current time these stats were generated"
+ );
+
+#Initialise all the above to 0
+map { $$_ =0 ; } keys %outputVars;
+
+#Set fields for this specific server
+$mirrorid="rsync1.uk.gentoo.org";
+$contact="gentoo\@stirfried.vegetable.org.uk";
+$configmaxconns=5;
+
+$timestamp=time();
+
+#Determine if we're doing a daily or hourly thing
+$interval=3600;
+$interval=2600*24
+ if $arg=~/d/;
+
+($sec,$min,$hour,$mday,$mon,$year,$wday,$yday) = gmtime(time);
+$now=dateToTstamp(sprintf("%04d/%02d/%02d %02d:%02d:%02d",
+ $year+1900, $mon+1, $mday, $hour, $min, $sec));
+
+
+#Read in all remaining files on commandline and stdin
+while (<>) {
+ chomp;
+
+ if (m#^((\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+))#) {
+ $tstamp=dateToTstamp($1);
+ }
+
+ next # skip too-old log entries
+ if $tstamp < ($now-$interval);
+
+ $maxconns++
+ if /max connections .\d+. reached/oi;
+
+ /wrote (\d+) bytes.*read (\d+) bytes.*size (\d+)/oi
+ or next;
+
+ $wrote+=$1; #running total of outgoing
+ $read+=$2; #running total of incoming
+ $volumesize=$3; #total size of the volume, serversize
+ $localtotal=$1 + $2;
+ $speedupsum+=$volumesize/$localtotal; #running total of "speedup" ratios
+ $count++;
+ $biggestXfer=($localtotal>$biggestXfer)?$localtotal:$biggestXfer;
+}
+
+#Compute a few things
+$total=$read+$wrote;
+$speedupavg=$speedupsum/$count; #average speedup ratio
+$meanxfer=$total/$count; #mean-size xfer per connection
+$avgbandwidth=$total/$interval; #mean bandwith consumed over this interval
+$percmaxconns=100*$maxconns/($count+$maxconns);
+
+#Choice of output format
+$arg =~/xml/ ? &outputXML : &outputText;
+
+1;
+
+################
+
+sub outputText {
+ foreach $i ( keys %outputVars ) {
+ printf("%-20s: $$i\n", $i);
+ }
+}
+
+
+sub outputXML {
+ print "<xml>\n <rsyncstats>\n";
+ foreach $i ( keys %outputVars ) {
+ if ($arg=~/v/o) {
+ print " <$i desc=\"$outputVars{$i}\">$$i</$i>\n";
+ } else {
+ print " <$i>$$i</$i>\n";
+ }
+ }
+ print " </rsyncstats>\n</xml>\n";
+}
+
+
+sub dateToTstamp {
+ my $str=shift;
+
+ $str =~ m#^(\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+)#;
+
+ $tstamp=$6 + 60*$5 + 3600*$4 + 3600*24*$3 +
+ 3600*24*31*$2 + 3600*24*365*($1-1975);
+
+ return $tstamp;
+}
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
new file mode 100644
index 000000000000..f9643478717d
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+ exeinto /opt/gentoo-rsync
+ doexe "${FILESDIR}"/rsync-gentoo-portage.sh
+ doexe "${FILESDIR}"/rsynclogparse-extended.pl
+ insinto etc/rsync
+ doins "${FILESDIR}"/rsyncd.conf
+ doins "${FILESDIR}"/rsyncd.motd
+ doins "${FILESDIR}"/gentoo-mirror.conf
+ dodir /opt/gentoo-rsync/portage
+}
+
+pkg_postinst() {
+ elog "The rsync-mirror is now installed into /opt/gentoo-rsync"
+ elog "The local portage copy resides in /opt/gentoo-rsync/portage"
+ elog "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for"
+ elog "configuration of your main rsync server and use it to sync."
+ elog "Change /etc/rsync/rsyncd.motd to display your correct alias."
+ elog
+ elog "RSYNC_OPTS="--config=/etc/rsync/rsyncd.conf" needs"
+ elog "to be set in /etc/conf.d/rsyncd to make allow syncing."
+ elog
+ elog "The service can be started using /etc/init.d/rsyncd start"
+ elog "If you are setting up an official mirror, don't forget to add"
+ elog "00,30 * * * * root /opt/gentoo-rsync/rsync-gentoo-portage.sh"
+ elog "to your /etc/crontab to sync your tree every 30 minutes."
+ elog
+ elog "If you are setting up a private (unofficial) mirror, you can add"
+ elog "0 3 * * * root /opt/gentoo-rsync/rsync-gentoo-portage.sh"
+ elog "to your /etc/crontab to sync your tree once per day."
+ elog
+ elog "****IMPORTANT****"
+ elog "If you are setting up a private mirror, DO NOT sync against the"
+ elog "gentoo.org official rotations more than once a day. Doing so puts"
+ elog "you at risk of having your IP address banned from the rotations."
+ elog
+ elog "For more information visit: https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
+}
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
new file mode 100644
index 000000000000..170d04b64261
--- /dev/null
+++ b/app-admin/gentoo-rsync-mirror/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>rgkmg25@gmail.com</email>
+ <name>Robert Kowalski</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
new file mode 100644
index 000000000000..3d1ed7a053cc
--- /dev/null
+++ b/app-admin/github-backup-utils/Manifest
@@ -0,0 +1,23 @@
+DIST github-backup-utils-2.10.0.tar.gz 73061 SHA256 08c2f24adcbc1554fc6079a46f7b59e1cb2f21950546956f9c4367c25dc716a5 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776 WHIRLPOOL c33ccbff94e5c56f2017ff344170538822637261e7c87037db1e5c9abcae28276424aab0d7ed6b3c489148430a05cd488dca4871b302e69acf821f089a73c479
+DIST github-backup-utils-2.11.0.tar.gz 75105 SHA256 ae28ab08b933a8288e9eb9a92df221b0762cd1e7e399b5c116405a0d5fc3175b SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec WHIRLPOOL 05be640c5f95025cb694d4f8e1f1fda4a1d349889333f9ada1f15b48b3bb01d89b9bd4fb984549916f63815548efb272621d016cebdfddb803ec5fdd41b62377
+DIST github-backup-utils-2.5.0.tar.gz 40850 SHA256 9cc7cd40f41e6071c36527ec7983b877e461452cd08d04439efd5fa9352900a0 SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d WHIRLPOOL 15be1d603c9b61a4cff47e319ee1a66b64684dfd19f06c696bffb41b77dc756a895e25074d5a6dd19aeebaa3106fe12842cb22a639ed4abd3a6c2922e8cdbc1f
+DIST github-backup-utils-2.6.0.tar.gz 45970 SHA256 7273cebcb23bc597432a2b66ab7e9367a4fb09a750cf2438f8957dc83dcf27c3 SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e WHIRLPOOL fd1aeec46946190657e61e611a089b4a7cef53beb7b3f9a500b7117fcdbd89c5ef09681aff98ed5d559cc243f76180eb6eec0cc6f2fcfeed0789c159f5a09afe
+DIST github-backup-utils-2.6.3.tar.gz 50884 SHA256 3a5e48ff250b64a9bcec69a269b0e93efda078b8b77afc992c12aa40ee7bb3d9 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290 WHIRLPOOL aa19640ee5583d5e64aaab7b5a9d5572c47a09dd11fd0bed30ffc6aad0a10ddfc4e258f4680180547f8327fbedc5866bde4b20bd5e962dfa8162cd8ecf5e6db3
+DIST github-backup-utils-2.6.4.tar.gz 51270 SHA256 caf34b54a3961562d545ad2fb68ec18a319e6fcc1a1e65e5daa00e04e7f7fb32 SHA512 be2ef9811e20fd9be03d1b57e75151089817bbdd87fa487462a8fe6186195581ad6b1c62b1b930bd64689e89dcf33c2228df7d77a12790404f09b679b1ecf377 WHIRLPOOL a313f94eea953648a3dfbacba5eb3b90e68ca12df034c723133d3d80e60e4be38ef30046b8bbc1bdb827095d75cb239a4152a77dedfed52f188d80b57143fcb0
+DIST github-backup-utils-2.7.0.tar.gz 51409 SHA256 9556dbd438ea3525692705844c20b5bedc9a942c5415dd3c0fd9e383323dc11f SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf WHIRLPOOL 9600d45f69f16cb95b0bb0b3cc5620d7bb6c2e65c2ac6b6942287c85487e83bb2b74d0869b411d0b4829cc9dd2da20972a7635780f00facadc28ca9787028a3b
+DIST github-backup-utils-2.7.1.tar.gz 68793 SHA256 e1e9ee69a005252ab4899693d43fee1aaebac3783d97c343e16566d0c12cdc17 SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880 WHIRLPOOL 87cabe2138c58cf41a803cc43c23748a2f3ed578f3488bfb38861db64b81cb31f4d3aa41e6a240788c3bc9a32d9f523dd28cdb099e1b21cc2472d2cde72f7916
+DIST github-backup-utils-2.8.2.tar.gz 71392 SHA256 7aaa435d007b2697c3540ce6e2d3e5ba999fa33339ed21f43db6e9bb42c7d78d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4 WHIRLPOOL f7c730ee6248b2bc7b8017ece697584717337a9a5f42e38544ed57db498863aa8e1fd3a029b00dcfd26a44f9d32448fba3b092fcccfa3277423ab48ebeb295b1
+DIST github-backup-utils-2.9.0.tar.gz 72512 SHA256 c019467eb218e25de0905f56af03bde59f09d06fee1ec2fc8ef21ddddfc8c711 SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b WHIRLPOOL 9134ba916386f6590b4372992133b358f8284ebb4787bf8ae00c199a78df9fe34cbb6de45de3fcee0d3dffeae58e645d46d17ff8489fe443c682b3b685a5d8ae
+EBUILD github-backup-utils-2.10.0.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
+EBUILD github-backup-utils-2.11.0.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
+EBUILD github-backup-utils-2.5.0.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
+EBUILD github-backup-utils-2.6.0.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
+EBUILD github-backup-utils-2.6.3.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
+EBUILD github-backup-utils-2.6.4.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
+EBUILD github-backup-utils-2.7.0-r1.ebuild 893 SHA256 add65b7491091a3f38e01a75dd0005a2d709ce7531196d19cb507fe3a11ccc32 SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb WHIRLPOOL ad1e7a6b9a6498b2c3ad26731dd0f2aa2ca5d93442693fce6d822ee3998bbc6f166059640579b32452297ddafa677d9071bf9222ea09714cf42c09067ef7c68f
+EBUILD github-backup-utils-2.7.0.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
+EBUILD github-backup-utils-2.7.1.ebuild 893 SHA256 add65b7491091a3f38e01a75dd0005a2d709ce7531196d19cb507fe3a11ccc32 SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb WHIRLPOOL ad1e7a6b9a6498b2c3ad26731dd0f2aa2ca5d93442693fce6d822ee3998bbc6f166059640579b32452297ddafa677d9071bf9222ea09714cf42c09067ef7c68f
+EBUILD github-backup-utils-2.8.2.ebuild 893 SHA256 add65b7491091a3f38e01a75dd0005a2d709ce7531196d19cb507fe3a11ccc32 SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb WHIRLPOOL ad1e7a6b9a6498b2c3ad26731dd0f2aa2ca5d93442693fce6d822ee3998bbc6f166059640579b32452297ddafa677d9071bf9222ea09714cf42c09067ef7c68f
+EBUILD github-backup-utils-2.9.0.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
+MISC ChangeLog 2864 SHA256 4a578553eca4227b3dcfd13ca2c68ccd2c3f42c58796e7a6402772f3fbd73e82 SHA512 6e937dbceaacb9230ddbf41f179c262a2c57ca66c77ac86872ceac3da0318a8fc37940893be0a677ecbf3f13c9567d5ede23213cfd3078934152515ecb93969e WHIRLPOOL c1bf9feff82aa2704676878ba3ecce1270fbe55319a6714aad42cece3d60602f465048ef6cc8e772a4ddb06d15deca1c034deb35ccb3481205a8f44ce51c82df
+MISC metadata.xml 566 SHA256 43e881112646fc2752e212e339b9a90442c8d8fc3520828511cce9cd23852872 SHA512 35a0eb37cedfcd41573c13655d87be23b68af3d3636fe06397565c06a2b78c767f41702ff1487134a3f52169492a1345be2d42a79520a16046a84428e4bf0677 WHIRLPOOL df502d63fe30ae3ddf0996bcb3babefc2083ef6d91e573426135dd543bdc94b53177156b10dc98fa5294a34e5d96d919006c7021ea1252a4a451a00081dde1b1
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
new file mode 100644
index 000000000000..6c89280fa665
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
new file mode 100644
index 000000000000..ae86106fc4c4
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml
new file mode 100644
index 000000000000..3bac2658b1ef
--- /dev/null
+++ b/app-admin/github-backup-utils/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>wizardedit@gentoo.org</email>
+ <name>Austin English</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <longdescription>
+ Provides backup utilities for Github Enterprise installations.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">github/backup-utils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
new file mode 100644
index 000000000000..9a94cbb6166f
--- /dev/null
+++ b/app-admin/gixy/Manifest
@@ -0,0 +1,3 @@
+DIST gixy-0.1.5.tar.gz 32594 SHA256 3607081531df4ee52758850632879796b9f294c93a8068022d044aa4f5a61423 SHA512 63c41a16f1a1d16664c660150bf1603b87d2a2b474db58bb13af79e123b372a666b94aa96ef081af89fb5608c7f9a43e03750afb80d52c212c06d3407c413e38 WHIRLPOOL 1a87ec527dd9014100d4e75ef69d3a981d37420acac7260ce82722bd5062d1c035142e0251cb2dfc125546decdae121e23451377846702264f0719948f6cc9ff
+EBUILD gixy-0.1.5.ebuild 788 SHA256 da236a6d6299cb4ffaf930f2f8d8ecc6183d976a91918d7b8f48db3a4c526f52 SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd WHIRLPOOL eebfcb1a497fb551f143859f8b9b66bc7612e359b17219d4be7bcd2fb141f730cb91ecdc0ad1efd14425b79572f2181c1f8c80ba5f157c2d071c1b59b811b179
+MISC metadata.xml 248 SHA256 0ffb8d123c6f6403226978a0c58d85c8c86b8b58f1cdf318c782fb5b2ed1fd48 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822 WHIRLPOOL 1a874d1aa60309592920968737b24b6be620f89f43ccec0e266eb8ac4c4b37235eeeef64f52ea70bc31f5cee816a2e86e10c6e71935d3dd8eaf475658d06d8ed
diff --git a/app-admin/gixy/gixy-0.1.5.ebuild b/app-admin/gixy/gixy-0.1.5.ebuild
new file mode 100644
index 000000000000..4ade6ac258d8
--- /dev/null
+++ b/app-admin/gixy/gixy-0.1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx configuration static analyzer"
+HOMEPAGE="https://github.com/yandex/gixy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+python_prepare() {
+ sed -i -e "/argparse/d" setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
new file mode 100644
index 000000000000..ae702b778adb
--- /dev/null
+++ b/app-admin/gixy/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">yandex/gixy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
new file mode 100644
index 000000000000..6680aeae35a3
--- /dev/null
+++ b/app-admin/gkrellm/Manifest
@@ -0,0 +1,22 @@
+AUX gkrellm-2.3.5-autofs.patch 363 SHA256 9d655df4251bf58f2c160949e00d89c1b95be6b472c3c110e4a39a30e817fb1e SHA512 a7684223bd02c9bc0c77f33c618b1b58f639e83935b2e728234af5e364a1573d7a3d8448ace541eeaaaf3236384dd2f042cacb295eb8fdcb850cc2eac3bd614a WHIRLPOOL 1720705d6f174a77b4ffa18eae0bfc3102b4f24b4bc60f24e02fc15004874909704b784081a7eba526321599edea5cb141d1a5a9be4e0a6ec6e46a1d77641804
+AUX gkrellm-2.3.5-binding.patch 707 SHA256 f2602869d98c51910f22022b64b9ebf8f4c99caed3fbfafbc2ec47a977994463 SHA512 c5f52a9e5359244ef5a330f25320e4c2adad3d11d9b5ae443e73e78dba52c88a2b6ce89130547c63727c95f40464d88f42f175cc12a0d0ec97f67717ef611ff0 WHIRLPOOL 6d280db703568db10a6c7cad578d961fecf428c578821ed8d3965bea9137f6227bf86115c23f34d1fcba5a7a399f4378ece49e93a33744464ab841182e35642f
+AUX gkrellm-2.3.5-cifs.patch 496 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5 WHIRLPOOL 3436e2a9b2494059e68b008d426fd284ea0bf9c097149cc48bc92638a38ab6564c40204260b7e648b1e7d153f2ee396a060f2d1f21483d96d6bccb65c0e12372
+AUX gkrellm-2.3.5-config.patch 1530 SHA256 a329336946d581aff46559035d933697beaa132d312d6d9c9be6c325713f324b SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0 WHIRLPOOL 2df9ef7d6c7f2e381940d1e8f81795a0f284168876a2a0c9e5a5b024650f7c6dc19714b0c48c11643645bc9bd2e8e4bba9ddb423022db180b428b8fbe6cb8501
+AUX gkrellm-2.3.5-dso.patch 1113 SHA256 b33527bc3c4c27167d8259892e82f08ab99b21790e2884b5e33b1dc110560e74 SHA512 b186140e7fefcf3aee38c51e55c2d7c8cc39e2fa65f724e237e92f686aa8106f03bb195409090b355bb5b3af08e6be6f2317a63c00a54e0f89ff7218ee3629bf WHIRLPOOL 50f3695f67515f94608c4a9333c5505be87ba5c00b632982a75344f19309ccf30f517ded93dd90dae9d25c774f2e525cf32f734390f447c370c188931d20d357
+AUX gkrellm-2.3.5-format-security.patch 503 SHA256 2b9cc038550d3ea4132f6d6cc489582f6019f132c9315d9254820f7cb8408297 SHA512 87ce3d0351ab3dcfb6e57b9c763ecb335ea75abc156d4f70a177f7c13958e343bbc60a4f59bdd52097b5f6cae1f5cfd21bfadff7f26f2366f76c7c75d4483af8 WHIRLPOOL 6ad4fdf0bd0083785783e2c0a276defe6a3afa37d8725b64a2d15e3291efae5ee66b369366c428573da40a84b6db47d9ddb50135d25150943ea32fdb40bbabc3
+AUX gkrellm-2.3.5-sansfont.patch 688 SHA256 17e714489a004661950d75d12a873ff628dec34e7bb6ac39fe674327226b12a1 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f WHIRLPOOL 53a075790b24300d03dd90c9c5f96a3146ae00a3b1876e96c57b385a732fbb7144a2ea9a997037683916838b1b662cdd133d95f7ef1fb398266c900127f553c2
+AUX gkrellm-2.3.5-width.patch 350 SHA256 0a637aabdedb087b032256d9438ef000ef5c44a7be143d4a4a5584bd97fc8729 SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed WHIRLPOOL 0a3179f93165cea69677d7133d8a9e3c86ea460ce5a17b8ecfbfcc0b0cb9ad2082b773573c8947f8afea194426d2743e8fd38e23e93882783e2049f14afce40e
+AUX gkrellm-2.3.7-pkgconfig_fix_newlines.patch 315 SHA256 15bdf7577d402a65d72d3365de46cbfca6bfe7ac9de546937c67ae0d7685b3e4 SHA512 ac044d65c7abd0434185dad82331420b7066bd63e95c2a651169e1b46975eab2d17aa0e25c8c562d227fa27ea56e9137e18e1a456a7e312746608a49654f2455 WHIRLPOOL 6f9af90fc925c193b9fa2bb4a5a79ed5a8ae52faac67baa34c12842b81ac701c76d1cf7d2c08ba63430f54e9200458df79513b365b1e0aa118a207d2d0b88258
+AUX gkrellmd 536 SHA256 bde5ebf7fe2a714f4eff5bde36f7ee0142276116f95c0d9d16e828b31c71a6c4 SHA512 7a0fa7f32f2aa5739747bec37bdcf2fd5fffffd36fdcfc4c10a36dddbf3987f003d6f8ad367d4e8b9a2d50fbef618dbb9812fc65eeed3d8e70dcf2a1da587495 WHIRLPOOL 035717c335dc364b44fb546ab6042dea386b0976a6fa0aa1be601e6b3655bac04c5e1db81017047e265999859389c80a3fd5fab7a00e97d3620502fd8c731c41
+AUX gkrellmd.conf 250 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5 WHIRLPOOL 2662e208c7919cbe2e5a162ddcd3966149e59bf4c2172cb519349a983bac914fc2469ff0176043ecf5c43babf6a08ec2cdcb831dcc67ba503f231477cb183e06
+AUX gkrellmd.initd 345 SHA256 749db5d4427400d7ade7f61fdb09b83f565f905ac5d450a34248bbe69d168f53 SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba WHIRLPOOL 0efb66ff37f25d59dfa87154e48ebf39cf26e8976defd103057f864151ebb54ff4d5c478fd0774136f36e488984616ee616c05e95300a9944b4885ecab687d2b
+AUX gkrellmd.service 173 SHA256 45642a19846dbea1b20f883be49400511359414527699ed24e6d320945733979 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d WHIRLPOOL 8d6ad3627eb51f9db7d448acea46b8de1ab3b41c37c26e9051313bfe0080ec50ff2de3e55b0860b69ecf993b18aaf024f661ed720e3a84ae5acce8057d212e4f
+DIST gkrellm-2.3.10.tar.bz2 782794 SHA256 8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295 WHIRLPOOL 5c8461d9675f1b6d7ed7e94910c15cb3a660fd143274de94a0bed559fc145e369328c345c43433384dea53214bdb3ea99cbd2953b80af95cb0031d8d3f1fb5c8
+DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
+DIST gkrellm-2.3.7.tar.bz2 777841 SHA256 f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512 832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5 WHIRLPOOL 3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
+EBUILD gkrellm-2.3.10-r1.ebuild 3251 SHA256 006c93b7c89cda26f8ab4b75cb7bd8b04af2c41754f2ed9c843df0258ad6e8bd SHA512 e2195ee72694798f537cb04c5b71ec6600bbfca10a6ddbf2a72d4427dae9a3f5e46093e35caa764fc937ecffdcd51394508a4a726c431ea14f666c08f6b4a822 WHIRLPOOL 88623d5a73040e32644524c381d7d5b1cd7264cb64b235a283f0634f17d4bc820dfb9e3f5b3c3c1c2a3c1a4736fa70e7a2198feb3639f4e12c8590a98c7eb2bd
+EBUILD gkrellm-2.3.5-r4.ebuild 3089 SHA256 09008ded01e5b385a5d91a8fd1252092d0c44aeaf9224f4acdafc105c05203dc SHA512 e7b81fe435e8ac42bd46bb199197a56e353543ccbda6637c2a4cb21aa1b672f30583e832c0be2dde88565729c5910a4a1eb93cb14dca59d0dbd05272d38c5feb WHIRLPOOL 2a81a7ee8f653b77755877817c3d18f6cf0dd569669772ba5924dc14a85aa1023f57882dfbe8199bc4114427d8611ca0817f30570d680f382f8da0d1d3fca790
+EBUILD gkrellm-2.3.7.ebuild 3247 SHA256 3b017a0940913f89494bedb1331081cfacfcdcb8058f058aca1552cef3892c27 SHA512 a647fbb4a675b83dbfba07964fd9fdf85bb58e73e4df60df3cf8128990290cf4be35d2c5d0dab69ac184be443c4bed59962b8873bf8a838b13b8f995641a4935 WHIRLPOOL 127bfa9837706dd91679f3ba18e8b91a779e002f0d9c244fdb3bf081110c6b755418822f98e311168cfa2348c85d4f07cc720c521d5881c6453dd03b09661ade
+MISC ChangeLog 6418 SHA256 ac0c6406d2fc14ead60ed702460e3c8a61c0525f413118b90665d1cf4f5d9efe SHA512 d7877f9e7086ac65f10976bb927901506ff647ba9f35abfb8c1f576dd8f3048860b55a4de25414f180f276de07cb5505f2fc24da4016bcb01c1b9208a06d672a WHIRLPOOL 6f633ede55ce5345ff98076720173dbf61224b6b7cf0b671389f1e84dfb24201815ec3a7f5b914e67622af1ba848838d02313573fc73538bcdafcd19b51c2433
+MISC ChangeLog-2015 29623 SHA256 58dc8c928a4ebe1b191eb9d614c7675ebff259dc64570b78cba7bb7e4f1a981f SHA512 093a984f95f65194acfef7c4eec3351c39eb8e0852265c629920ba2527f2bf92ea22195c876e340d330c71b9115d43b6bc999a6a1c293eb245ed0bc1a4601174 WHIRLPOOL c61d894a1e7ca18b73f102f95ecbfa66a675e6c63a57e6ff704716eecec5a60106e5140e6f93e04e1b922b174012215bf3f086268348c8ce1bfce1b4db0dda35
+MISC metadata.xml 957 SHA256 6455d060514bf666663a86bbe1804d3cf30484d4825773305852571988324525 SHA512 27ffd7627bc18f42700534c72794e8fb239f02bb1f167ca8b3576dc5406196dbf9f25abaac99be1cbc1efe65d956b5d81b6bc039872f075aa38ff28fe5a4a52c WHIRLPOOL 3ac395af2d68e084e8fe8051415e5761a3930fd3cd7222a0f65e54e48af011d7bde5e939ec16d84b35a957df05faf939da46b9faa6ebc3170e6f4559e3fe4673
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
new file mode 100644
index 000000000000..cf36a9817110
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-autofs.patch
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.old/src/sysdeps/linux.c 2010-10-06 03:27:33.000000000 +1100
++++ gkrellm-2.3.5/src/sysdeps/linux.c 2011-11-24 02:07:30.926450485 +1100
+@@ -1439,6 +1439,7 @@
+ || !strcmp(type, "usbdevfs")
+ || !strcmp(type, "usbfs")
+ || !strcmp(type, "sysfs")
++ || !strcmp(type, "autofs")
+ )
+ continue;
+ /* Strip trailing / from the directory.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
new file mode 100644
index 000000000000..83bf0b0d7d20
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
@@ -0,0 +1,30 @@
+From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Fri, 10 Jan 2014 09:34:59 +0200
+Subject: [PATCH] Allow binding to a listen address that doesn't exist yet
+
+---
+ server/main.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/server/main.c b/server/main.c
+index a5a9e4e..b2f460b 100644
+--- a/server/main.c
++++ b/server/main.c
+@@ -1003,6 +1003,13 @@ socksetup(int af)
+ #endif
+ continue;
+ }
++
++#ifdef IP_FREEBIND
++ if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0)
++ {
++ g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n");
++ }
++#endif
+ }
+
+ #ifdef IPV6_V6ONLY
+--
+1.8.3.1
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
new file mode 100644
index 000000000000..fa35ef672798
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.old/server/monitor.c 2010-10-06 03:46:59.000000000 +1100
++++ gkrellm-2.3.5/server/monitor.c 2011-11-24 02:01:30.871402778 +1100
+@@ -1329,7 +1329,8 @@
+ static gchar *remote_fs_types[] =
+ {
+ "nfs",
+- "smbfs"
++ "smbfs",
++ "cifs"
+ };
+
+ void
+--- gkrellm-2.3.5.old/src/fs.c 2010-09-15 02:25:51.000000000 +1000
++++ gkrellm-2.3.5/src/fs.c 2011-11-24 02:00:17.347088370 +1100
+@@ -163,7 +163,8 @@
+ static gchar *remote_fs_types[] =
+ {
+ "nfs",
+- "smbfs"
++ "smbfs",
++ "cifs"
+ };
+
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
new file mode 100644
index 000000000000..c6230598c80e
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
@@ -0,0 +1,43 @@
+diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf
+--- gkrellm-2.3.5/server/gkrellmd.conf.config 2010-09-14 17:26:19.000000000 +0300
++++ gkrellm-2.3.5/server/gkrellmd.conf 2011-06-19 19:17:56.398591498 +0300
+@@ -22,16 +22,17 @@
+ # List of hosts allowed to connect. If no hosts are specified in a
+ # gkrellmd.conf file or on the command line, all hosts will be allowed.
+ #
+-#allow-host localhost
+-#allow-host 127.0.0.1
++allow-host localhost
++allow-host 127.0.0.1
++allow-host ::ffff:127.0.0.1
+ #allow-host ::1
+ #allow-host 192.168.0.*
+
+ # Drop privileges after startup (you must start gkrellmd as root to do it).
+ # NOTE: Option ignored on Windows
+ #
+-#user nobody
+-#group proc
++user gkrellmd
++group gkrellmd
+
+ # Create a PID file for the running gkrellmd. Default is no PID file.
+ # NOTE: Option ignored on Windows
+@@ -76,7 +77,7 @@
+ # Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#io-timeout 5
++io-timeout 5
+
+ # Configure gkrellm clients to attempt automatic reconnects to a
+ # gkrellmd server every reconnect-timeout seconds after a disconnected
+@@ -85,7 +86,7 @@
+ # Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#reconnect-timeout 5
++reconnect-timeout 5
+
+ # Server side local mailbox counts can be sent to gkrellm clients. List here
+ # paths to mbox, MH mail, or Maildir style mailboxes.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
new file mode 100644
index 000000000000..3a24baafe7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-dso.patch
@@ -0,0 +1,32 @@
+From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 29 Aug 2012 22:28:47 -0400
+Subject: [PATCH] Explicitly link to libgmodule-2.0
+
+With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
+provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
+explicitly (as is already done in server/).
+
+Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=428532
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6d482a7..19b0c29 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ STRIP ?= -s
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
+
+ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
+ ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+--
+1.7.12
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
new file mode 100644
index 000000000000..3e0265af482c
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
@@ -0,0 +1,12 @@
+diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
+--- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300
++++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200
+@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
+ if (log_level & G_LOG_LEVEL_CRITICAL)
+ facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
+
+- syslog(facility_priority, message);
++ syslog(facility_priority, "%s", message);
+ #endif // defined(WIN32)
+ } // gkrellmd_syslog_log()
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
new file mode 100644
index 000000000000..460eb5ebc29a
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
@@ -0,0 +1,17 @@
+--- gkrellm-2.2.4/src/gui.c.font 2005-05-17 15:37:16.000000000 +0200
++++ gkrellm-2.2.4/src/gui.c 2005-05-17 15:37:46.000000000 +0200
+@@ -1575,11 +1575,11 @@
+ if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR))
+ gkrellm_dup_string(&_GK.theme_path, "");
+ if (!large_font.string)
+- gkrellm_dup_string(&large_font.string, "Serif 11");
++ gkrellm_dup_string(&large_font.string, "Sans 11");
+ if (!normal_font.string)
+- gkrellm_dup_string(&normal_font.string, "Serif 9");
++ gkrellm_dup_string(&normal_font.string, "Sans 9");
+ if (!small_font.string)
+- gkrellm_dup_string(&small_font.string, "Serif 8");
++ gkrellm_dup_string(&small_font.string, "Sans 8");
+ }
+
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
new file mode 100644
index 000000000000..c7fc22060b85
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.2.7/src/gkrellm.h.width 2005-06-09 12:48:34.000000000 +0200
++++ gkrellm-2.2.7/src/gkrellm.h 2005-06-09 12:48:37.000000000 +0200
+@@ -518,7 +518,7 @@
+ GkrellmCallback;
+
+
+-#define CHART_WIDTH_MAX 1000
++#define CHART_WIDTH_MAX 1600
+ #define CHART_WIDTH_MIN 25
+
+ /* Each chart must have a GkrellmChartconfig struct associated with it.
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
new file mode 100644
index 000000000000..a699b80e5b2b
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.3.7/Makefile
++++ gkrellm-2.3.7/Makefile
+@@ -131,7 +131,7 @@
+ (cd server && ${MAKE} gkrellmd)
+
+ gkrellm.pc: Makefile
+- echo 'prefix=$(INSTALLROOT)\n'\
++ printf 'prefix=$(INSTALLROOT)\n'\
+ 'Name: GKrellM\n'\
+ 'Description: Extensible GTK system monitoring application\n'\
+ 'Version: $(VERSION)\n'\
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
new file mode 100644
index 000000000000..93743c57b7df
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+ after lm_sensors
+ after hddtemp
+}
+
+start() {
+ ebegin "Starting GNU Krell Monitor daemon"
+ start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping GNU Krell Monitor daemon"
+ start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
+ eend $?
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
new file mode 100644
index 000000000000..6b0d90df1092
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -0,0 +1,8 @@
+# Config file for gkrellmd init script
+
+# If you need to pass extra options to gkrellmd, you may set them here.
+# See 'gkrellmd --help' for a list of options.
+#
+# Note: Many options can be configured in /etc/gkrellmd.conf as well
+#
+#GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
new file mode 100644
index 000000000000..fe295128e4ea
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="gkrell system monitor daemon"
+pidfile="/var/run/gkrellmd.pid"
+command="/usr/bin/gkrellmd"
+command_args="${GKRELLMD_OPTS}"
+command_background="true"
+
+depend() {
+ need net
+ after lm_sensors
+ after hddtemp
+}
diff --git a/app-admin/gkrellm/files/gkrellmd.service b/app-admin/gkrellm/files/gkrellmd.service
new file mode 100644
index 000000000000..f1df0c6420ad
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=GNU Krell Monitors server
+Documentation=man:gkrellmd(1)
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/gkrellmd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..0dea33e32b53
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+# Upstream named their xz compressed tarball tar.bz2 (*sigh*)
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.5-cifs.patch
+ "${FILESDIR}"/${PN}-2.3.5-config.patch
+ "${FILESDIR}"/${PN}-2.3.5-width.patch
+ "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ default
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ docinto html
+ dodoc *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ einstalldocs
+}
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
new file mode 100644
index 000000000000..270ad03b149c
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib user systemd toolchain-funcs
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gtk+:2
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ epatch \
+ "${FILESDIR}"/${P}-autofs.patch \
+ "${FILESDIR}"/${P}-cifs.patch \
+ "${FILESDIR}"/${P}-dso.patch \
+ "${FILESDIR}"/${P}-format-security.patch \
+ "${FILESDIR}"/${P}-config.patch \
+ "${FILESDIR}"/${P}-width.patch \
+ "${FILESDIR}"/${P}-binding.patch \
+ "${FILESDIR}"/${P}-sansfont.patch
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ dohtml *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ doinitd "${FILESDIR}"/gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ dodoc Changelog CREDITS README
+}
diff --git a/app-admin/gkrellm/gkrellm-2.3.7.ebuild b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
new file mode 100644
index 000000000000..50b713c96575
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+ dev-libs/glib:2
+ hddtemp? ( app-admin/hddtemp )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors )
+ nls? ( virtual/libintl )
+ ntlm? ( net-libs/libntlm )
+ X? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/pango
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.5-cifs.patch
+ "${FILESDIR}"/${PN}-2.3.5-config.patch
+ "${FILESDIR}"/${PN}-2.3.5-width.patch
+ "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+ "${FILESDIR}"/${P}-pkgconfig_fix_newlines.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_setup() {
+ enewgroup gkrellmd
+ enewuser gkrellmd -1 -1 -1 gkrellmd
+ TARGET=
+ use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+ sed -e 's:-O2 ::' \
+ -e 's:override CC:CFLAGS:' \
+ -e 's:-L/usr/X11R6/lib::' \
+ -i */Makefile || die "sed Makefile(s) failed"
+
+ sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+ -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+ -i src/${PN}.h || die "sed ${PN}.h failed"
+
+ default
+}
+
+src_compile() {
+ if use X ; then
+ local sslopt=""
+ if use gnutls; then
+ sslopt="without-ssl=yes"
+ elif use ssl; then
+ sslopt="without-gnutls=yes"
+ else
+ sslopt="without-ssl=yes without-gnutls=yes"
+ fi
+
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ STRIP="" \
+ INSTALLROOT="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+ LOCALEDIR="${EPREFIX}/usr/share/locale" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex ntlm "" "without-ntlm=yes") \
+ ${sslopt}
+ else
+ cd server || die
+ emake \
+ ${TARGET} \
+ CC="$(tc-getCC)" \
+ LINK_FLAGS="$LDFLAGS -Wl,-E" \
+ STRIP="" \
+ $(usex nls "" "enable_nls=0") \
+ $(usex lm_sensors "" "without-libsensors=yes")
+ fi
+}
+
+src_install() {
+ if use X ; then
+ emake \
+ install${TARGET:+_}${TARGET} \
+ $(usex nls "" "enable_nls=0") \
+ STRIP="" \
+ INSTALLDIR="${ED}/usr/bin" \
+ INCLUDEDIR="${ED}/usr/include" \
+ LOCALEDIR="${ED}/usr/share/locale" \
+ PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ MANDIR="${ED}/usr/share/man/man1"
+
+ docinto html
+ dodoc *.html
+
+ newicon src/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} GKrellM ${PN}
+ else
+ dobin server/gkrellmd
+
+ insinto /usr/include/gkrellm2
+ doins server/gkrellmd.h
+ doins shared/log.h
+ fi
+
+ newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+ newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+ systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+ insinto /etc
+ doins server/gkrellmd.conf
+
+ einstalldocs
+}
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
new file mode 100644
index 000000000000..8ebacc5928b7
--- /dev/null
+++ b/app-admin/gkrellm/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>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <use>
+ <flag name="hddtemp">Enable monitoring harddrive temperatures via
+ <pkg>app-admin/hddtemp</pkg></flag>
+ <flag name="gnutls">Enable SSL support for mail checking with
+ <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
+ <flag name="ssl">Enable SSL support for mail checking with
+ <pkg>dev-libs/openssl</pkg></flag>
+ <flag name="lm_sensors">Enable monitoring sensors via
+ <pkg>sys-apps/lm_sensors</pkg></flag>
+ <flag name="X">Build both the X11 gui (gkrellm) and the server
+ (gkrellmd). Disabling this flag builds the server only.</flag>
+ <flag name="ntlm">Enable NTLM authentication for mail checking with
+ <pkg>net-libs/libntlm</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
new file mode 100644
index 000000000000..03e6e5354cdf
--- /dev/null
+++ b/app-admin/glance/Manifest
@@ -0,0 +1,16 @@
+AUX glance.initd 542 SHA256 44c1619fe4ff0f57d6b33a91f5a51bd051970db51dc2ce753188bfeef41effcd SHA512 3aa35dbc71239d63f52fde3b1ca334b89b2b65a38c8e469ad853f6d2d993a848ac45097a899f13fdb74638024f43cd4a7857f2b3837b74e7fb471c24e9943a52 WHIRLPOOL 3602e032d223837c57a17c557636202d0545e1221c625d771a28e81a526e21bacd317f3592a21179c85e562609614f59c3cd198e51d81909dd8faff46f9edbe7
+AUX glance.initd-2 375 SHA256 0d281ca259aa67b9bb2603d88be1ccb6c67bb0b1c2c34505e9105987a35d8718 SHA512 1ec49c74fc46157262278f03f2e118d79f1eb9d631b45730959b2060048851b27af2964c3a258ebb97c1b0bd35cf7185d48def744d368c371d2a74f15303a4f2 WHIRLPOOL d626f3e40c2b26476f2ebd0ca32622c8f5671c1d06831251cc705928872dbb2373be2bfbef3ac43514441408a6098ba483c51c8af584daa4e3dae512712e2696
+AUX glance.initd-r2 412 SHA256 20fd0771e239f702fc61f3155b32cdbab3415d028cbe9b900ea381080e962438 SHA512 7e8e2d4ee08d845cdd222435abfe2328317a07426b5305933201b233b9a625539f5149ca23607ee28afca0779f73a429413f2e3e8772fb0cd43b2299f4a40916 WHIRLPOOL cc56db85e57aeff55814b29e9cd98bfb008851650462843e89ac17f951af0e1b422d26e91ece524c4b62667bf0a8edd057cbfc072bb2f41e196ef328c06c7a8c
+DIST glance-13.0.0.tar.gz 1742124 SHA256 3ef3594018469ba36425afafa61ae31487b6025e6f8d9d14febcedfa7136160f SHA512 2f49af5c462a10f8132bb50ad62a45026e77db1324384299551cfe2097b166ccb6fab82eacb092ab6c157f27cdb7253062e62881af795b15d8fd400c1fa096d8 WHIRLPOOL 0c859bbe9e87d2658118bdc111fd052ef088489d83d30574ec07271a50674d18b93d80de05a6282f7d43a8630d980340445b7eeee926bda84572df40086e5e5c
+DIST glance-14.0.0.tar.gz 1788173 SHA256 360a9ef92121ed355ea812478933ac4b020adc6ae3bb5440b05cbdf06a2f9f46 SHA512 4d0b6654dc6a9848e164422d138d4f6c1ec3711a7eb56a3c437202aa5c8cf86bf341201c9007b2f12173189f18beb73eadbaaade936ececf705a31e8b6eac155 WHIRLPOOL 40c7959e052cb3f1d93f3542669b3009b83004cce7dbdcbe67651e69af93e01969f70f4586a022ffc60127ce70037d4887ab0d8de4e11de98519bef578632265
+DIST glance-15.0.0.tar.gz 1803491 SHA256 6e0305e5bdc8f22dca083809e86cf82c430d1cb0164364dbc68263e36676e565 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5 WHIRLPOOL dfb8ec280a161c09a03f2495b9ec26ec8b2a18f14fca0cad13d6c581a735858893bc0dce2de2bbe317ad61cb7fbca5de7d05d6bb85cb7e6949acd49baf91eb8f
+EBUILD glance-13.0.0.ebuild 4874 SHA256 424b09f25a4714a88509e5807ee326f5f0a7d8defa31eccdfee856ab7aa0dcda SHA512 1bf09b4cddd470dcbba65da55ad81770ba07f78524dbe84c60ed6caa6e49120373137c46143fa65147afb4a017ac1d6eef1416d131288ac5f292c5ea2ac86fc0 WHIRLPOOL 22140e1e21d17a17c0e40881033944344ebb76b144a54e21c2a792a9e3cfb3b98a03d805eefbaeba865bc4f0b1c62208793eeba3dd937d6f2cffd5e7f50f2b38
+EBUILD glance-14.0.0-r1.ebuild 4695 SHA256 3cdf6686273e2df63330d4cf2e32e0d68abafe280eccdd6ae12d8ba4ed3b9951 SHA512 9b9b06a73d53ff7de05b271536307c0a7f1d4e5617a940c8307b9b31a60c52f26716cdb36874ec9fb01c1d383075b19995a6463ae6762aa9cc3f8fd705c7d017 WHIRLPOOL 0b1b382ab1415336c524945f0d7bef0b4708c02d8c70108cb47ec4b36b6b5d744b44901a222d6736cb2cacbf737dc62131b976b32015659854f1e5b2e2f248a7
+EBUILD glance-14.0.0.ebuild 4693 SHA256 b74a31ffdb71157d4ca59364d65347372d217c44945ca762137f76dfadf6f15e SHA512 0669cb057f5a89ddf9f145f2974d6bbd85ec6e3e7f82ffe24dc2f313f808bf0ba930736a5422d56d126d9e250e8075f4a84b9593ef0f216eb29955e82165b267 WHIRLPOOL 4c0a0c267c43fc312799460c8e50d5799a680b527d4596b6b199d7cd6db96f1ed617ee24b424322ae366682677486ee72d6220b2f323b22b2bed7290c63330b1
+EBUILD glance-15.0.0.ebuild 5139 SHA256 2e29a6ef3de9a19b7fa8a670d84bef51baf7cc2cb05a74c0e89f978497d87b8e SHA512 eef444849d4d35efc532973d24bdf596a45fac50160631ac89be9e74991c3fb9dda235d091d4a6c93351ddc67abea4cc0870abe61cb09b7d58c3963581374891 WHIRLPOOL 043cc380db4e0439174d2d6847b83edcdb85dee6d2d47e6a03eb79ffa9694187969cfa879142e86f590341341353f4becb2ccb24555b426650e7db9273f86fd8
+EBUILD glance-2016.2.9999.ebuild 4873 SHA256 7b5d381079351de96262c8a2aa3318c77544aee961a97d9f1fd9dce864f92aea SHA512 afe727a6369ee1c222e7156d3b071401f129f0dce79e696e3928e7a9651e74cee1b3eeca35aa1c815ef58776b4c24cabe7d6ed6798e5c56d078a2c914b3eeaba WHIRLPOOL e5143f1796de4e54772750367850c84313ddd541c3de054bf5437937cafd0a13e2ee83325d06958f7d7cf1b5f5d78866ae4f97f62fdf3c05fc4786880551141f
+EBUILD glance-2017.1.9999.ebuild 4711 SHA256 43482e811569d159951de1e0ab1d85b65a9af38ad4c563952057bc434a23fa85 SHA512 c0a57d6b678a1575ca17d1c8935db3f3759fa5edcb670079f6155e729fa69e4e9f9b035c93f010e3bae2690d53e71eb74b8511dedd7a9b54d4e55c3ffdac1d27 WHIRLPOOL ce3c9beacb54a7ecf79a21521ebb9026fdbcfc75b8999e8aad4ab501c35db498d7a8bd0f6907234be597cada709f26fa8d8bde9a66bae624e5f94e23e855ef62
+EBUILD glance-2017.2.9999.ebuild 5153 SHA256 1ad06950a3be3eb131efcd12c865c6504f3c624fcee9cfe58d4af9a7a28f662f SHA512 0d9c66e1eb973c708778316df7315759ed1341c20ade1ad77a64bd834cc5ada837c8bdb5279f8a505d62e8d61779fe02fc21f5d695d0e1fe1ebddcbf37688928 WHIRLPOOL b9e0390b7546db4b601a18979a74b8505e01a5310ad7f5e6319d98f1ffbff14581675e3dc87f2e7312f230667ba9fa1e2e10802d07cb2089e7749e2997c73cba
+MISC ChangeLog 13604 SHA256 d9e99ff0d56a2d7868cca61f5f1669965b9ccf42b9234d75ee1eb0ca8982db7b SHA512 0a83d65179f787f28fbd89614fb028cfe1e6165e64cad12dbddca5802116b1364676d78b810e42bfde5836019e5514584bb0c6415dea837aab37de2673834486 WHIRLPOOL 99252219bb3f8fd5bd7b3ce08ece1027367f72412a1c8ffbe51c3e7a2edf1f8e7c6361736af7c58f5af3464a50d17e1da0062fb4b4060a984c5b01c262eae9e1
+MISC ChangeLog-2015 15177 SHA256 bafe483a76a229fc0871d1fe42837b5ec1cb2640500be46515bc0fdc2008fea7 SHA512 5435ed84455f1f0adbc16eb3d10042992163c9b5847f60d4c04aa92933708965a01b573b2ce3ed1058e7d333e247db1eec8f30f675a0d1005b21fc5d4103977a WHIRLPOOL 7fc94722861301a399626010b664431558dd52e472a39431d2d47f78999b7611fde66fc119181c53c3be486888d3798db7a6fcf098052eae30386c455ae8ad22
+MISC metadata.xml 786 SHA256 1126c78ab935c6af0877edbf65a74375cee8a0e4035a083c96fe5bd050e3a45b SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a WHIRLPOOL ec6c41e7a8be936052e02bf1c74831639d75c05be892e3d58d2f94520cdbbbf5eb5cbdc3438a7d19976a1f6dd103731a36cb6d80560a8b12070021ee1e7eccae
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
new file mode 100644
index 000000000000..1ece1ad58f82
--- /dev/null
+++ b/app-admin/glance/files/glance.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${SVCNAME}
+command_background=yes
+pidfile=/var/run/glance/${SVCNAME}.pid
+required_files=/etc/glance/${SVCNAME}.conf
+
+start_stop_daemon_args="--quiet --user ${GLANCE_USER:-glance}"
+
+depend() {
+ need net
+}
+
+start_pre() {
+ checkpath --directory --owner ${GLANCE_USER:-glance}:${GLANCE_GROUP:-glance} --mode 0755 ${GLANCE_RUN:-/var/run/glance}
+}
+
diff --git a/app-admin/glance/files/glance.initd-2 b/app-admin/glance/files/glance.initd-2
new file mode 100644
index 000000000000..4d4849f77e78
--- /dev/null
+++ b/app-admin/glance/files/glance.initd-2
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
+command_background=yes
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
+
+depend() {
+ need net
+}
diff --git a/app-admin/glance/files/glance.initd-r2 b/app-admin/glance/files/glance.initd-r2
new file mode 100644
index 000000000000..338de069750c
--- /dev/null
+++ b/app-admin/glance/files/glance.initd-r2
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${RC_SVCNAME} service for OpenStack"
+
+command=/usr/bin/${RC_SVCNAME}
+command_user="${GLANCE_USER:-glance}"
+command_background=yes
+pidfile=/run/${RC_SVCNAME}.pid
+required_files=/etc/glance/${RC_SVCNAME}.conf
+
+start_stop_daemon_args="--quiet"
+
+depend() {
+ need net
+}
diff --git a/app-admin/glance/glance-13.0.0.ebuild b/app-admin/glance/glance-13.0.0.ebuild
new file mode 100644
index 000000000000..35bf1ea85a7b
--- /dev/null
+++ b/app-admin/glance/glance-13.0.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+ !~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ for svc in api glare registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-14.0.0-r1.ebuild b/app-admin/glance/glance-14.0.0-r1.ebuild
new file mode 100644
index 000000000000..02f04305b642
--- /dev/null
+++ b/app-admin/glance/glance-14.0.0-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ for svc in api glare registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-14.0.0.ebuild b/app-admin/glance/glance-14.0.0.ebuild
new file mode 100644
index 000000000000..d968f2a9e32d
--- /dev/null
+++ b/app-admin/glance/glance-14.0.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ for svc in api glare registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-15.0.0.ebuild b/app-admin/glance/glance-15.0.0.ebuild
new file mode 100644
index 000000000000..b32fcd4c7e8b
--- /dev/null
+++ b/app-admin/glance/glance-15.0.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 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 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}/glance.initd-2" glance-api
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2016.2.9999.ebuild b/app-admin/glance/glance-2016.2.9999.ebuild
new file mode 100644
index 000000000000..3de083614ab3
--- /dev/null
+++ b/app-admin/glance/glance-2016.2.9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 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 git-r3 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/newton"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+ !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+ !~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ for svc in api glare registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2017.1.9999.ebuild b/app-admin/glance/glance-2017.1.9999.ebuild
new file mode 100644
index 000000000000..abe2dce67249
--- /dev/null
+++ b/app-admin/glance/glance-2017.1.9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 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 git-r3 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/ocata"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ for svc in api glare registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd-r2" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2017.2.9999.ebuild b/app-admin/glance/glance-2017.2.9999.ebuild
new file mode 100644
index 000000000000..71b923e6de69
--- /dev/null
+++ b/app-admin/glance/glance-2017.2.9999.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 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 git-r3 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/pike"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+ !~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.22.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+ !~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}/glance.initd-2" glance-api
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
new file mode 100644
index 000000000000..080766e81a18
--- /dev/null
+++ b/app-admin/glance/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>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
+ <longdescription lang="en">
+ Provides services for discovering, registering, and retrieving virtual
+ machine images. Glance has a RESTful API that allows querying of VM image
+ metadata as well as retrieval of the actual image.
+ </longdescription>
+ <use>
+ <flag name="swift">Adds swift storage support</flag>
+ </use>
+ <upstream>
+ <remote-id type="launchpad">glance</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/gnome-system-log/Manifest b/app-admin/gnome-system-log/Manifest
new file mode 100644
index 000000000000..145f4693e306
--- /dev/null
+++ b/app-admin/gnome-system-log/Manifest
@@ -0,0 +1,5 @@
+DIST gnome-system-log-3.9.90.tar.xz 1350788 SHA256 9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411 SHA512 1500c62fed7babf2b1cc0f95e23d490bf8065bacf68c44095d882d4f429548b179df9276e3f2ff0bf03bb4db0bb5cd525e3210a5ea04f23a34e547a13f3dc2b7 WHIRLPOOL 4e3ecfd4d95ddb549c9b4c3ca9a58473b646ba8924c37633d4043a312a0cd0ae25f6e0223e0bb10977b5675e72494b1101e7a148a5e5c1e05cb28778359510a4
+EBUILD gnome-system-log-3.9.90.ebuild 822 SHA256 13221ef2ec67626d9b06a4e1b210fed7163fe4a4056828dbf1009311d3911f3e SHA512 1cfabe019b57a1aae41161f76a5383f9188ed0abc4a56fa3b8aeec0c83f7b4f57bce671fa9e9844a7d91e082aad64e3be66f66acd519a4f7afcd6dc4917be61b WHIRLPOOL 3ec1563a5b578f883698ced4bc6b82a2dd7ca5c1b69ef16fe5bf92f49834a9286e59459545ff3539c2bff66929c9d00d4983419e01dc868c3e8da96097960567
+MISC ChangeLog 2457 SHA256 ee9360d2ab0da7ba6b76ee0b584803455223ff7e4acecbcb375a86fb8c6bcfe4 SHA512 fc63faa936a4e20428abad0a1b1679c1faa3575e4a172d33cc14c2d41283aac3b63cbe32a35939a78e3d1c834c67e80af96855a674526d1edf647aa75c8804bc WHIRLPOOL bd361a75a942a11a620ba8cde1c70281e219dfbc54a3e5fde96ae85c92702bfebaaf7f0dd540e97396f8329181110ea2c22ae8aec26274082f1604682d79af60
+MISC ChangeLog-2015 2655 SHA256 e77635bae85e3f15857e4a9fa06f1e247734598dac24c26cdbdc4783e38256a1 SHA512 92b782c0c092b024320b3d3f9b2832365ce74aed2d270ca59b52256144c0c151fb9b001e355599c5f162ecbad1117d914562d28fc9971b67e78ccfde5104b594 WHIRLPOOL b58c283e3b0af2921960894554f08cc9afeab659f63396c7375e3a5ce293694fc761f4a207e16ec6714feedba9638262572af8ed0e3c989c582adb2a1161b647
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
new file mode 100644
index 000000000000..c82379d3ce5f
--- /dev/null
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="System log viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.31:2
+ sys-libs/zlib:=
+ >=x11-libs/gtk+-3.9.11:3
+ x11-libs/pango
+"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gsettings-desktop-schemas
+ !<gnome-extra/gnome-utils-3.4"
+# ${PN} was part of gnome-utils before 3.4
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-zlib \
+ ITSTOOL=$(type -P true)
+}
diff --git a/app-admin/gnome-system-log/metadata.xml b/app-admin/gnome-system-log/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-admin/gnome-system-log/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-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
new file mode 100644
index 000000000000..3ba73eb0d715
--- /dev/null
+++ b/app-admin/graylog2/Manifest
@@ -0,0 +1,12 @@
+AUX confd 391 SHA256 0dd88acff8e55bb4dbaaf89acd2d6d7b3fdb3b6002d310aef1447da3a4306526 SHA512 5adfb7b72488bd25e26fd7ddee90f50a244d2a90b3dff63fc9791fb213cf14da09e0ead75eeb33e540218b343564d7b56552414c090b517e4abdd8bc7cd58f68 WHIRLPOOL 727d1ad453143ce08587f57151886fa1ffe8bcb7cb2086c80a729b33220d846699511715fd1ed714da0858b2adeea71292626ff768993d8320f8aac36e7aadb4
+AUX confd-r1 521 SHA256 161c0126089094f4a9a61c0f174707f7831d61fab340180c7c11aa54bab2eb65 SHA512 a1fc50cbab0960cea36bf77b052284d52ec7bdd23e56d90fcb1712dcee608c4c0555557c4cfaa5fb0ce6165f0cf1a88888e705e9c64104af79a18be525ec9725 WHIRLPOOL 4e78e99e71dee56c616d216e0b59105fbb957a4eb002ccdf0b86e840a6815fbc9c7918deaed1110a8c66e293488f66773e787f5953e7451e9929eb0693f093aa
+AUX initd 1418 SHA256 feaa51d83c9671f3c1d36b5273ae16f34d183d4555ac8f7ba2a9fe2755c6312a SHA512 69017bc9679e710a100fa71f651d619c485954515883116287135a52c05335fb6f868eeda2bac4ea877ed8464a7cc2ac34df355189986aba172495aecc9a5379 WHIRLPOOL d0e9359f9fb8ad4b5bdd2ab26d3946d4d38d5d5dc7140077e3b7f674c9c2fec1a3ef5d8c4ebf8efae2d97fe03b80ad6e995ca8cca0642a269f0f91cf9acc5bd1
+AUX initd-r1 1580 SHA256 d1828acfa66c02fbb8393181dc979f7010e3aa4aa7ec6aaf5de5c39368ead7ba SHA512 871085b5b50ca473451c42a39181ba4a626475abfc7160f7308e6fae9fe78b6bcdef397c0f5a44d9949adcbaacdb0c50fe236b54e95e1602896f4339c71c3b10 WHIRLPOOL 58ccde7e6bfc08f4c7aae9c646e632780cee38c085ebdb603d4a7e6ba8580ce9838faac9529e9dae483f5285b523639a6aec5adca384aad01d11b8f7f11f28d1
+DIST graylog-2.1.2.tgz 94284738 SHA256 5d653467fb18fdd58b261598dc820f90d48e2018e7cd8d9f103003a0070d954b SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc WHIRLPOOL 1ecdb53b0ea0ad55c76604417366f21e6e2c4fb76e1cd38b93d332e08976380096b340bee6120ed2a40949ac31620e37f4ac46f3794805d0313d74211b48c512
+DIST graylog-2.2.2.tgz 99956086 SHA256 46f419d422f6e5816b29333c8510524f1bbc910d6bf00136adb3899a985fceb4 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c WHIRLPOOL aae06b70f4f12df0bb76bd6e23228d64ea19c4a6a619f5e7f4bde2fd52039959d2c949b74240ef2d229e51db25ff47465ae2786fe47e18eb0fb1fa76b8739e1f
+DIST graylog-2.2.3.tgz 99971278 SHA256 3de01e7cb8ebc02a7f06cec1c88eded3b717762447bf1b56bff8744f7f5ea80b SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8 WHIRLPOOL 60655b7f70cf7093114194239f1260d97887be344424a064b236fb152e17864110848b2143608c5908d95823fd7363cca5c73b6f2f1bffa790c269c4af9b05d5
+EBUILD graylog2-2.1.2.ebuild 1862 SHA256 d3fd4b2a16f514ba9821d6dbc79f93415610823aa8b4647586a08b15c8b0ea7d SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157 WHIRLPOOL ea0afea0f887eb4e1ffc1a0d5be7f6c75b9377115a6bff17fdbc924a9370af714fa975f224f7b58e01ece5c5eebd9b79e679847dff2568ae5f8e439d70865303
+EBUILD graylog2-2.2.2.ebuild 2199 SHA256 cc33d5356ac4142125cbbd09a15e1864052500c90095bd42e887059b62db5d4f SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f WHIRLPOOL add6e47b5b7dd8ad8369611c94b9dc4e14703843532875280607b0733c2c632cefd2254359ad5884e451092f8559ce7bd09c3b09c667147ecc23f55d08e2557a
+EBUILD graylog2-2.2.3.ebuild 2206 SHA256 16ad6e6cd31706bad25084b5a4d6fcec39ecac070a10d3e0e965a876f26bf99c SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016 WHIRLPOOL 91ae4edcfdb4a2ecd5ffa0563dfa3f67e5faa0eae8b7470f1c2c81551e487d739e5c85e5f3db081aa85e33203870b24e7ce6025653fcc5e4a06b830a84612d79
+MISC ChangeLog 815 SHA256 4a61e436efbadfd95b133e4edb8b0adfbea9385b5d7b6ed5b29b996bb1c284c9 SHA512 b2674d7e916ac259981da6ef9a3104fe968ef796f8839407859dbbaea4df06c11aae731bf1fad2a9530ba45a604df30b985621c2ee77f1093a17d783f64b3f94 WHIRLPOOL 952ccd1c70c737041b585329b71da555b68bbce5d52a5d20c5ce2b4f8811a2c434c73993965bcb9641a2c27667ed1597125d73d9648c9378c6c11788bf709279
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/app-admin/graylog2/files/confd b/app-admin/graylog2/files/confd
new file mode 100644
index 000000000000..58291368f353
--- /dev/null
+++ b/app-admin/graylog2/files/confd
@@ -0,0 +1,7 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_USER="graylog"
+GRAYLOG_OPTIONS=""
+GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
+JAVA_OPTS="-Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/confd-r1 b/app-admin/graylog2/files/confd-r1
new file mode 100644
index 000000000000..23b632ac4338
--- /dev/null
+++ b/app-admin/graylog2/files/confd-r1
@@ -0,0 +1,9 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_USER="graylog"
+GRAYLOG_OPTIONS=""
+GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/initd b/app-admin/graylog2/files/initd
new file mode 100644
index 000000000000..20c2143e96c9
--- /dev/null
+++ b/app-admin/graylog2/files/initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export JAVA_HOME=`java-config --jre-home`
+
+checkconfig() {
+ if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
+ eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
+ fi
+}
+
+depend() {
+ need net
+}
+
+start() {
+ checkconfig || return 1
+
+ [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
+ install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
+
+ [ -e "$GRAYLOG_LOG_DIR" ] || \
+ install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
+
+ CLASSPATH="$(java-config -r)"
+ CLASSPATH="${CLASSPATH}:$(java-config -d --classpath sigar)"
+
+ ebegin "Starting Graylog"
+
+ start-stop-daemon \
+ --start \
+ --exec "${JAVA_HOME}/bin/java" \
+ --user ${GRAYLOG_USER} \
+ --group ${GRAYLOG_GROUP} \
+ --env CLASSPATH="${CLASSPATH}" \
+ --background \
+ --chdir /usr/share/graylog2 \
+ --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
+ --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
+ -- ${JAVA_OPTS} -Djava.library.path=`java-config --lib sigar` -classpath "${CLASSPATH}" -jar /usr/share/graylog2/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Graylog"
+
+ start-stop-daemon \
+ --stop \
+ --pidfile "${GRAYLOG_PID_FILE}"
+
+ eend $?
+}
diff --git a/app-admin/graylog2/files/initd-r1 b/app-admin/graylog2/files/initd-r1
new file mode 100644
index 000000000000..cc068808ebf3
--- /dev/null
+++ b/app-admin/graylog2/files/initd-r1
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export JAVA_HOME=`java-config --jre-home`
+
+checkconfig() {
+ if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
+ eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
+ fi
+}
+
+depend() {
+ need net
+}
+
+start() {
+ checkconfig || return 1
+
+ [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
+ install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
+
+ [ -e "$GRAYLOG_LOG_DIR" ] || \
+ install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
+
+ ebegin "Starting Graylog"
+
+ checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}"
+ checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data"
+ checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/contentpacks"
+ checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/journal"
+
+ start-stop-daemon \
+ --start \
+ --exec "${JAVA_HOME}/bin/java" \
+ --user ${GRAYLOG_USER} \
+ --group ${GRAYLOG_GROUP} \
+ --background \
+ --chdir ${GRAYLOG_INSTALL_DIR} \
+ --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
+ --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
+ -- ${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Graylog"
+
+ start-stop-daemon \
+ --stop \
+ --pidfile "${GRAYLOG_PID_FILE}"
+
+ eend $?
+}
diff --git a/app-admin/graylog2/graylog2-2.1.2.ebuild b/app-admin/graylog2/graylog2-2.1.2.ebuild
new file mode 100644
index 000000000000..d6c214a10d01
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.1.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+QA_PREBUILT="/usr/share/graylog2/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+DEPEND=""
+RDEPEND="virtual/jdk:1.8"
+
+INSTALL_DIR="/usr/share/graylog2"
+
+pkg_setup() {
+ enewgroup graylog
+ enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+ default
+ # graylogctl is replaced by our own initd
+ rm -r bin
+ # Stick to architecture of build host
+ if ! use amd64; then
+ rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+ fi
+ if ! use ppc64; then
+ rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+ fi
+ if ! use x86; then
+ rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+ fi
+ # Currently unsupported platforms
+ # QA warning galore but testing/patches welcome
+ rm -r lib/sigar/libsigar-ia64-*.so || die "Failed in removing IA64 support libraries"
+ rm -r lib/sigar/libsigar-ppc-*.so || die "Failed in removing PPC support libraries"
+ rm -r lib/sigar/libsigar-*-freebsd-*.so || die "Failed in removing FreeBSD support libraries"
+ rm -r lib/sigar/libsigar-pa-*.sl || die "Failed in removing HPPA support libraries"
+ rm -r lib/sigar/libsigar-*-solaris.so || die "Failed in removing Solaris support libraries"
+}
+
+src_compile() {
+ einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+ insinto /etc/graylog2
+ doins graylog.conf.example
+ insinto "${INSTALL_DIR}"
+ doins *
+ newinitd "${FILESDIR}/initd" graylog2
+ newconfd "${FILESDIR}/confd" graylog2
+}
diff --git a/app-admin/graylog2/graylog2-2.2.2.ebuild b/app-admin/graylog2/graylog2-2.2.2.ebuild
new file mode 100644
index 000000000000..b61f58667285
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.2.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+INSTALL_DIR="/usr/share/graylog2"
+DATA_DIR="/var/lib/graylog2"
+
+QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+pkg_setup() {
+ enewgroup graylog
+ enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+ default
+
+ # graylogctl is replaced by our own initd
+ rm -r bin
+
+ # Stick to architecture of build host
+ if ! use amd64; then
+ rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+ fi
+ if ! use ppc64; then
+ rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+ fi
+ if ! use x86; then
+ rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+ fi
+ # Currently unsupported platforms
+ # QA warning galore but testing/patches welcome
+ rm lib/sigar/libsigar-*freebsd*so \
+ lib/sigar/libsigar-*solaris*so \
+ lib/sigar/libsigar-*hpux*.sl \
+ lib/sigar/libsigar-*macosx*.dylib \
+ lib/sigar/libsigar-ia64-*.so \
+ lib/sigar/libsigar-ppc-*.so \
+ lib/sigar/libsigar-s390x*.so \
+ lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+ # remove plugins
+ rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
+
+ # gentoo specific paths
+ sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
+ s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
+ s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+ graylog.conf.example || die
+}
+
+src_compile() {
+ einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+ insinto /etc/graylog2
+ doins graylog.conf.example
+
+ insinto ${DATA_DIR}/data/contentpacks
+ doins data/contentpacks/grok-patterns.json
+
+ insinto "${INSTALL_DIR}"
+ doins *
+
+ doins -r lib plugin
+
+ newinitd "${FILESDIR}/initd-r1" graylog2
+ newconfd "${FILESDIR}/confd-r1" graylog2
+}
diff --git a/app-admin/graylog2/graylog2-2.2.3.ebuild b/app-admin/graylog2/graylog2-2.2.3.ebuild
new file mode 100644
index 000000000000..a7b8cd7ab679
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.2.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+MY_PN="graylog"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+INSTALL_DIR="/usr/share/graylog2"
+DATA_DIR="/var/lib/graylog2"
+
+QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+pkg_setup() {
+ enewgroup graylog
+ enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+ default
+
+ # graylogctl is replaced by our own initd
+ rm -r bin || die
+
+ # Stick to architecture of build host
+ if ! use amd64; then
+ rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+ fi
+ if ! use ppc64; then
+ rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+ fi
+ if ! use x86; then
+ rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+ fi
+ # Currently unsupported platforms
+ # QA warning galore but testing/patches welcome
+ rm lib/sigar/libsigar-*freebsd*so \
+ lib/sigar/libsigar-*solaris*so \
+ lib/sigar/libsigar-*hpux*.sl \
+ lib/sigar/libsigar-*macosx*.dylib \
+ lib/sigar/libsigar-ia64-*.so \
+ lib/sigar/libsigar-ppc-*.so \
+ lib/sigar/libsigar-s390x*.so \
+ lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+ # remove plugins
+ rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
+
+ # gentoo specific paths
+ sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
+ s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
+ s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+ graylog.conf.example || die
+}
+
+src_compile() {
+ einfo "Nothing to compile; upstream supplies JAR only"
+}
+
+src_install() {
+ insinto /etc/graylog2
+ doins graylog.conf.example
+
+ insinto ${DATA_DIR}/data/contentpacks
+ doins data/contentpacks/grok-patterns.json
+
+ insinto "${INSTALL_DIR}"
+ doins *
+
+ doins -r lib plugin
+
+ newinitd "${FILESDIR}/initd-r1" graylog2
+ newconfd "${FILESDIR}/confd-r1" graylog2
+}
diff --git a/app-admin/graylog2/metadata.xml b/app-admin/graylog2/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/app-admin/graylog2/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>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/grubconfig/Manifest b/app-admin/grubconfig/Manifest
new file mode 100644
index 000000000000..c08986cb3648
--- /dev/null
+++ b/app-admin/grubconfig/Manifest
@@ -0,0 +1,5 @@
+DIST grubconfig-1.28.tar.gz 11715 SHA256 8b4cf9bebebebae09bc986571fa4811d5a6c67137b1f0004ea2e0f4279bee98a SHA512 1a2d864dd4d20162c55c2adf728040f1498035f04d544847f7e141bb749ab0ea9e40aaf6888e151dc8a9712d937c7f5b3630b73488f6d495199ea1041b76c2cd WHIRLPOOL 509cf926c0f723bf1b1bfb002c7c8d08b7afc72ef326bc463f8ff926dba173e1370d0ddebf81fc2101a79d206f3af078c8297de29bfb6f423e67b6a759464e0b
+EBUILD grubconfig-1.28-r2.ebuild 566 SHA256 e351786b42a3a2686c4485f74a04ef152e9db636272c992e39d1a7a8376b4ce6 SHA512 65b6f19ad12e32d8f3e3afff4efe7fc8e02ee659504e9f0fd804ddc0009863f627661e060df6067890a3eb3238a119bd221c571c3d24bfedeeae8e2651c692ed WHIRLPOOL 5458de056cc37be50520636df148f15e1a0d44df2a4b0d0045a3d2306827ce1d8703f240c6a86b58a3317cd066793f64242af0d257fd301bf61437f30be77fa6
+MISC ChangeLog 3168 SHA256 c09ade252c56ec51f20fd93a29b567082eeffe76add9ac4637339e778f5362a2 SHA512 2238d7cf8347ae10ccc7e2c5392ac0c2e103cf9c1d2717be3794f887d223e8cc93ec84fe3086fc09e12c1214c457319e5f2746123b9b2e21dbc558c700e49b5b WHIRLPOOL ef725ffe3969aa6e6136b75a685a961f93aaed6516ad2d6990cfb1d49c80a2e83f8a30b78f81faa2ab1e5b8ed890519dd014f965bc6fe95751700a9bec1eb85e
+MISC ChangeLog-2015 2620 SHA256 08dce67437831c771c99ce135d028b6b64fc3f3d7d049a8eb4ee6748c75eef54 SHA512 f9ea9705b39fdac2fb3bbebd819de10566390b5282e10b4b6580bafb1de79137f6905405fc7c6c003400e2eb85626e821b6d58f5a09659ecfc7f6073676e3726 WHIRLPOOL 2d20c777925892a58d233143374697e9674e8954bac2efb696656826fa7ef7ef0304ee7c0713b974ab60f85ba0ad30172b47fb40a5d00c3ebcddaad74c0c2186
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
new file mode 100644
index 000000000000..62c8d0e125b6
--- /dev/null
+++ b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Simple Tool to configure Grub-Bootloader"
+HOMEPAGE="https://web.archive.org/web/20100410042718/http://www.tux.org/pub/people/kent-robotti/looplinux"
+SRC_URI="http://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-util/dialog-0.7"
+
+src_prepare() {
+ sed -i \
+ -e "s:/usr/lib/grub:/$(get_libdir)/grub:g" \
+ grubconfig || die
+ eapply_user
+}
+
+src_install() {
+ dosbin grubconfig
+ dodoc README
+}
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/grubconfig/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>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
new file mode 100644
index 000000000000..c1f8b299b1e8
--- /dev/null
+++ b/app-admin/gtkdiskfree/Manifest
@@ -0,0 +1,8 @@
+AUX gtkdiskfree-2.0.1-desktop-file.patch 625 SHA256 b20d728e5400d420c56f8c6c566179c208bd4ed52154d0dbf5df8632766952d7 SHA512 f32414d978a9f12d21828024bcfdbaa9046ca68bfe7e197563a32372d892e3562bba8e32756b7fc42891ed49b3a7ee111ae96c5a8e453a1bf8edc22bc53825c8 WHIRLPOOL 768bbef20789b9d36d69264af1f5744516a613cc101fd8c36761a2535807bc87acc518d30e2cc1e6e24b649c4c746adced8e9fe1683cf59d2ac5ea888cc0752d
+DIST gtkdiskfree-2.0.1.tar.gz 354661 SHA256 eb4369db5ff98df487b43fd59f998f3524a87896686cd2e9c5adccea3bfe7e94 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8 WHIRLPOOL bd4aaeaea45703e62478a28a7b4b349fafdf0846d53f106837c332385efefde1ecb9a6637cc045b2949cc0dddf33aa416da7d1635a75972cb4af5aed348aa2d3
+DIST gtkdiskfree-2.0.3.tar.bz2 216189 SHA256 d159bd28848c4c1e6b5a76a714c1780f7e4bf2a8183de59b5c912c9f707bd063 SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe WHIRLPOOL 5a4c860ca1772b4aa45f45456f0903a3b943a075eecf50e65dff84718681238b65a69700dbb6d8f08d9df8e439d678adc1855023184f3350bcb8813208637ba6
+EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 SHA256 e87295570fe36c9600053cf97ee13b9d03e75a5017afd3ae0e8ad5ed7589c2f7 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3 WHIRLPOOL 7ec576917ee59a03b5dc2bfd4436d65a7dcc34d6cb176456f91f4a27270d98bc8418af70a38df73ed5c5063d959a9729185e30f3a0fc7aa110ffa6e89f8754f0
+EBUILD gtkdiskfree-2.0.3.ebuild 606 SHA256 a98e5dcd44615104e5bd3b22fd49c933886de0efe6c351fcbbcba0e22bf206fa SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962 WHIRLPOOL 50821bc9adbec6b8919189a1142690cda00c0ac3b27d196d975adcfd5ee23da65a096e8abbba689fae89826173afa7343c2efd6cff21f432ed269abcb0d83b78
+MISC ChangeLog 4469 SHA256 bacfd036875c6d2d84bf43bef89657ac60c930a225a1f9abff294e279c56834c SHA512 e79acbfc379787f9cde14cf1e80003a6bb488524889a3726c2f00616738bbdc110be454612aa0f46c1dd97b99b93d3ab09029cab27e72d8127dc364d9d6c6030 WHIRLPOOL 963df30ba55077d7152c2598e4d37035452fa68eb3bf5e7f70b0fee81d923b3fd6da0a3f004f80e07c2164601643490e8c9765ae7b36e700a854d1fd1b72addd
+MISC ChangeLog-2015 5719 SHA256 b5b5b0181aec03961e129c4ed9abdfd1b116eb1619308e4b5799ccc0feffe3e6 SHA512 16c02ea66377a861b21188dbf061b248c6ec29480cce1755aee9a9fb958bcf9e1554eda0f49d4967338734687be53e8ae5678a7eb2411ff5bf9f597cfd631990 WHIRLPOOL b5189be4bbec2397f0aef03e8c051eb862644cf15b1240096dff1e478b09a4f01f70cd7f466491f08515229d29b6c28e6f045ef59f9a00b407be300eeba0c281
+MISC metadata.xml 768 SHA256 1295b20100f1367e865c65154a8425d7845e178e91c79e945e501afbd0c0681e SHA512 b03701be9043ae98fba4b6be78489dc738c84f06bd600cace10978322904431dcc2d42fbb0b01abba9f87cb1a337af354e1cbbb367f0d13bf5f82e57e189f233 WHIRLPOOL 98b2ab20c4df519c864bd8d5e02a9556971e2dc31370e5c091d9f15343743ad356f1b162b56b5af1d0c511884fd493619a97db39affd877dfc52c5d0e05af94c
diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch
new file mode 100644
index 000000000000..ca2858904e33
--- /dev/null
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-2.0.1-desktop-file.patch
@@ -0,0 +1,19 @@
+--- gtkdiskfree.desktop.orig 2012-04-05 21:59:26.000000000 +0400
++++ gtkdiskfree.desktop 2013-08-19 20:26:50.127669805 +0400
+@@ -1,13 +1,9 @@
+-
+ [Desktop Entry]
+ Name=GtkDiskFree
+-Name[ru_RU.CP1251]=GtkDiskFree
+-Name[ru_RU.KOI8-R]=GtkDiskFree
+ Comment=Free space monitor
+-Comment[ru_RU.CP1251]= .
+-Comment[ru_RU.KOI8-R]= .
++Comment[ru]=Индикатор свободного места на диске
+ Exec=gtkdiskfree
+-Icon=/usr/share/pixmaps/gtkdiskfree.png
++Icon=gtkdiskfree
+ Terminal=false
+-MultipleArgs=false
++X-MultipleArgs=false
+ Type=Application
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..d6cdb81631ea
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 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 flag-o-matic
+
+DESCRIPTION="Graphical tool to show free disk space"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-master"
+
+PATCHES=( "${FILESDIR}/${P}-desktop-file.patch" )
+
+src_prepare() {
+ sed -i \
+ -e '/^CFLAGS=/s:=" -Wall -O2 :+=" :' \
+ configure.in || die "sed on configure.in failed"
+
+ # Fix underlinking, bug #463578
+ append-libs -lm
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --without-gtk2
+ $(use_enable nls)
+ )
+ autotools-utils_src_configure
+}
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
new file mode 100644
index 000000000000..25ff319c3ea1
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+DESCRIPTION="Graphical tool to show free disk space like df"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+SRC_URI="https://gitlab.com/mazes_80/${PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk2"
+
+RDEPEND="
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ econf $(use_with gtk2)
+}
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
new file mode 100644
index 000000000000..ad5597b0a493
--- /dev/null
+++ b/app-admin/gtkdiskfree/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>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
+ <name>Samuel Bauer</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </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>gtkdiskfree is a gtk extension to the cli tool df, does the same and more
+ </longdescription>
+ <use>
+ <flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/hardening-check/Manifest b/app-admin/hardening-check/Manifest
new file mode 100644
index 000000000000..d1dbc616199e
--- /dev/null
+++ b/app-admin/hardening-check/Manifest
@@ -0,0 +1,9 @@
+DIST hardening-wrapper_2.5.tar.gz 21157 SHA256 9ae2cc44d9543476b5b8655b4699af5421218dce44ce0d4a89cf5d81ba12b9bf SHA512 e2c183736e9f1dd1b39ecde7d2bf2c22d4c87c69cb158d98bb527b8325d88ea86bceb6087633cc761e973a22d0cf97c6266464d117e408ed2aee2e67c8ab5565 WHIRLPOOL 652327876a29ad8a69529bcb85b1331a227348a1ca87c1e5cf69fbcea0ad7c57afdcb14536eebfc8668834a701ee80f8579b8851f596e41ee782e4c6dbf47cb9
+DIST hardening-wrapper_2.6.tar.xz 19436 SHA256 c5fc46439646d0929a0605e4f3db67e57eefbbf5ceec5a2888440dbdf4450224 SHA512 924d9d816148bc5f2d25d66fd24c7b2a77fef8d62eb7656d4c9b0ee50c767789f25aaa3b776138103682366ff7c2266be4a207d4b11361655b5097131033283e WHIRLPOOL b74177a5f12984d381f3f9143a03605b157f571edc9ed09cdea2c72920c41aea3b1e5687409539cc087d66dd6a496e6204a1d5f165ce7070849d34b3ee851134
+DIST hardening-wrapper_2.7.tar.xz 19604 SHA256 20c601c6ccac7534d17d4be9442a4ad8f02b8461c2c50dee8b45d596cd6cf8e7 SHA512 834242b28e06f32d6e899f13fcfc66f560e4137267f8cb46fab21337240fec612ea2803345012308af50c0fc4af92f52a28a18803ba330998ad7cb1321023121 WHIRLPOOL ebcee88c6225187b685f0c4792642131a8b9cc3b28fc293348c0cb59a5dc1f484df526f27fb9761204cdefae3d8a99975353a2160ec4fe4ebdea79cd4a8e4dd7
+EBUILD hardening-check-2.5.ebuild 556 SHA256 172cf7775994b1c96785af3fc26638474e95e40e4c0eaebae22f6c926bec02f1 SHA512 5694da1316e087986930237f4fd5e752768be07235f6c9c2fc4c95ed89514588a9773fe374225ea4216c3a493172823fb3b9e05478e8a5f0f36203834ca2ac55 WHIRLPOOL 11995b4522c907a791cbcaa86bb574bcf3de0410d4e3cf7001f48d1e2ae73c809e38778c59d0fdcb4b8de87292a058ad2d71d84a1cd04dab2159eabc5737d82d
+EBUILD hardening-check-2.6.ebuild 571 SHA256 4ec9656070df23d74284dd4deebfd9fb454817b878c3892220ccafa6a36973f6 SHA512 9a34d79a769ce49efdbc448d0c6daa65ee118ff335c8cf774e058291a14871fdc8d44283c53da9ad4db6888be5b5552d7098a9910d895440809c299a6f31401b WHIRLPOOL d1c798d3a76722da136f154f8d77692b58714fb6f403611bb6c08820555e94e9a79eb92424f2bcb491d4a5ceeefc8cc19ed4f51b0ef583c909878d5b92b8ec8a
+EBUILD hardening-check-2.7.ebuild 588 SHA256 60d45b99c992ace03d5d79a91a7c678f52ec8142880afde061db52cc174f2ad6 SHA512 009c7b2eb86d6ae882c097dde72d9d1ae055db7db3be19a4224d74f0f1d4035c918f68f3b23a5da98b66a06ca6b7133d5ffcb12d5df2da8d92d0bf02c056384a WHIRLPOOL 81560057f41d03e1ec0eef8f2b100857605157612a020cfab9707a6764b1d4c7334a75d08ab57dd3e0e39396293017abc8f1fa67befc7098c5fca9349bb85e47
+MISC ChangeLog 2911 SHA256 1b9a7774097a43a63eabb5fab934dbff60e9fc5d60d5146cc73c6a94fe08ef46 SHA512 69b1adb114ae7f8ec0cf6ca2a012538c0b66794a91e51eed6c333469286710ba9bf894e0d9dde6026d3d3dfbf098e7812029eb0f6d0cd96f5fd2a3094d442a9e WHIRLPOOL 3b2f8d23edbd4dfaf753d6fb36c56f2523febc4957f5b37f6d1c0a8b1ec2fdfbcd0ada47a61e7ee28645b2841c0957dc2d403f0677536c832b4b537b1d07b85a
+MISC ChangeLog-2015 1773 SHA256 3ff5b6d9dbb542299fbbf6730cde292d66c6802e24ebb218a9993c707eece381 SHA512 a584e6c9190788c832e69ddb334cf8fbcedecb317ebc3937a28ffa240b910c9d64c657d65fb09658c06e656262dc5afd6aa0f5527b255bea701d381311c0598e WHIRLPOOL 009a55b195af1039018e9f5f578f453ff38ff0a6d1532ce1ff91167894aac07240186b18d5c0fc076a20e5fada04f96d83f9671e1309e9de89cf931694f22455
+MISC metadata.xml 429 SHA256 4dbef20254010fa1a5178212615a446e888129ca6c1cfd9ca88848ea395cf49f SHA512 f70c83d5ca8dc1582a416cd3ae51c98bbe039d9d0c1ad1e1f2fc70775f8aac89ef1e4b9dddf65525556e6255796e8bcfc16ddb1d9c2fb6f15aedd44053c7cf7b WHIRLPOOL d8cbfdfa5db20bace9391e9a32e01916377056e94b43a9feec66c000411fec957892c7006fbd03f42c42d7fd19680160978f2f2d2b26eef8635f7b3336a03098
diff --git a/app-admin/hardening-check/hardening-check-2.5.ebuild b/app-admin/hardening-check/hardening-check-2.5.ebuild
new file mode 100644
index 000000000000..d52c84c63f0f
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.gz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.sh ${PN}
+}
diff --git a/app-admin/hardening-check/hardening-check-2.6.ebuild b/app-admin/hardening-check/hardening-check-2.6.ebuild
new file mode 100644
index 000000000000..89d34e65467c
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.sh ${PN}
+ dodoc AUTHORS
+}
diff --git a/app-admin/hardening-check/hardening-check-2.7.ebuild b/app-admin/hardening-check/hardening-check-2.7.ebuild
new file mode 100644
index 000000000000..48aab59373bd
--- /dev/null
+++ b/app-admin/hardening-check/hardening-check-2.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+MY_PN="hardening-wrapper"
+
+DESCRIPTION="Report the hardening characterists of a set of binaries"
+HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.sh ${PN}
+ dodoc AUTHORS
+}
diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
new file mode 100644
index 000000000000..a2db75c7084a
--- /dev/null
+++ b/app-admin/hardening-check/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>ago@gentoo.org</email>
+ <name>Agostino Sarubbo</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>kees@outflux.net</email>
+ <name>Kees Cook</name>
+ <description>Upstream - please CC on bugs that concerns upstream</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
new file mode 100644
index 000000000000..df465c8d01e2
--- /dev/null
+++ b/app-admin/hardinfo/Manifest
@@ -0,0 +1,5 @@
+DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 SHA256 afebba2f2ff666577f5871bb34f43f8613163b264d3805b42d38bca59905b542 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1 WHIRLPOOL 416ef939f3747983f0736efb8cf317f19b4eee7489dea7caeff77782922b09b53442a6b08ec44357dfbe39cc552c7757b99365924b7b48ee92d780feffd3242f
+EBUILD hardinfo-0.5.2_pre20130823.ebuild 499 SHA256 ff78c41d2362acad8294f41987b31b6966947c18f920e8facd6bc556460ac5b0 SHA512 e8848107b3caf8c2673cab5b36889f82c5f2310649545356e676ec59ee3f390b085210aedfcd3925069f213a34475188d811b83ee8c26bff4c3de734fe5290aa WHIRLPOOL e9c77d42665be27f7e732f582576ed1eb98e08f149b34e4bdfdcb34191c1c0b78af947c56ac4b4404415d941db9c147dbd218ac6fed66aa82efc8112881ed7c7
+MISC ChangeLog 3334 SHA256 a7e783f11d4ab9af3e78b141dbbba4d4835526ee15263a453fa3e6c76fc43441 SHA512 aa9aaa95a444b75cc6aa0f9c7d07234ab4052ae3a4358a43adaa5eb570297ec65e16ebc8fcf2595f6462b06910da55a45f5b0a2c38ce88bcdfbb32a37c9c73bf WHIRLPOOL db98fe71464244de8318f4f92170a81e360a34ba0dd94847d15f66fe70747b51c2da3c057b7111765649bd938723b0271ae0172a9ceca46909817fab7078b079
+MISC ChangeLog-2015 1909 SHA256 03715876a6072a4ac16483e2173e7a81af249a1ef1b628a8eece10652c12c817 SHA512 d8f3cfc8dc401ff19cdd5c7975c9f0d4b9c14e6722d8047d47ae13c7a02b1d05ec26bae760abebb533909136db5f22862cb2c6a3ab4746e3971b57dc0f9f8092 WHIRLPOOL 8ee0e57327299789e63372ac62b57592a238191dc2139dd94ba55767735b380e5505b3b5ebcd444434549975691d3cfb7d660408a544a98bfb9ed656957cd5b2
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
new file mode 100644
index 000000000000..bd0e475811f1
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.org/"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ net-libs/libsoup
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/hardinfo/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-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
new file mode 100644
index 000000000000..142a41bec5cf
--- /dev/null
+++ b/app-admin/haskell-updater/Manifest
@@ -0,0 +1,7 @@
+DIST haskell-updater-1.2.10.tar.gz 26586 SHA256 e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c WHIRLPOOL 930975884f1f2b3ae47902cf3e4e88894ee7d4227dbf8bbd06e4f893d00bd715eae5ffd5c78375edf9d43f853da0fcac856492520de350ca1d044ee9da6a1dca
+DIST haskell-updater-1.2.9.tar.gz 26675 SHA256 eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859 SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da WHIRLPOOL e28c55e9bd2d9033b42fb42e2db6ff2911a2fb50a5d1ad276d6344ca29b4b05abf73d746604ced6766b983d8a7e6e688534be28ba61f0c62f8aca20d9a46c669
+EBUILD haskell-updater-1.2.10.ebuild 1095 SHA256 32f72f894687f4206a409a1da939620f6cac6bba5b41c02d2340fd0b967f8b26 SHA512 7c634de327d5c3e5254e84ca936e09d9f7063b5aec64e6d62c2b97c19caed1f2f389bcecbb5997cb95e59bd76eea3d7ae461ee55a08842eb59bf4c56f67a62aa WHIRLPOOL 5d8bc2f382b20a30d442dd008306aab55bfefabce816dbb567faf641618cc6966cd45564ed1eac90709f5e6323f0d4c169869ca07316ae36c597ffaa0dd28d60
+EBUILD haskell-updater-1.2.9.ebuild 1095 SHA256 c4c57b34c041a559058510e82ec6092a99e105ea85d970e48e7eaa0c8afa1def SHA512 8f4e469c4f971a678fe35df8223beff476fa5ef5d02f471fec2a751a6fa553d484206d4b9507473d7d613080789271d1f0c3e2fb479b769fe3aa14dc2e15da34 WHIRLPOOL 48f223f3d63364213de9c09298f605dfdca168758372d265496051bcc09b73fa7d73fef2cd2668068aa9994e38d1fe632f64486e75fec85471da32b004390a40
+MISC ChangeLog 3241 SHA256 23e6e9bc8e1fd073b9389f353dd01d772903d2f118fa9a82a31ff1dec7398490 SHA512 4e1da6e6ea186945cb2fa8631f2a25b5613c7b6f707664c753575dc5b3e4c673f14a3a0d48705d4197249c80106459458de48a35854fe5a6098567130f8138f7 WHIRLPOOL f6ac4df52eafbe69619212d77282a9ffc3fb4e1568676c64de1b295d49029af938347c0ef2606bada82d3cf10f67056ea1d3b65cf23fb9884bbfc2a41e3f5414
+MISC ChangeLog-2015 12475 SHA256 0de1da7317e6a15580a98a4c8f3bec32544e6480de7ca5b9758bb355bcbdf82d SHA512 06a80765d7c8d95e681f94ee35f7fc6a28e49084e051d7f20ae536313c1d95c74a8c1ff4ae7312a8b07d9521aa8bc73d05f6941400b1c3c4b1591d5ec8253548 WHIRLPOOL b2c06dc6f74613b2fbf8a9414826447d3369aa0c9383a2ef161ce78e02ccae3587695a33a964e628b3e81e3161c5aa58756206cc78dae9b7126636e41c9f2e8e
+MISC metadata.xml 249 SHA256 42d7c7dd941e18315af7fac3764608244765e6ff2ef268e05606543f7c1d2356 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 WHIRLPOOL d7559dc58d8f1945ae7523fee4bf65454c971fa788032e0a767f2b6a6366db3ad86e21ab6a46412db18549ecf39575a6f21b94a421f839b0efe47a7b5200648a
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
new file mode 100644
index 000000000000..5b32badf0183
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+ sys-apps/pkgcore
+ sys-apps/paludis )"
+
+src_prepare() {
+ if use prefix; then
+ sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+ "${S}/Distribution/Gentoo/Packages.hs" || die
+
+ sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+ "${S}/Distribution/Gentoo/GHC.hs" || die
+ fi
+}
+
+src_configure() {
+ cabal_src_configure \
+ --bindir="${EPREFIX}/usr/sbin" \
+ --constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+ cabal_src_install
+
+ dodoc TODO
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
new file mode 100644
index 000000000000..b9e1932fd81a
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+ sys-apps/pkgcore
+ sys-apps/paludis )"
+
+src_prepare() {
+ if use prefix; then
+ sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+ "${S}/Distribution/Gentoo/Packages.hs" || die
+
+ sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+ "${S}/Distribution/Gentoo/GHC.hs" || die
+ fi
+}
+
+src_configure() {
+ cabal_src_configure \
+ --bindir="${EPREFIX}/usr/sbin" \
+ --constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+ cabal_src_install
+
+ dodoc TODO
+}
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/app-admin/haskell-updater/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>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
new file mode 100644
index 000000000000..a9f1b3eac175
--- /dev/null
+++ b/app-admin/hddtemp/Manifest
@@ -0,0 +1,20 @@
+AUX hddgentoo.db 18805 SHA256 799487ec3ef2bfa1b2a8adf7316cb2714a8e03101875b72f4d03c2865435ca58 SHA512 b0358f48f6e1389d0c8785b0e65fd2d65833803c2014035ddc5f223405da363556d573d50b21b2b3bdda9c81eecfb9419c3edf0a34e315493a8e5eecf4fd060b WHIRLPOOL 0f97fdfc34ff3ed1716b05c7003d39d2c9336d4a32b84b3ea75b43b8a859a84daa2b5d656a3abde60ccb1d08a21bdc12892ae19c3c0a2f184638a44159e9a502
+AUX hddtemp-0.3_beta15-byteswap.patch 1037 SHA256 85eeaff97c96d2f77a93caa3270ee598f756c4eb0da6753e5ee8602fa1a5bdec SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8 WHIRLPOOL e1ce1bfae1964c97aba189158d2ea6e027a1b74fbd392e395d4ea46d69bc2412a2492d3fa1acff6472085bb4af40c88a2dd54a783db7d35b270c61619f09fb2d
+AUX hddtemp-0.3_beta15-dontwake.patch 515 SHA256 796031779f0105e7eb991e0e69d3261a484349737f09d50a2d8fdd15dbb7f544 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1 WHIRLPOOL f2b6086585263d704ca4afeba00db8b5460b9046de44020959a4f37ca22b732040e24365447bcaf55b3b21eda54752c8b155329c3ccf8db4efe16dae8490e9d5
+AUX hddtemp-0.3_beta15-execinfo.patch 751 SHA256 8f896c478f8f2b1776ff4e16fe1f12f0829d044a14e37df48e098aec80812c5c SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6 WHIRLPOOL 436c15a16a7a141a3dbd2195e14e00f46296e50091582adbab8d99e673db59b2d59caafe1d4f5f38595a770d058d6bcdffab0830323891a86ea52bf0e23fd91f
+AUX hddtemp-0.3_beta15-iconv.patch 780 SHA256 542f5b064098961b2fae4ab0185731b47d412c7e4cc8d8972694228f9bb1415f SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce WHIRLPOOL 0173f4c5afc4cabb50be1566472997106e3375e0ae61e1ff48676a08a06f199d24d98cd2ac669cd39a330f60e2b44322621dc0efdf4f4c2e9a80fde7e9035fcf
+AUX hddtemp-0.3_beta15-nls.patch 414 SHA256 c81efff92e3cd52257438b834df652cfea8535140fe8b67ebded14fd29c3dd9c SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6 WHIRLPOOL 050113fc1270ee3cd09c48275eba19bc9ea96a4854e4b6075cab03b65fd48bc35895f0d8208baccdb5b9355068a706ce5f4ec8a9dbeceaaba012053652ccd742
+AUX hddtemp-0.3_beta15-satacmds.patch 986 SHA256 f3ae8ebd08d598cf9292d08e5fe07f54f894da7a90f02dcc9c46bb8d37afde56 SHA512 436e4e8370ef5d1946559ed6625d435b01c71019e0d39afb10305814825e8fb4cd98f23bbd860c8a94490285bb54cab2db84a8693255223cf44a7bcf77b60d2f WHIRLPOOL 8e7fefe631e89b79a0ff1344208acc81116134cebe54e61ea991b27a7aecf8b515aa861d6a39c79cfbd02cfe6a5c81384c21b5390617ce477538dba7de1ccabe
+AUX hddtemp-conf.d 304 SHA256 3d9c717ba03c84943f3e38fa14823e5ed6752a3fe79dd80b6fe2a97d9687a498 SHA512 b82d4be9edceac534bdb953b9ae5b49f4eb717fad8de8847bf43678451361438397b98280c291c638f93dc7d3b4dbb9d7cfae9c8263be007f908eaf6473b198d WHIRLPOOL 7be64efe932e9bfa308397dca4ecec96b6af0bcaf15b5be2c476b627338271126e19d1e95afe10df54e57d81ece75a3d8ef24cc8d41ac73c6bd19c4069e68b58
+AUX hddtemp-init 434 SHA256 6cb8b6d2021981103b95780d6bcb804c06a814229049b441b735b455aef3a616 SHA512 cb08834efd0e8f1a69bb07d7eb8ae75997072c0c1c04ac4ef1f10d561a29b56593efe52a30346b2fd88e0a50baa791c2a10655415a1ce97afd50a39effbaed64 WHIRLPOOL 6f723cc67e8bf3ac1168688f6ea020efc51eb630143da73815ae0514539e409b2f930ec43e82096bedfef15a80b98d062a587863040e3ad32083a14c56d68814
+AUX hddtemp.service 283 SHA256 8c7379f3bb88f29cd3a98f57655d336368a0d471edf1df93fb7b9647a67f3f3b SHA512 7a67da016027a96cc3aa18796f6fd499a5ec75de45d33a90cbecd3904a730cd9231337763c1b8c7e322dbeaaf60ec8299dd721ed1d0c68d645f19ca3a0ac8420 WHIRLPOOL 420bc4e87859ecefe531ecf259d7dbecd51ab3ead6ce8a71dbf519855d58ec1466f62554a8e6a09c2dafbf9a78e7c96bf0a1d2d62d72563eda66f8f739ef709d
+AUX hddtemp.service-r1 214 SHA256 029e51a7cd34835f22d9133d1e8755fa69ce494fe15fe4b265beae312e4aa9f2 SHA512 2218864bead8a0cc0f99d5125940f397fc1396d2e3f7afaf276c3bae0d6c2b2d23ebc51d3a93d3a492d055c8dcdaf44c56ed289d0343b9e264de48971d9153fd WHIRLPOOL cd09b8955e4697299c4297610b6bdf9ffe84aec37d39c1038cbdcabfe476776ef41e62e989372fd0c1fbeec6e6defc1531023fa195495644f941f260f60c4cc9
+AUX hddtemp.service.conf 88 SHA256 87954446f095607eb10ec281fa0ab93d782e5c19f843ad80f0fb86148d991786 SHA512 dac10db31111623f20580d36b49f2d9b292df39991a4b2590085c08b7a8dbda3903d5dc268d328a71c0bd8d02e781949ab2abde243ae35da8f79bef21aa3fae3 WHIRLPOOL 91374bdfafdb5959b696e119451d73e727e5f12acac90d1a0a68344b5800379e53fd8fa3e716ac2a5177cf2eb671e102ffdec5feed3fc6ba8bff00a89fccbf42
+AUX update-hddtemp.db 819 SHA256 1943cfe150b37a869df85ec193286f201fee6fe5186b6c55b2d0ddd4e041bbf8 SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4 WHIRLPOOL 7c76b8ba439bf0a23211af84ca42629933282edea297b46a45c29dd82aa8682a0ddbc565a87589e42879c490ae1060f743f83f6cbfb031c048366c96f6256589
+DIST hddtemp-0.3-beta15.tar.bz2 256372 SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d WHIRLPOOL 2ce6a2336737e8cbb409443b874c6767c753fbe4bb700540f9a545e69cd951d3de5743d5b26bcd3a3f8e007b1364273ec85d15da8a00968895def063aaac7705
+DIST hddtemp-20080531.db.bz2 5627 SHA256 6a12bb68283c3224bef2ab086ae810b3f6b17b38f8203350acb3a73e21a6dfbd SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 WHIRLPOOL 7443366204127c0831ce78a5dfd3506ff82a6c79a7daf75cc79e6bba6aad0357f7092c03e792e2e4ee31c2b47a8d8a15456e7b2c176d3a1c6b4633486f450666
+EBUILD hddtemp-0.3_beta15-r26.ebuild 2973 SHA256 57d1e78ce649c50f2fe014c9d11bd95c87c03f0527409766d724482a0470d4a6 SHA512 1bd1fce9fd028d089c25db6be2eeb1e4426e02be0d790d64d0395c25ae801d893e611a985e966fc381e69266b8c347ebebf266eb2bb64ccefd486016d6bfe4a6 WHIRLPOOL 906ef776bca137da5595a84d7a8a4ee353103ae973e4c535c0b49aa76828fe448b27321c285f78a8c240bcf8808f135d18fc96695b14b834565790c9bb87be65
+EBUILD hddtemp-0.3_beta15-r7.ebuild 2624 SHA256 cd557dc7063f802bb651351472c6d0261f13c2a3a4143ec2b58ac89dab2b6e47 SHA512 e52873a21479241b582ce0648aa8c973298b1adbced6738172733537a267d421f52bf454672f81578ab1293cb79ebd9ba3487c9b7024a66c4be073338bb40d87 WHIRLPOOL 42b3de8e47b070e6dea85e3c6aef39c47060d626c88d1990467072a2c604da3ae793f93a345b522af7dcf0d08e49a878f82356117a340d3991e4923be88b295e
+MISC ChangeLog 5331 SHA256 ea767cc88c66341898067c791be88791b2d52cff8fd8d4661fc05017c1761d17 SHA512 08be1f6d08e7efa2ca08efb59bcd1dac67a99a16167bbbdd9fc2ab9b59588a48f35b07e279185cb2d64c199db84a7771fa8307ea798751c8db89523fc1b4e773 WHIRLPOOL d765f99a13718497146ff2e5089ac75808aa4c90811f4025ae6452c2f2b9aa796525d9a8b491c27766177d725dc23c19c1a79823e9d90a34d0267322f9933b90
+MISC ChangeLog-2015 26095 SHA256 45668315f248a9bdd6a576a2ec293b68f9169b10139f7f385b97589ac8b2a81b SHA512 7668fe61c1ce771844b6c766498c7f3d25cce188a19a1cc7633db63a53019efeaf0f8516b0053a2449da90dded475650f066bbd42a0ddace37280d6ffbadf8f0 WHIRLPOOL 4bc7c471beccee6dc0667a9cb34fad576ddd6aa38ac8b4b19231a74c11ba93ba980c4c3cba05487ca2e1362d757e6c639cdb797213731c46f8485d98c70b41c8
+MISC metadata.xml 260 SHA256 418bd35f3d5ce7127e8162a24616d6f2712148438d6d79274e9ccc192b66bfa6 SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3 WHIRLPOOL a12a9cfd068b88e7ed588450d1b20399b2e619c9e8fabd28573c10feef297871e199beb80ff125ee05b8a0b4f4b2248bc626a78a18603512f6acd210dcaa37ce
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
new file mode 100644
index 000000000000..2158f4e24a0b
--- /dev/null
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -0,0 +1,253 @@
+#############################################
+############# Misc drives, added by Gentoo
+#############################################
+
+"ST9160821AS" 194 C "Seagate ST9160821AS"
+"ST3400620A" 194 C "Seagate Barracuda 7200.10 ST3400620A"
+"MAXTOR STM3160212A" 194 C "Maxtor STM3160212A"
+"WDC WD2500JS-23MHB0" 194 C "Western Digital 250GB, 8MB cache"
+"WDC WD740ADFD-00NLR1" 194 C "Western Digital SATA Raptor 74GB 16MB"
+"ST3320620AS" 194 C "Seagate ST3320620AS"
+"WDC WD3200AAKS-00SBA0" 194 C "Western Digital WD3200AAKS-00SBA0"
+"ST3120813AS" 194 C "Seagate ST3120813AS"
+"ST3250620AS" 194 C "Seagate ST3250620AS"
+"ST3808110AS" 194 C "Seagate Barracuda 7200.9 SATA2 80GB 8MB"
+"ST3250824AS" 194 C "Seagate Barracuda 7200.9 SATA2 250GB 8MB"
+"ST3250310AS" 194 C "Seagate Barracuda 7200.10 SATA 250GB 8MB"
+"ST3500320AS" 194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
+"ST3320613AS" 194 C "Seagate Barracuda 7200.11 SATA 320GB 16MB"
+"ST3500320AS" 194 C "Seagate Barracuda 7200.11 SATA 500GB 32MB"
+"ST3500620AS" 194 C "Seagate Barracuda 7200.11 SATA 500GB 16MB"
+"ST3640323AS" 194 C "Seagate Barracuda 7200.11 SATA 64GB 32MB"
+"ST3750330AS" 194 C "Seagate Barracuda 7200.11 SATA 750GB 32MB"
+"ST3750630AS" 194 C "Seagate Barracuda 7200.11 SATA 750GB 16MB"
+"ST31000340AS" 194 C "Seagate Barracuda 7200.11 SATA 1000GB 32MB"
+"SAMSUNG HD403LJ" 194 C "Samsung HD403LJ"
+"SAMSUNG HD250HJ" 194 C "Samsung SpinPoint SpinPoint S250"
+"ST3320620NS" 194 C "Seagate 320GB 7200rpm 16MB SATAII"
+"FUJITSU MHZ2250BJ FFS G2" 194 C "FUJITSU MHZ2250BJ FFS G2"
+"ST3500630A" 194 C "Seagate Barracuda 7200.10 PATA 500GB 16MB"
+"WDC WD740ADFD-00NLR5" 194 C "Western Digital SATA Raptor 74GB 16MB"
+"Hitachi HDP725032GLA360" 194 C "Hitachi Deskstar P7K500 - 320GB 7200RPM 16MB SATA II"
+"Hitachi HDT721050SLA360" 194 C "Hitachi Deskstar 7K1000.B - 500GB 7200RPM 16MB SATA II"
+"Hitachi HDT725025VLAT80" 194 C "Hitachi Deskstar T7K500 - 250GB 7200RPM 8MB PATA"
+"SAMSUNG HD322HJ" 194 C "Samsung HD322HJ 320GB 7200RPM 16MB SATA"
+"WDC WD2500BEVS-75UST0" 194 C "Western Digital WD2500BEVS-75UST0 - 250GB 5400RPM SATA"
+"SAMSUNG HD103UJ" 194 C "Samsung Spinpoint F1 1000GB 32MB"
+"SAMSUNG HD103SJ" 194 C "Samsung Spinpoint F3 1000GB 32MB"
+"ST9250421ASG" 194 C "Seagate Momentus 7200.3 SATA 250GB 16MB"
+"SAMSUNG HD401LJ" 194 C "SAMSUNG SpinPoint T133 series, 400GB"
+"SAMSUNG HD753LJ" 194 C "SAMSUNG F1 series, 750 GB"
+"SAMSUNG HD103SI" 194 C "Samsung Spinpoint F2 EcoGreen 1TB 5400RPM"
+"WDC WD7500AACS-00ZJB0" 194 C "Western Digital Caviar Green 750 GB"
+"WDC WD1002FAEX-00Z3A0" 194 C "Western Digital Caviar Black 1 TB"
+"ST31500341AS" 194 C "Seagate Barracuda 7200.11 1500GB SATA2 7200RPM 32MB"
+"ST31500541AS" 194 C "Seagate Barracuda Green 1500GB SATA2 5900RPM 32MB"
+"SAMSUNG HD502IJ" 194 C "Samsung HD502IJ"
+"Hitachi HTS545050B9SA00" 194 C "Hitachi Travelstar 500GB, SATA150, 2.5, 5400RPM, NCQ, 7MB Cache"
+"ST3500418AS" 194 C "Seagate Barracuda 7200.12 SATA 500GB 16MB"
+"ST9500420AS" 194 C "Seagate Momentus 7200.4 SATA 500GB 16MB"
+"WDC WD5000AAKS-00A7B0" 194 C "Western Digital WD5000AAKS-00A7B0"
+"ST9320325AS" 194 C "Seagate Momentus 5400.6 SATA 320GB 8MB"
+"MAXTOR STM3250310AS" 194 C "Seagate DiamondMax 21 SATA 250GB"
+"FUJITSU MHT2080AT PL" 194 C "Fujitsu MHT2080AT PL IDE/ATA 80GB"
+"FUJITSU MHV2120AH" 194 C "FUJITSU MHV2120AH"
+"WDC WD2001FASS-00W2B0" 194 C "Western Digital Caviar Black WD2001FASS"
+"WDC WD1000BB-00CAA1" 0 C "Western Digital Caviar WD1000BB"
+"WDC WD5000AADS-00S9B0" 194 C "Western Digital Caviar GP 500GB 32MB"
+"WDC WD5000AVDS-63U7B0" 194 C "Western Digital Caviar AV GP 500GB 32MB"
+"WDC WD5000AVJB-63YUA0" 194 C "Western Digital Caviar AV 500GB 8MB"
+"WDC WD20EVDS-63T3B0" 194 C "Western Digital Caviar AV GP 2TB 32MB"
+"WDC WD20EURS-63S48Y0" 194 C "Western Digital Caviar AV GP 2TB 64MB"
+"WDC WD3202ABYS-02B7A0" 194 C "Western Digital Caviar WD3202ABYS"
+"FUJITSU MHY2200BH" 194 C "FUJITSU MHY2200BH"
+"ST3320418AS" 194 C "Seagate Barracuda 7200.12 SATA 320GB"
+"TOSHIBA MK7559GSXP" 194 C "Toshiba MK7559GSXP"
+"TOSHIBA MK1637GSX" 194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
+"TOSHIBA MG03ACA300" 194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
+"TOSHIBA MD04ACA400" 194 C "Toshiba MD04ACA400 4TB SATA3 7200RPM Enterprise HDD"
+"OCZ-VERTEX2" 194 C "OCZ Vertex 2"
+"SAMSUNG HD204UI" 194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
+"SAMSUNG HD154UI" 194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
+"WDC WD10EADS-00M2B0" 194 C "Western Digital Caviar Green 1TB SATA2 5400RPM 32MB"
+"WDC WD20EARS-00S8B1" 194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD3200BEKT-00F3T0" 194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
+"WDC WD3200BEKT-75A25T0" 194 C "Western Digital Scorpio Black 320GB SATA2 7200RPM 16MB"
+"WDC WD6400AACS-00M3B0" 194 C "Western Digital Caviar Green 640GB SATA2 7200RPM 16MB"
+"WDC WD5000AADS" 194 C "Western Digital Caviar Green 500GB SATA2 IntelliPower 32MB"
+"WDC WD7500AARX" 194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD3200AZDX" 194 C "Western Digital Caviar Green 320GB SATA3 IntelliPower 32MB"
+"WDC WD5000AZDX" 194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 32MB"
+"WDC WD5000AZRX-00A8LB0" 194 C "Western Digital Caviar Green 500GB SATA3 IntelliPower 64MB"
+"WDC WD7500AZRX" 194 C "Western Digital Caviar Green 750GB SATA3 IntelliPower 64MB"
+"WDC WD10EARS" 194 C "Western Digital Caviar Green 1TB SATA2 IntelliPower 64MB"
+"WDC WD15EARS" 194 C "Western Digital Caviar Green 1.5TB SATA2 IntelliPower 64MB"
+"WDC WD20EARS" 194 C "Western Digital Caviar Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD10EZRX" 194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD25EZRX" 194 C "Western Digital Caviar Green 2.5TB SATA3 IntelliPower 64MB"
+"WDC WD30EZRX" 194 C "Western Digital Caviar Green 3TB SATA3 IntelliPower 64MB"
+"WDC WD10EARX" 194 C "Western Digital Caviar Green 1TB SATA3 IntelliPower 64MB"
+"WDC WD15EARX" 194 C "Western Digital Caviar Green 1.5TB SATA3 IntelliPower 64MB"
+"WDC WD20EARX" 194 C "Western Digital Caviar Green 2TB SATA3 IntelliPower 64MB"
+"WDC WD7500AADS-11M2B1" 194 C "Western Digital Caviar Green 750GB SATA2 IntelliPower 32MB"
+"WDC WD3200AABB" 194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
+"WDC WD3200BB" 194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 2MB"
+"WDC WD3000BB" 194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 2MB"
+"WDC WD2500AABB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2500BB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2500LB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 2MB"
+"WDC WD2000BB" 194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
+"WDC WD2000LB" 194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 2MB"
+"WDC WD1800BB" 194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
+"WDC WD1750BB" 194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 2MB"
+"WDC WD1600AABB" 194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
+"WDC WD1600BB" 194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 2MB"
+"WDC WD1200BB" 194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
+"WDC WD1200LB" 194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 2MB"
+"WDC WD1000BB" 194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 2MB"
+"WDC WD800BB" 194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800BB-00JHC0" 194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800LB" 194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD800PB" 194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 2MB"
+"WDC WD600BB" 194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 2MB"
+"WDC WD400BB" 194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
+"WDC WD400LB" 194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 2MB"
+"WDC WD300BB" 194 C "Western Digital Caviar Blue 30GB PATA 7200RPM 2MB"
+"WDC WD200BB" 194 C "Western Digital Caviar Blue 20GB PATA 7200RPM 2MB"
+"WDC WD100BB" 194 C "Western Digital Caviar Blue 10GB PATA 7200RPM 2MB"
+"WDC WD5000AAKB" 194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 16MB"
+"WDC WD5000AAJB" 194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
+"WDC WD5000JB" 194 C "Western Digital Caviar Blue 500GB PATA 7200RPM 8MB"
+"WDC WD4000AAKB" 194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 16MB"
+"WDC WD4000AAJB" 194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
+"WDC WD4000JB" 194 C "Western Digital Caviar Blue 400GB PATA 7200RPM 8MB"
+"WDC WD3200AAKB" 194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 16MB"
+"WDC WD3200AAJB" 194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
+"WDC WD3200JB" 194 C "Western Digital Caviar Blue 320GB PATA 7200RPM 8MB"
+"WDC WD3000JB" 194 C "Western Digital Caviar Blue 300GB PATA 7200RPM 8MB"
+"WDC WD2500AAKB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 16MB"
+"WDC WD2500AAJB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2500JB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2500PB" 194 C "Western Digital Caviar Blue 250GB PATA 7200RPM 8MB"
+"WDC WD2000JB" 194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
+"WDC WD2000PB" 194 C "Western Digital Caviar Blue 200GB PATA 7200RPM 8MB"
+"WDC WD1800JB" 194 C "Western Digital Caviar Blue 180GB PATA 7200RPM 8MB"
+"WDC WD1600AAJB" 194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
+"WDC WD1600JB" 194 C "Western Digital Caviar Blue 160GB PATA 7200RPM 8MB"
+"WDC WD1200JB" 194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
+"WDC WD1200PB" 194 C "Western Digital Caviar Blue 120GB PATA 7200RPM 8MB"
+"WDC WD1000JB" 194 C "Western Digital Caviar Blue 100GB PATA 7200RPM 8MB"
+"WDC WD800JB" 194 C "Western Digital Caviar Blue 80GB PATA 7200RPM 8MB"
+"WDC WD600JB" 194 C "Western Digital Caviar Blue 60GB PATA 7200RPM 8MB"
+"WDC WD400JB" 194 C "Western Digital Caviar Blue 40GB PATA 7200RPM 8MB"
+"WDC WD2002FAEX" 194 C "Western Digital Caviar Black 2TB SATA3 7200RPM 64MB"
+"WDC WD1502FAEX" 194 C "Western Digital Caviar Black 1.5TB SATA3 7200RPM 64MB"
+"WDC WD1002FAEX" 194 C "Western Digital Caviar Black 1TB SATA3 7200RPM 64MB"
+"WDC WD7502AAEX" 194 C "Western Digital Caviar Black 750GB SATA3 7200RPM 64MB"
+"WDC WD6402AAEX" 194 C "Western Digital Caviar Black 640GB SATA3 7200RPM 64MB"
+"WDC WD5002AALX" 194 C "Western Digital Caviar Black 500GB SATA3 7200RPM 32MB"
+"WDC WD2001FASS" 194 C "Western Digital Caviar Black 2TB SATA2 7200RPM 64MB"
+"WDC WD1001FALS" 194 C "Western Digital Caviar Black 1TB SATA2 7200RPM 32MB"
+"WDC WD7501AALS" 194 C "Western Digital Caviar Black 750GB SATA2 7200RPM 32MB"
+"WDC WD6401AALS" 194 C "Western Digital Caviar Black 640GB SATA2 7200RPM 32MB"
+"WDC WD5001AALS" 194 C "Western Digital Caviar Black 500GB SATA2 7200RPM 32MB"
+"WDC WD10EALX" 194 C "Western Digital Caviar Blue 1TB SATA3 7200RPM 32MB"
+"WDC WD7500AALX" 194 C "Western Digital Caviar Blue 750GB SATA3 7200RPM 32MB"
+"WDC WD5000AAKX" 194 C "Western Digital Caviar Blue 500GB SATA3 7200RPM 16MB"
+"WDC WD3200AAKX" 194 C "Western Digital Caviar Blue 320GB SATA3 7200RPM 16MB"
+"WDC WD2500AAKX" 194 C "Western Digital Caviar Blue 250GB SATA3 7200RPM 16MB"
+"WDC WD10EALS" 194 C "Western Digital Caviar Blue 1TB SATA2 7200RPM 32MB"
+"WDC WD6400AAKS" 194 C "Western Digital Caviar Blue 640GB SATA2 7200RPM 16MB"
+"WDC WD5000AAKS" 194 C "Western Digital Caviar Blue 500GB SATA2 7200RPM 16MB"
+"WDC WD3200AAKS" 194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 16MB"
+"WDC WD2500AAKS" 194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
+"WDC WD2500AAKS-00VSA0" 194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 16MB"
+"WDC WD3200AAJS" 194 C "Western Digital Caviar Blue 320GB SATA2 7200RPM 8MB"
+"WDC WD2500AAJS" 194 C "Western Digital Caviar Blue 250GB SATA2 7200RPM 8MB"
+"WDC WD1600AAJS" 194 C "Western Digital Caviar Blue 160GB SATA2 7200RPM 8MB"
+"WDC WD800AAJS" 194 C "Western Digital Caviar Blue 80GB SATA2 7200RPM 8MB"
+"WDC WD10JPVT" 194 C "1TB SATA2 5400RPM 8MB"
+"WDC WD10TPVT" 194 C "1TB SATA2 5200RPM 8MB"
+"WDC WD7500BPVT" 194 C "750GB SATA2 5400RPM 8MB"
+"WDC WD6400BPVT" 194 C "640GB SATA2 5400RPM 8MB"
+"WDC WD5000BPVT" 194 C "500GB SATA2 5400RPM 8MB"
+"WDC WD3200BPVT" 194 C "320GB SATA2 5400RPM 8MB"
+"WDC WD2500BPVT" 194 C "250GB SATA2 5400RPM 8MB"
+"WDC WD3200BEVE" 194 C "320GB PATA6 5400RPM 8MB"
+"WDC WD2500BEVE" 194 C "250GB PATA6 5400RPM 8MB"
+"WDC WD1600BEVE" 194 C "160GB PATA6 5400RPM 8MB"
+"WDC WD1200BEVE" 194 C "120GB PATA6 5400RPM 8MB"
+"WDC WD800BEVE" 194 C "80GB PATA6 5400RPM 8MB"
+"WDC WD5000LPVT" 194 C "500GB SATA2 5400RPM 8MB"
+"WDC WD3200LPVT" 194 C "320GB SATA2 5400RPM 8MB"
+"WDC WD2500LPVT" 194 C "250GB SATA2 5400RPM 8MB"
+"ST320LT007-9ZV142" 194 C "Seagate 320GB SATA2 7200RPM 16MB"
+"ST250DM000" 194 C "Seagate Barracuda 7200.14 250GB SATA3 7200RPM 16MB"
+"ST320DM000" 194 C "Seagate Barracuda 7200.14 320GB SATA3 7200RPM 16MB"
+"ST500DM002" 194 C "Seagate Barracuda 7200.14 500GB SATA3 7200RPM 16MB"
+"ST750DM003" 194 C "Seagate Barracuda 7200.14 750GB SATA3 7200RPM 64MB"
+"ST1000DM003" 194 C "Seagate Barracuda 7200.14 1TB SATA3 7200RPM 64MB"
+"ST1500DM003" 194 C "Seagate Barracuda 7200.14 1.5TB SATA3 7200RPM 64MB"
+"ST2000DM001" 194 C "Seagate Barracuda 7200.14 2TB SATA3 7200RPM 64MB"
+"ST3000DM001" 194 C "Seagate Barracuda 7200.14 3TB SATA3 7200RPM 64MB"
+"ST32000641AS" 194 C "Seagate Barracuda XT ST32000641AS 2TB SATA3 7200RPM 64MB"
+"ST500LM000-1EJ16" 194 C "Seagate 500GB SSHD"
+"Hitachi HTS725050A9A364" 190 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
+"HTE721080G9AT00" 194 C "Hitachi Travelstar E7K100 80GB PATA6 7200RPM 8MB"
+"ST9250315AS" 194 C "Seagate Momentus 5400.6 250GB SATA2 5400RPM 8MB"
+"ST9750420AS" 194 C "Seagate Momentus 7200.4 750GB SATA2 7200RPM 16MB"
+"ST9500423AS" 194 C "Seagate Momentus 7200.4 500GB SATA2 7200RPM 16MB"
+"TOSHIBA MK3252GSX" 194 C "Toshiba MK3252GSX"
+"SAMSUNG HM160HC" 194 C "Samsung HM160HC"
+"WDC WD1003FBYX-01Y7B1" 194 C "Western Digital RE4 1TB SATA2 7200RPM 64MB"
+"WDC WD3003FZEX-00Z4SA0" 194 C "Western Digital Caviar Black 3TB SATA3 7200RPM 64MB"
+"WDC WD3000FYYZ-01UL1B2" 194 C "Western Digital WD3000FYYZ 3TB SATA3 7200RPM"
+"TOSHIBA DT01ACA050" 194 C "Toshiba 500GB SATA3 7200RPM 32MB"
+"WDC WD10JFCX-68N6GN0" 194 C "Western Digital Red 1TB SATA3 IntelliPower 64MB"
+"WDC WD40EFRX" 194 C "Western Digital Red 4TB SATA3 IntelliPower 64MB"
+"WDC WD40EZRX" 194 C "Western Digital Green 4TB SATA3 IntelliPower 64MB"
+"WDC WD20EARS" 194 C "Western Digital Green 2TB SATA2 IntelliPower 64MB"
+"WDC WD5000BEVT" 194 C "Western Digital Scorpio Blue 500GB SATA2 5400RPM 8MB"
+"WDC WD5000BPKT-00PK4T0" 194 C "Western Digital Scorpio Black 500GB SATA2 7200RPM 16MB"
+"SanDisk SD6SB1M256G1022I" 194 C "Sandisk SSD X110 256GB"
+"Hitachi HTS542512K9SA00" 194 C "Hitachi Travelstar 5K250 120GB SATA2 5400RPM 8MB"
+"Hitachi HTS542516K9SA00" 194 C "Hitachi Travelstar 5K250 160GB SATA2 5400RPM 8MB"
+"Hitachi HDS721680PLA380" 194 C "Hitachi Deskstar 7K160 80GB SATA2 7200RPM 8MB"
+"Hitachi HDS721010CLA332" 194 C "Hitachi Deskstar 7K1000.C 1TB SATA2 7200RPM"
+"HGST HDS724040ALE640" 194 C "HGST Deskstar 7K4000 4TB SATA3 7200RPM"
+"ST9120822AS" 194 C "Seagate Momentus 5400.3 120GB SATA 5400RPM 8MB"
+"ST32000542AS" 194 C "Seagate Barracuda LP 2000GB SATA2 5900RPM 32MB"
+"ST2000DL003-9VT166" 194 C "Seagate Barracuda LP 2000GB SATA3 5900RPM 64MB"
+"ST4000VN000-1H4168" 194 C "Seagate NAS HDD 4TB SATA3 64MB"
+"Hitachi HTS545050B9A300" 194 C "Hitachi Travelstar 500GB SATA2 2.5 5400RPM 8MB"
+"ST9500325AS" 194 C "Seagate Momentus 5400.6 500GB SATA2 5400RPM 8MB"
+"WDC WD30EFRX-68AX9N0" 194 C "Western Digital Red 3TB SATA3 64MB"
+"Toshiba DT01ACA300" 194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
+"TOSHIBA DT01ACA300" 194 C "Toshiba DT01ACA300 3TB SATA3 7200RPM 64MB"
+"TOSHIBA HDWD130" 194 C "Toshiba P300 3TB SATA3 7200RPM 64MB"
+"Samsung SSD 850 EVO" 190 C "Samsung SSD 850 EVO Series"
+"Samsung SSD 840 Series" 190 C "Samsung SSD 840 Series"
+"Samsung SSD 840 PRO Serise" 190 C "Samsung SSD 840 Pro Series"
+"Samsung SSD 840 EVO" 190 C "Samsung SSD 840 EVO Series"
+"SAMSUNG HD203WI" 194 C "Samsung SpinPoint F3 EcoGreen 2TB SATA2 5400RPM 32MB"
+"SAMSUNG SSD 830 Series" 190 C "Samsung SSD 830 Series"
+"SanDisk SDSSDH2128G" 194 C "Sandisk SSD Ultra Plus 128GB"
+"SanDisk SDSSDH2256G" 194 C "Sandisk SSD Ultra Plus 256GB"
+"OCZ-VERTEX3" 194 C "OCZ Vertex 3 120GB SATA3"
+"Crucial_CT240M500SSD3" 194 C "Crucial M500 240GB SATA3 256MB"
+"WDC WD5003ABYX-01WERA2" 194 C "Western Digital RE4 500GB"
+"WDC WD5002ABYS-02B1B0" 194 C "Western Digital RE3 500GB"
+"WDC WD20EZRX" 194 C "Western Digital Green 2TB"
+"ST4000DM000" 194 C "Seagate Desktop 4TB"
+"STM3160815AS" 194 C "Maxtor DiamondMax 21 - 160GB - 8MB Cache SATA"
+"6G160E0" 194 C "Maxtor DiamondMax 17 - 160GB - 8MB Cache SATA"
+"WDC WD7500BFCX-68N6GN0" 194 C "Western Digital Red 750GB SATA"
+"Hitachi HTS547575A9E384" 190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
+"WDC WD30PURX-64P6ZY0" 194 C "Western Digital Purple 3TB 64MB Cache"
+"WDC WD10EZEX-00BN5A0" 194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
+"WDC WD1003FZEX-00MK2A0" 194 C "Western Digital Black 1TB SATA3 7200RPM 64MB"
+"SAMSUNG MZHPV128HDGM-00000" 194 C "Samsung SSD 128 GB PCIe Gen3 8Gb/s x4 M.2"
+"CT960BX200SSD1" 194 C "Crucial BX200 960GB SSD"
+"CT480BX200SSD1" 194 C "Crucial BX200 480GB SSD"
+"CT240BX200SSD1" 194 C "Crucial BX200 240GB SSD"
+"Crucial_CT256M550SSD1" 194 C "Crucial M550 256GB SSD"
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
new file mode 100644
index 000000000000..7b0dddc2ae47
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
@@ -0,0 +1,28 @@
+diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/sata.c hddtemp-0.3-beta15/src/sata.c
+--- hddtemp-0.3-beta15.orig/src/sata.c 2006-05-14 02:09:55.579437498 -0700
++++ hddtemp-0.3-beta15/src/sata.c 2006-05-14 02:06:08.495948437 -0700
+@@ -88,7 +88,9 @@
+ return strdup(_("unknown"));
+ else
+ {
++ //fprintf(stderr,"sata_model1=%s\n",identify + 54);
+ sata_fixstring(identify + 54, 24);
++ //fprintf(stderr,"sata_model2=%s\n",identify + 54);
+ return strdup(identify + 54);
+ }
+ }
+diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
+--- hddtemp-0.3-beta15.orig/src/satacmds.c 2006-05-14 02:09:40.983470339 -0700
++++ hddtemp-0.3-beta15/src/satacmds.c 2006-05-14 02:09:02.319557333 -0700
+@@ -98,7 +98,10 @@
+ /* convert from big-endian to host byte order */
+ for (p = end ; p != s;) {
+ unsigned short *pp = (unsigned short *) (p -= 2);
+- *pp = ntohs(*pp);
++ char tmp = p[0];
++ p[0] = p[1];
++ p[1] = tmp;
++ //*pp = ntohs(*pp);
+ }
+
+ /* strip leading blanks */
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
new file mode 100644
index 000000000000..969da7a70e40
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-dontwake.patch
@@ -0,0 +1,20 @@
+--- hddtemp-0.3-beta15/src/sata.c 2012-07-01 16:35:01.681708074 +0200
++++ hddtemp-0.3-beta15/src/sata.c 2012-07-01 16:33:58.172109699 +0200
+@@ -125,6 +125,17 @@
+ dsk->fd = -1;
+ return GETTEMP_NOSENSOR;
+ }
++
++ switch(ata_get_powermode(dsk->fd)) {
++ case PWM_STANDBY:
++ case PWM_SLEEPING:
++ if (!wakeup)
++ return GETTEMP_DRIVE_SLEEP;
++ case PWM_UNKNOWN:
++ case PWM_ACTIVE: /* active or idle */
++ default:
++ break;
++ }
+
+ /* get SMART values */
+ if(sata_enable_smart(dsk->fd) != 0) {
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
new file mode 100644
index 000000000000..1e7239535d4d
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
@@ -0,0 +1,21 @@
+--- hddtemp-0.3-beta15/configure.in~ 2005-10-17 19:14:19 +0000
++++ hddtemp-0.3-beta15/configure.in 2006-12-11 18:23:22 +0000
+@@ -18,6 +18,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h)
+ AC_CHECK_HEADERS(netinet/in.h)
++AC_CHECK_HEADERS(execinfo.h)
+ AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+--- hddtemp-0.3-beta15/src/backtrace.c-orig 2006-12-11 18:20:41 +0000
++++ hddtemp-0.3-beta15/src/backtrace.c 2006-12-11 18:23:28 +0000
+@@ -18,7 +18,7 @@
+
+ #include <features.h>
+
+-#if defined(__i386__) && defined(__GLIBC__)
++#ifdef HAS_EXECINFO_H
+
+ #include <execinfo.h>
+
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
new file mode 100644
index 000000000000..621e7549aa0b
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-iconv.patch
@@ -0,0 +1,28 @@
+--- hddtemp-0.3-beta15/src/utf8.c~ 2007-03-27 09:09:59.000000000 +0200
++++ hddtemp-0.3-beta15/src/utf8.c 2007-03-27 09:10:06.000000000 +0200
+@@ -23,7 +23,9 @@
+
+ // Standard includes
+ #include <stdlib.h>
++#ifdef HAVE_ICONV
+ #include <iconv.h>
++#endif
+ #include <langinfo.h>
+ #include <locale.h>
+ #include <string.h>
+@@ -34,6 +36,7 @@
+
+ static char *iconv_from_utf8_to_locale(const char *string, const char* fallback_string)
+ {
++#ifdef HAVE_ICONV
+ const size_t buffer_inc = 80; // Increment buffer size in 80 bytes step
+ const char *charset;
+ iconv_t cd;
+@@ -93,6 +96,7 @@
+ if (dest_buffer != NULL)
+ free(dest_buffer); // free buffer
+ free(src_buffer); // free string
++#endif // HAVE_ICONV
+ return strdup(fallback_string); // and return fallback string
+ }
+
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
new file mode 100644
index 000000000000..86567aeb8c39
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-nls.patch
@@ -0,0 +1,14 @@
+--- hddtemp-0.3-beta15/src/hddtemp.c~ 2006-04-19 02:37:35 +0000
++++ hddtemp-0.3-beta15/src/hddtemp.c 2007-03-26 08:14:17 +0000
+@@ -275,9 +275,11 @@
+ backtrace_sigill();
+ backtrace_sigbus();
+
++#if ENABLE_NLS
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
++#endif
+
+ show_db = debug = numeric = quiet = wakeup = af_hint = syslog_interval = 0;
+ unit = DEFAULT;
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
new file mode 100644
index 000000000000..d67e0681f33f
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
@@ -0,0 +1,26 @@
+diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
+--- hddtemp-0.3-beta15-orig/src/satacmds.c 2007-02-10 14:25:15.000000000 +0100
++++ hddtemp-0.3-beta15/src/satacmds.c 2007-02-10 14:26:53.000000000 +0100
+@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned
+ unsigned char cdb[16];
+ unsigned char sense[32];
+ int dxfer_direction;
+- int ret;
+
+ memset(cdb, 0, sizeof(cdb));
+ cdb[0] = ATA_16;
+@@ -78,13 +77,7 @@ int sata_pass_thru(int device, unsigned
+ cdb[6] = cmd[1];
+ cdb[14] = cmd[0];
+
+- ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
+-
+- /* Verify SATA magics */
+- if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00)
+- return 1;
+- else
+- return ret;
++ return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
+ }
+
+ void sata_fixstring(unsigned char *s, int bytecount)
diff --git a/app-admin/hddtemp/files/hddtemp-conf.d b/app-admin/hddtemp/files/hddtemp-conf.d
new file mode 100644
index 000000000000..f2f34d93b6e1
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# the hddtemp executable
+HDDTEMP_EXEC=/usr/sbin/hddtemp
+
+# various options to pass to the daemon
+HDDTEMP_OPTS="--listen=127.0.0.1"
+
+# a list of drives to check
+HDDTEMP_DRIVES="/dev/sda /dev/sdb"
+
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
new file mode 100644
index 000000000000..39a640997cfe
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need localmount
+}
+
+start() {
+ ebegin "Starting hddtemp daemon"
+ /sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
+ -- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping hddtemp daemon"
+ start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
+ eend $?
+}
+
+
diff --git a/app-admin/hddtemp/files/hddtemp.service b/app-admin/hddtemp/files/hddtemp.service
new file mode 100644
index 000000000000..b2fca4214bca
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+Documentation=man:hddtemp(8)
+
+[Service]
+Environment=HDDTEMP_OPTIONS=--listen=127.0.0.1
+EnvironmentFile=-/etc/conf.d/hddtemp
+ExecStart=/usr/sbin/hddtemp -d $HDDTEMP_OPTIONS $HDDTEMP_DRIVES
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/hddtemp/files/hddtemp.service-r1 b/app-admin/hddtemp/files/hddtemp.service-r1
new file mode 100644
index 000000000000..8105bfc50cce
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=Hard drive temperature monitor daemon
+Documentation=man:hddtemp(8)
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/hddtemp -d --listen=127.0.0.1 $HDDTEMP_DRIVES
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/hddtemp/files/hddtemp.service.conf b/app-admin/hddtemp/files/hddtemp.service.conf
new file mode 100644
index 000000000000..a2a6c7fbd7f4
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp.service.conf
@@ -0,0 +1,3 @@
+# Set a list of drives to check
+[Service]
+Environment="HDDTEMP_DRIVES=/dev/sda /dev/sdb" \ No newline at end of file
diff --git a/app-admin/hddtemp/files/update-hddtemp.db b/app-admin/hddtemp/files/update-hddtemp.db
new file mode 100644
index 000000000000..bc29b3ec0caa
--- /dev/null
+++ b/app-admin/hddtemp/files/update-hddtemp.db
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+update_db() {
+ local src=$1
+ local dst=$2
+
+ while read line ; do
+ if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+ echo "${line}" >> "${dst}"
+ fi
+
+ id=$(echo "${line}" | grep -o '"[^"]*"')
+
+ grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+ done < "${src}"
+}
+
+die() {
+ echo "$*"
+ exit 1
+}
+
+cd /usr/share/hddtemp
+wget http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -O hddtemp.db -q || die "Failed to download new hddtemp.db file"
+
+# Try to get the Gentoo HDD DB from WebCVS. If that fails, just use the Gentoo HDD database
+# that was installed by the ebuild.
+if wget https://gitweb.gentoo.org/repo/gentoo.git/plain/app-admin/hddtemp/files/hddgentoo.db -O hddtmp.db -q; then
+ mv -f hddtmp.db hddgentoo.db
+fi
+
+update_db "hddgentoo.db" "hddtemp.db"
+
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
new file mode 100644
index 000000000000..988a38401bfc
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools readme.gentoo-r1 systemd
+
+MY_P=${P/_beta/-beta}
+DBV=20080531
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86"
+IUSE="network-cron nls selinux"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(README TODO ChangeLog)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="In order to update your hddtemp database, run:
+emerge --config =${CATEGORY}/${PF} or update-hddtemp.db (if USE
+network-cron is enabled)
+
+If your hard drive is not recognized by hddtemp, please consider
+submitting your HDD info for inclusion into the Gentoo hddtemp
+database by filing a bug at https://bugs.gentoo.org/
+
+If hddtemp complains but finds your HDD temperature sensor, use the
+--quiet option to suppress the warning.
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-satacmds.patch
+ "${FILESDIR}"/${P}-byteswap.patch
+ "${FILESDIR}"/${P}-execinfo.patch
+ "${FILESDIR}"/${P}-nls.patch
+ "${FILESDIR}"/${P}-iconv.patch
+ "${FILESDIR}"/${P}-dontwake.patch
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ mv "${S}"/configure.{in,ac} || die
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+ # disabling nls breaks compiling
+ use nls || myconf="--disable-nls ${myconf}"
+ econf ${myconf}
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/hddtemp
+ newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
+ doins "${FILESDIR}"/hddgentoo.db
+
+ update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
+ newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
+ newinitd "${FILESDIR}"/hddtemp-init hddtemp
+ systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+ systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+ readme.gentoo_create_doc
+
+ if use network-cron; then
+ dosbin "${FILESDIR}"/update-hddtemp.db
+ exeinto /etc/cron.monthly
+ echo -e "#!/bin/sh\n/usr/sbin/update-hddtemp.db" > "${T}"/hddtemp.cron
+ newexe "${T}"/hddtemp.cron update-hddtemp.db
+ fi
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
+
+update_db() {
+ local src=$1
+ local dst=$2
+
+ while read line ; do
+ if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+ echo "${line}" >> "${dst}"
+ fi
+
+ id=$(echo "${line}" | grep -o '"[^"]*"')
+
+ grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+ done < "${src}"
+}
+
+pkg_config() {
+ cd "${ROOT}"/usr/share/hddtemp || die
+
+ einfo "Trying to download the latest hddtemp.db file"
+ wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
+ || die "failed to download hddtemp.db"
+
+ update_db "hddgentoo.db" "hddtemp.db"
+}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
new file mode 100644
index 000000000000..1350815a28ca
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools readme.gentoo systemd
+
+MY_P=${P/_beta/-beta}
+DBV=20080531
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/"
+SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
+IUSE="nls selinux"
+
+DEPEND=""
+RDEPEND="selinux? ( sec-policy/selinux-hddtemp )"
+
+S="${WORKDIR}/${MY_P}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="In order to update your hddtemp database, run:
+emerge --config =${CATEGORY}/${PF}
+
+If your hard drive is not recognized by hddtemp, please consider
+submitting your HDD info for inclusion into the Gentoo hddtemp
+database by filing a bug at https://bugs.gentoo.org/
+
+If hddtemp complains but finds your HDD temperature sensor, use the
+--quiet option to suppress the warning.
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-satacmds.patch
+ epatch "${FILESDIR}"/${P}-byteswap.patch
+ epatch "${FILESDIR}"/${P}-execinfo.patch
+ epatch "${FILESDIR}"/${P}-nls.patch
+ epatch "${FILESDIR}"/${P}-iconv.patch
+ epatch "${FILESDIR}"/${P}-dontwake.patch
+ mv "${S}"/configure.{in,ac} || die
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+ # disabling nls breaks compiling
+ use nls || myconf="--disable-nls ${myconf}"
+ econf ${myconf}
+}
+
+src_install() {
+ default
+ dodoc README TODO ChangeLog
+
+ insinto /usr/share/hddtemp
+ newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db
+ doins "${FILESDIR}"/hddgentoo.db
+
+ update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db"
+ newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
+ newinitd "${FILESDIR}"/hddtemp-init hddtemp
+ systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
+ systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
+
+ readme.gentoo_create_doc
+}
+
+update_db() {
+ local src=$1
+ local dst=$2
+
+ while read line ; do
+ if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then
+ echo "${line}" >> "${dst}"
+ fi
+
+ id=$(echo "${line}" | grep -o '"[^"]*"')
+
+ grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}"
+ done < "${src}"
+}
+
+pkg_config() {
+ cd "${ROOT}"/usr/share/hddtemp || die
+
+ einfo "Trying to download the latest hddtemp.db file"
+ wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \
+ || die "failed to download hddtemp.db"
+
+ update_db "hddgentoo.db" "hddtemp.db"
+}
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
new file mode 100644
index 000000000000..fa25feea165c
--- /dev/null
+++ b/app-admin/hddtemp/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 -->
+ <use>
+ <flag name="network-cron">
+ Monthly cronjob to update hddtemp.db.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
new file mode 100644
index 000000000000..ff7746ee4756
--- /dev/null
+++ b/app-admin/ide-smart/Manifest
@@ -0,0 +1,6 @@
+DIST ide-smart-1.4.tar.gz 19739 SHA256 e1f051a28fd0b563f2c41ebeffd94557f460a6280cb0123dbf7bcb1dc62652c9 SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660 WHIRLPOOL b045da41463920ce152b172df6a74d8de188b4348d47bf7438d693138e57ae5ca27a1e5b8caa34fa34b6fe6bb33a9bc8789eba17c40f7795d3d7e710a149bb9d
+EBUILD ide-smart-1.4-r1.ebuild 566 SHA256 c031ae3a880d355f56989bb8f89b93e6b22a494e079754108ee6f97009baeaf5 SHA512 b87246febf9a05bf567b355cb46a5e30d25bd85c05caf3331c0489e213a4ddcc8225a1654920c5ce0fcc69558693589c3e4ed39c329a84f45213262f162bfab6 WHIRLPOOL 87aa2c6161c176b15559d6f74188c036959491142b0b0d0d5b4125373b0efe4c851960175dafa539084ec2806afbfbd16d08c32242f360ac75dc762bc45331de
+EBUILD ide-smart-1.4-r2.ebuild 578 SHA256 aae358e0c25e133b0067f8b9e1f46ccbdd692ba4d658564b877fc31144f9e1e0 SHA512 73367fa4439efb9d52688da838416762119314f7545cde96973c1e14cb090d0497f4f8391bd9398cbbff0d8a15ad9fe409fb77fe341b4dae1fd568cb805571a8 WHIRLPOOL 0f0bbe9f1dcce3b22be5f6a0385e243a98b00648f19f5a0203e84aeea5200a9b0836d5285b67757b0710a20e8e50798e513d0122f3b6eea2a889cbcad694366d
+MISC ChangeLog 2531 SHA256 6389610c125ba77754c36401a59adf5cdbf43de98819e78675eb2caf9f6898c6 SHA512 f9fae5ca3f83181d4d9b1b07f44124513a1b96a69836fffd9de94febf181cfa182d16c989f53227387eddc274e468569c1adeadfbeb9b5dd73cd1d43edf269ca WHIRLPOOL 64b904cb03c4cc10e59cfeda63dfdeb9e8ed7326beb94814139cb69b876c86fb2f041e2c994cf8887d8a365057c48da9b27fe27d044bb6f432bda6ef149e78c6
+MISC ChangeLog-2015 2017 SHA256 a80ffacae9fd92d529a5304d9323aae28915de81103f14137dba91051b6288d4 SHA512 70a3db8eefbe176c7cffe3382671f6afbe1990378bc05a7b45b4ea9b9edb673dbd525651fc69164de9bb005476e6ff71bee9849937ceaa70a2c6d583ba2ae917 WHIRLPOOL 278812e7130aeb51b28146f3bee8fa208329d6492ad1894d26be2945454bede5932241558b27079203afeae6b067422f27e745860a0f0166b9692c7db18c1711
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
new file mode 100644
index 000000000000..cac5d77934f3
--- /dev/null
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to read SMART information from harddiscs"
+HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c || die "compile"
+}
+
+src_install() {
+ dobin ide-smart || die
+ doman ide-smart.8
+ dodoc README
+}
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
new file mode 100644
index 000000000000..d6ec39958880
--- /dev/null
+++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to read SMART information from harddiscs"
+HOMEPAGE="http://www.linalco.com/comunidad.html http://www.linux-ide.org/smart.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c || die "compile"
+}
+
+src_install() {
+ dobin ide-smart || die
+ doman ide-smart.8
+ dodoc README
+}
diff --git a/app-admin/ide-smart/metadata.xml b/app-admin/ide-smart/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/ide-smart/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-admin/integrit/Manifest b/app-admin/integrit/Manifest
new file mode 100644
index 000000000000..9ee1b3a2e826
--- /dev/null
+++ b/app-admin/integrit/Manifest
@@ -0,0 +1,7 @@
+DIST integrit-4.0.tar.gz 266001 SHA256 b0c09cf90404045759571a768a1f4581c0fc7db9a07bc00fef7356c799b200ec SHA512 d05722285e850aea2a07baa8020a379e595f30cfe9d9142d437d6c15f41c5a687ada476971765cab9cf5972be8c4c76a6495c6fb09438d3b35584c8be5d5a4e5 WHIRLPOOL 96ff05fc2b91224c7fd18d95fd46f53f4c6222328f00a12d1611e87b7fcb278b7bb818bf3b94dc4165ec694e6e54bd9c9a2db002b81097536f4b964fc8c2a383
+DIST integrit-4.1.tar.gz 271626 SHA256 2a09b670ee025d6fae756e044f780ccaca90688a97183a350927e3885174223e SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842 WHIRLPOOL e3a31b02ceb32952b492f44db5135f190fbea40a435179d27e92d939935b01ba7f83184b669152ffbae798bdbc510c64bf4842f74320f40d750f4dcfee5d026c
+EBUILD integrit-4.0.ebuild 1329 SHA256 919fcc1d722539dd6f4c80bbcf0bdc9df7797a1a55ef54399da3f56e78daf201 SHA512 690651f570ff866a944ee9bb5bd2641f03b43208872483cba4978bbffad0b4dcd80977d5152a5012920bb65a4ca9c8f3fd1f6bc860b7386494d70be92cc5e3ff WHIRLPOOL 06c321e695c26b259b62788cd6ff2404edb5f202f9666d043f7de4c885e38f880bbe79cf7dec39298d49620d786364d56830c9b8696d31a8d81623b2f485157f
+EBUILD integrit-4.1-r1.ebuild 1311 SHA256 cdc7e661763f611ee1bf22585e5318aaefea10afb6613e53f87eb014dd6bef3b SHA512 f8d8591e5c9288d2adcbf01e2ee68ce40d93d7fa1bd945d7a92d4c590a2a808f146601d131366c0eddf1acd8ac1979529aaaba1d319e12c31aad9a4e764a760f WHIRLPOOL b680c1cf3224dfd2f82ff5dce1503799430b969087b6a299080239f182e64f9e6c319ff76b9aa8b5809bdcfeac075cf00900e02eac115f0b12a17132c54c1a4a
+MISC ChangeLog 2483 SHA256 4b3594768ac1d2d9006c982b35a297075d7dba23771106b3a1aba1937c4f3c19 SHA512 e1da1b7041538f31cf94e71106f770efb0134076e05d1a987f80e97173e75c35f04d96adc0ea12bda7edb0e04edd9d3f2bfa0f947763958722df5735c466538f WHIRLPOOL d8b45d778ff5460196850eac803fce21861234439381233740c9504f4282e854ff9ef2176750db1ecf9545a494caee8c2b4653a7eeb9bb9a66cb424bdb1c0309
+MISC ChangeLog-2015 2968 SHA256 2269c67f1d6237095ffda54c0c267b2f5b2e51ca6f0134eff9e744a2e1cb47c2 SHA512 b771a722acca715301aa60aeea1c4523a31665e410e07565805427127e558a601e31332fcecc028675179f07b6d7a4b667a799295d0b1d393c84f41ac4594e4b WHIRLPOOL c3333daa5ab5f95abbe01a10407c7b433c0170868eee0fd4043dab090ca19b5d09415162178a0218bfdeea50df163246ef8f4a6a35c337a20fe1c5efa720eb00
+MISC metadata.xml 245 SHA256 009845271539e587e584d79e4037e2720e6c1a762fa983de91e17768db444d3f SHA512 e7052ee3572f1a5546b02087b7de95803a2e8b023aa24bc701eebb0bdd47b294d9634f4e78abfa10764e88397a067b1f1f8e431cddf5f8b260693f56ebd88b8b WHIRLPOOL 78128685fd23f96b4c47b21a8aae6cfabbcaaacece0d754f38867e3cfdde2aca65eb41958aeb10930e72c49108e4abbad0bcbafcdb97cd73b5992e90bc3affd2
diff --git a/app-admin/integrit/integrit-4.0.ebuild b/app-admin/integrit/integrit-4.0.ebuild
new file mode 100644
index 000000000000..f27b03a3238d
--- /dev/null
+++ b/app-admin/integrit/integrit-4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="file integrity verification program"
+HOMEPAGE="http://integrit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
+ sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
+
+ eautoreconf
+}
+
+src_compile() {
+ tc-export AR
+ econf
+ emake || die
+ emake utils || die
+ cd "${S}"/doc
+ emake || die
+ cd "${S}"/hashtbl
+ emake hashtest || die
+ mv README README.hashtbl
+}
+
+src_install() {
+ dosbin integrit || die
+ dolib libintegrit.a
+ dodoc Changes HACKING README todo.txt
+
+ cd "${S}"/utils
+ dosbin i-viewdb
+ dobin i-ls
+
+ cd "${S}"/hashtbl
+ dolib libhashtbl.a
+ insinto /usr/include
+ doins hashtbl.h
+ dobin hashtest
+ dodoc README.hashtbl
+
+ cd "${S}"/doc
+ doman i-ls.1 i-viewdb.1 integrit.1
+ doinfo integrit.info
+
+ cd "${S}"/examples
+ docinto examples
+ dodoc *
+}
+
+pkg_postinst() {
+ elog "It is recommended that the integrit binary is copied to a secure"
+ elog "location and re-copied at runtime or run from a secure medium."
+ elog "You should also create a configuration file (see examples)."
+}
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
new file mode 100644
index 000000000000..d987937dc338
--- /dev/null
+++ b/app-admin/integrit/integrit-4.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="file integrity verification program"
+HOMEPAGE="http://integrit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
+ sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
+ eautoreconf
+ tc-export AR
+}
+
+src_compile() {
+ emake
+ emake utils
+
+ cd "${S}"/doc && emake
+ cd "${S}"/hashtbl && emake hashtest
+}
+
+src_test() {
+ chmod +x test/test || die
+ default
+}
+
+src_install() {
+ dosbin integrit
+ dolib libintegrit.a
+ dodoc Changes HACKING README todo.txt
+
+ cd "${S}"/utils
+ dosbin i-viewdb
+ dobin i-ls
+
+ cd "${S}"/hashtbl
+ dolib libhashtbl.a
+ insinto /usr/include
+ doins hashtbl.h
+ dobin hashtest
+ newdoc README README.hashtbl
+
+ cd "${S}"/doc
+ doman i-ls.1 i-viewdb.1 integrit.1
+ doinfo integrit.info
+
+ cd "${S}"/examples
+ docinto examples
+ dodoc *
+}
+
+pkg_postinst() {
+ elog "It is recommended that the integrit binary is copied to a secure"
+ elog "location and re-copied at runtime or run from a secure medium."
+ elog "You should also create a configuration file (see examples)."
+}
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
new file mode 100644
index 000000000000..fa14c9a7ea90
--- /dev/null
+++ b/app-admin/integrit/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">integrit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/jinit/Manifest b/app-admin/jinit/Manifest
new file mode 100644
index 000000000000..7aea1470d806
--- /dev/null
+++ b/app-admin/jinit/Manifest
@@ -0,0 +1,6 @@
+AUX jinit-0.1.12-gcc43.patch 297 SHA256 190549bbb897909027f0f0d923778be6e539e48ed7002f72c144b4152f49b1d6 SHA512 e147e9e28a61b573e371b84709d9e26b669ba72d0cd79b336495c10c668e3a855110ec431206319681e940b098ae319038eb71d35b41f78b24689fe1796a7adb WHIRLPOOL 8ed0e907d9feff2f6464097a1597ac632ac5e1b8659b04292df715ef5931ddc561bdec7b0e80a03f6022919f2d301fd7ceab4137edb5794890c3f82d6d48a76c
+DIST jinit-0.1.12.tar.gz 110745 SHA256 8db7e4cc34fd5f12b1803e910f1a01cffd0d945705467f2190472a8ec78c86b9 SHA512 3428ba2c9bc57f6a1e30d75b9c2b86f597753fdb29e5c748986a3bf90b8189f35b88591dffb8f861b728e7ce08e78c6c5f1780147bfdb5b6a1d5f2128d34db5d WHIRLPOOL 401564708000dd621a228d1caac217b965dff1dec5e48fda658e657e8e27adb41bff8c2bc9c5cc37d12c6336064c50d5cbc4397e4e2350413f6aac671559fbd6
+EBUILD jinit-0.1.12-r1.ebuild 892 SHA256 48f47be94d8f29cdadbeeef606e9744322f783cd0cb09b3c967ff5ef75c16c25 SHA512 147c5d3f8180de5cf36d96366763a114706af71faec2defce6057ede42d62b781e1c8e240a1ae02565c3a9969ed3ab51f00ad3c5df60d995543aab17eb07f797 WHIRLPOOL 37690e098463cfbbea8237f12f18e96db5238c3a0a609ef3069123149af6d5cf3caab82c4094cceb17b59cb282631014737f3293b0f546bd3500b24694af83cd
+MISC ChangeLog 2558 SHA256 2750de25b98cbc0e3dccdcac0f04a40aec21617db3e68d6c8cd817c8efa97a59 SHA512 c85521e6cac0d8e0c7af3b64db79138f55c0bc218c0e7e01978958fb59b453be9c457024ace7164edd5cf6007e39ba5bd14e7e4fba669d3e4a06b8dc6148a416 WHIRLPOOL de1cbafcdd4f9afe142744d1e282e1cff41706afed6b87055a19050b2af6227e7607abf797c7f10d5b5c0b6d3f3381e429647cee5d2ed05e4ea86863f1071b26
+MISC ChangeLog-2015 2263 SHA256 e9174baf662c9dca691f58e1009de79a6216889ca682930a4ba667789b69ade9 SHA512 8b38ef575a90be5fce1e8dd4ae264d89588f12c80d2e25aad83598c6e6873600d88453c64381225a1293fa0a8e8ba6e5061a5a30541f080a9b7c73b66632f560 WHIRLPOOL ca59402a12ce9af84f1e4fbda63e662c8f34f864012c83443b96d144fecda624c6eaf8a7c9d0ba751b0a27d450f37d41468784bd48fb39e17769cd0bcb0d9fd1
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
new file mode 100644
index 000000000000..c9f6d92fcb03
--- /dev/null
+++ b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
@@ -0,0 +1,10 @@
+--- org/jinit-0.1.12/init_ipc/User.hh 2003-04-29 23:35:53.000000000 +0200
++++ jinit-0.1.12/init_ipc/User.hh 2009-01-04 11:19:16.000000000 +0100
+@@ -13,6 +13,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <err.h>
++#include <cstdlib>
+
+ #include "init_ipc/sysvq.hh"
+ #include "need/error.hh"
diff --git a/app-admin/jinit/jinit-0.1.12-r1.ebuild b/app-admin/jinit/jinit-0.1.12-r1.ebuild
new file mode 100644
index 000000000000..b5e444f27838
--- /dev/null
+++ b/app-admin/jinit/jinit-0.1.12-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
+HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
+SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "failed emake install"
+ emake prefix="${D}"/usr/share/doc/${PF}/example-setup install-initscripts \
+ || die "failed installing example setup"
+ mv "${D}"/usr/sbin "${D}"/ || die
+ mv "${D}"/sbin/init "${D}"/sbin/jinit || die
+ mv "${D}"/sbin/shutdown "${D}"/sbin/jinit-shutdown || die
+ dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/jinit/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-admin/keepass/Manifest b/app-admin/keepass/Manifest
new file mode 100644
index 000000000000..ca9462a09fa1
--- /dev/null
+++ b/app-admin/keepass/Manifest
@@ -0,0 +1,7 @@
+AUX keepass-2.36-xsl-path-detection.patch 1446 SHA256 63d191355c78e1d15ae8d4ca995b492f610a75537b1e245a1a640a39974da0c4 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae WHIRLPOOL c5d43eb0a45f80aac0607473029f67f30c0d46cc2c5434d953097f66170c611b06b548db4f4b6a3bc1689714ec02e579505ee9c0ef6dba86fd5c8bf51153c64a
+AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411c77ebb3ee3f SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb WHIRLPOOL d0ee272ae608241ca67a0a2d1365d37e19b86ce4a7baede55f7094f8b1b58671935a753fa3f9859777c0bef2ee47a36b418165e5e6c894bfa6e634f965abd57e
+DIST KeePass-2.36-Source.zip 5063221 SHA256 de7e3e9d9bedab13e4d66b0ee941b2ebedaa08d8090f7cd78bd0fc019187d8c8 SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41 WHIRLPOOL 1d9fbf662757e09c4854010da9f6960fe4bf794eb694b37a9f63d813c1e1d1471257a66f01eac761fed5b06831f659cb81f11eba8858ee4e128cd578a19fcae8
+EBUILD keepass-2.36.ebuild 3036 SHA256 839222f8fea99ed61a96a96bfccc46d0918c1876895383071e01c3ab2f7c9ab2 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174 WHIRLPOOL ca26d85275da05db045048789519fb602d908b28cda5c5758d2c9d63ab0d5266537e611691faa170f56553931572c4ebbc1bdf458581764394c2944e521f93f7
+MISC ChangeLog 6059 SHA256 e0725a5fa8ea7ca71a5b92e12ed0287b4e8ca1bd6a6b9bb5ec5aa05316a2a548 SHA512 acca1aeda8273a603089ef8f6395ed061ee0a7da45f92aae6b8b260da0601c53d05d0fdff1a391627b64a3b4fdb33ac41d915cfd581f44cc439b8800d6808a07 WHIRLPOOL e5a81e4561e5af4bcbc63c9ab39809383f45ee89c381178ba872fb381aeb53740922575454b2eb0273658faec88c2000ebd05dd1dedc411e0d07828a156c3374
+MISC ChangeLog-2015 3407 SHA256 634db193f86f7ccd6253c9a1e835cfac555c1849e8fee09a61f37e9ec1c3ea61 SHA512 614843ebf42b19a145f6962b9bc54c55700471165acbd2a2e009e6af833f29cf82865743c9905a6967eb1068ff01e93dc1b4542be91ca0c06ff08b5f721f88e3 WHIRLPOOL 70e5a29adee5527c7b00bdd8a433ba979aa4ffd45e428e406f4522caba9fabfc866bf564ce1641ca518cdcb57e59210031e21bddd618e55f1858f73bb8b56a5c
+MISC metadata.xml 791 SHA256 18c672f1ad673aa1fe0b4a7575f39dd70abd7d3807e6b8bfe4fd138497f6cf44 SHA512 fb4fe73e3a2f4d36f36ecae7b9c13dc48db967cced94f0741bd6a2ae91d2a1d502ef9d2c9ace534c866268829d430f91a79f1e7ead89d03cbdfd4a94b89df861 WHIRLPOOL d99d26c16df2713cdcc93e4b5f32abb793f5ddcdd57f1e4b2d11eee1feb0bd12c00905a7ed991fa90b1b6687b67745ea6fecefb95a7edbd0b86c11445da9749b
diff --git a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
new file mode 100644
index 000000000000..c17b654d3f35
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
@@ -0,0 +1,43 @@
+KeePass looks for some resources (XSL files) in the executable directory,
+however under UNIX system this not a good idea, so we look into the
+CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
+So the final search path should be "/usr/share/KeePass/XSL/".
+
+--- a/KeePass/forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
+@@ -31,9 +31,11 @@
+ using KeePass.Resources;
+ using KeePass.UI;
+ using KeePass.Util;
++using KeePass.Native;
+
+ using KeePassLib;
+ using KeePassLib.Utility;
++using KeePassLib.Native;
+
+ namespace KeePass.Forms
+ {
+@@ -98,8 +100,21 @@
+ m_lvComponents.Items.Add(lvi);
+
+ lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
+- string strPath = WinUtil.GetExecutable();
+- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
++
++ string strPath;
++ if (NativeLib.IsUnix())
++ {
++ strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
++ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
++ strPath += PwDefs.ShortProductName.ToLower();
++ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
++ }
++ else
++ {
++ strPath = WinUtil.GetExecutable();
++ strPath = UrlUtil.GetFileDirectory(strPath, true, false);
++ }
++
+ strPath += AppDefs.XslFilesDir;
+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
+ bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/app-admin/keepass/files/keepass.xml b/app-admin/keepass/files/keepass.xml
new file mode 100644
index 000000000000..5e3d80dcae7b
--- /dev/null
+++ b/app-admin/keepass/files/keepass.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+ <mime-type type="application/x-keepass2">
+ <comment>KeePass database</comment>
+ <glob pattern="*.kdbx"/>
+ <icon name="keepass" />
+ </mime-type>
+</mime-info>
+
diff --git a/app-admin/keepass/keepass-2.36.ebuild b/app-admin/keepass/keepass-2.36.ebuild
new file mode 100644
index 000000000000..6f098aaf79a0
--- /dev/null
+++ b/app-admin/keepass/keepass-2.36.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # Switch into build dir so the mono prepration script works correctly
+ cd Build || die
+ source PrepMonoDev.sh || die
+ cd ../ || die
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}/"
+ exeinto "/usr/$(get_libdir)/${PN}/"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages/
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
new file mode 100644
index 000000000000..1bac3fa32dc3
--- /dev/null
+++ b/app-admin/keepass/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>ale@clearmind.me</email>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>kensington@gentoo.org</email>
+ <description>Proxy maintainer. CC him on bugs.</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="aot">Generate native code at build time, rather than runtime.</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">keepass</remote-id>
+ <bugs-to>https://sourceforge.net/p/keepass/bugs/</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
new file mode 100644
index 000000000000..d71fc5c8523e
--- /dev/null
+++ b/app-admin/keepassx/Manifest
@@ -0,0 +1,10 @@
+AUX keepassx-0.4.3-gcc47.patch 424 SHA256 fc714bb9c2f5f5c71fa0850cd6c3037904dbd5ecfc9fa2e1af6749683dab3cb0 SHA512 89e08c9e3584f50c642fe0fa5517e84d18bb10022696b24f543cbf776bc7e4327bbdb89a94f86efbbd7ad40777885d3e34b380a22b3c2a8e941f1ebf8f3801d8 WHIRLPOOL c67d322e4107b650452c94319737900caacb445c220eda4ce14e739f04faa9915cb675c842097533e5af08c7d123ebf399256815c530baf3effd830d45e94a6b
+DIST keepassx-0.4.4.tar.gz 1371560 SHA256 3e27068ca85e68705347f0921c6b3c9248d7c5a84c79c0483daf22d141c0adc4 SHA512 2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8 WHIRLPOOL 41c987607c8b233292eac5c5d654974caa1ae2a0d277468081ad4a6e9fcd248314239162ba23dc414f0854a5f6ba09e1c1f9d3aa078756438650a0e9151e81d2
+DIST keepassx-2.0.2.tar.gz 1532353 SHA256 204bdcf49c72078cd6f02b4f29b062923cca9e7b2d3551f2bf352763daa236b8 SHA512 3f661d3b5807c5acafc65310ecd8bd4d0bcd51a0c919e219bba616cb3f54434f8f81ba533ab5ccec00d454838355ff048f4ffbc308442fad4f973d1766b95072 WHIRLPOOL 0d793bb3ce4ba015ea9cabc1625c61bdf0cc7fabfe5be67fe09ea180a5fb3654ef850531bff7e09bdc47107d69bf06f5e94fa308dbb0b8d5f9468b3c02349810
+DIST keepassx-2.0.3.tar.gz 1540235 SHA256 23ffb4ae360c58aa139943442d175bc6b8f08e6a876ae76c4543ab983a6647c5 SHA512 bf1a4ffa49fc4a6b7a27e6292981c9c13920712b4cd86759a99976f7e0593a243ea14575c57d664ba7e55d2449b5d83bc3d43a64a9a6972335e52234da79d773 WHIRLPOOL 7cd81732932461c8a823c32ec8ce7f203cd95cf32aee20b7dbb6c2a7f93e9fc9199191aa335cfe5004e9317e761207d2721f3557ac1b6da8d6c11578a731d234
+EBUILD keepassx-0.4.4.ebuild 929 SHA256 52d64e9f7e3f600d1defd3c04f18fb68fd3680db41285c6d76c9c474eaa95fea SHA512 a8f253848c07ed309a898239a2338f36cf38b278458fc1953e00d865c5d7e245b7cde23b6ba88e91ad91041712d640f268009b14230b2b7614a546e0384155c0 WHIRLPOOL a0c63011874da7a113c69d3208a2e2ef422ac71695f22e13bdaf39a95dac3a39e1f133b4e353a0cb8e4a53d9f79b398218839c560ba505c5bac8c3ba7ea951a9
+EBUILD keepassx-2.0.2-r1.ebuild 1041 SHA256 e8f464fe2901a3629c1a21c828e1efec08839820471d6a78fefcbe8277736df1 SHA512 c017a2bbdc7c7269def7f8b3a2ccaaaf4b8e92dbb7611246c9702fcc730234ba20390b96722cba064fbb7c4801aaab0a73271ab604e566ef9a6659ebf4e41330 WHIRLPOOL 705adffb8cf097dcbedd9149c47f55600815e826c7bdf109a445cd69a6df4fa4c7f445783b975080f60f135c45139282c05850930f6b4153f0e3f3c23d1b5236
+EBUILD keepassx-2.0.3.ebuild 1044 SHA256 bd92085e51beb118af7aef60493fbecc355037509e2c5eacf93e6a8cd6b3604a SHA512 e699b6bef16ef35a4003c21924b019b17db34c969276c94218765234a3a8d6702a88c4fdea48963b9ec50094a27d199768c751fe6f02fdf123665fff6b8d6386 WHIRLPOOL 2335c441bbe791a19753f30b9d561d624442c57290cbb6bb6e02b35b0715232613d748e4326a6c926170a6a1790bf9fe483c88773a0e5379ce3f96e84789b0a1
+MISC ChangeLog 7511 SHA256 5e4dad7f4f1c09ce3a163ee556df50fea6cd1f0c272b932254953e845e872e54 SHA512 37bb94299c265cbf7e8d38b157ac068485f5f27b796eb0d94cdd10e2f2bc806a126595adcb94aa702987d79cb4f8f2c4d6361dee86ac056d2ee129316800c2e8 WHIRLPOOL b53fed3fe805aceed8abe3dfe147a1111b973877315706e3b7f68279f9016dbedcf39597cce7ffa7fe99d10767dc44a324266af8497631d27c9e25ff27771272
+MISC ChangeLog-2015 10288 SHA256 83d11fceb38223e986411194cb4c128c178bb326846f6a73af1673bd4108fa92 SHA512 8eecd2fe1c642d0dacd2b8d4aa24f5c486c08187f2d3ecfbe0f51e7f4f61fe67841bed1ca203c0977cae3ce0dd8b57854adf45ff4d7291c8b9c922785714c985 WHIRLPOOL cba0789a5ee809d7866a1c2a31838213e158ac4452ce8a72669a5f5f8690b034b8c34387518d2fb9e783a4014e39bf31041c8632fc3537d024c969384b2b4800
+MISC metadata.xml 637 SHA256 279bc8ffd4462cd7ee058c92d1aae8cb6bcbf6ecf6f8a1cbc99571835feb3ded SHA512 16222209755e19e17fb7a887ef3c1b04e5e819307d614239aeb4ed6716245dc0d41f49e3dccb485c1f651ffe7275f6940bdd7c8018a3e1a7baefe3b9ddb8316e WHIRLPOOL 144f0ddbac4ed2fba9f58978afedba0507f100c3a9450a421ffce8db826f713c1e8df8d398eaab9f687aab3a519489dc5b7916793db890f4c733121efc5db82e
diff --git a/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch
new file mode 100644
index 000000000000..d5d0d8bd0882
--- /dev/null
+++ b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch
@@ -0,0 +1,11 @@
+diff -Naur keepassx-0.4.3/src/lib/random.cpp keepassx-0.4.3.new/src/lib/random.cpp
+--- keepassx-0.4.3/src/lib/random.cpp 2009-06-28 16:22:31.000000000 +0200
++++ keepassx-0.4.3.new/src/lib/random.cpp 2012-04-19 00:20:15.757415510 +0200
+@@ -19,6 +19,7 @@
+ ***************************************************************************/
+
+ #include "random.h"
++#include <unistd.h>
+
+
+ #if defined(Q_WS_X11) || defined(Q_WS_MAC)
diff --git a/app-admin/keepassx/keepassx-0.4.4.ebuild b/app-admin/keepassx/keepassx-0.4.4.ebuild
new file mode 100644
index 000000000000..af2a1b3d2f09
--- /dev/null
+++ b/app-admin/keepassx/keepassx-0.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="debug pch"
+
+DEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtxmlpatterns:4
+ >=x11-libs/libXtst-1.1.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.3-gcc47.patch )
+
+src_configure() {
+ local conf_pch
+ use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0"
+
+ eqmake4 ${PN}.pro -recursive \
+ PREFIX="${ED}/usr" \
+ "${conf_pch}"
+}
+
+src_compile() {
+ # workaround compile failure due to distcc, bug #214327
+ PATH=${PATH/\/usr\/lib\/distcc\/bin:}
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc changelog
+}
diff --git a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..8baf1a36ba4e
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot xdg
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-libs/libgcrypt:0=
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_prepare() {
+ xdg_src_prepare
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_TESTS="$(usex test)"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ xdg_pkg_preinst
+}
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_pkg_postrm
+}
diff --git a/app-admin/keepassx/keepassx-2.0.3.ebuild b/app-admin/keepassx/keepassx-2.0.3.ebuild
new file mode 100644
index 000000000000..3abb492c1956
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0.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 cmake-utils gnome2-utils vcs-snapshot xdg
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-libs/libgcrypt:0=
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_prepare() {
+ xdg_src_prepare
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_TESTS="$(usex test)"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ xdg_pkg_preinst
+}
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_pkg_postrm
+}
diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
new file mode 100644
index 000000000000..ecd1212a4fde
--- /dev/null
+++ b/app-admin/keepassx/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>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription>
+ KeePassX provides a safe location for your passwords and similar
+ data. It encrypts its databasee with AES either by passphrase or a key
+ file, compatible with a PDA and Windows version.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">keepassx/keepassx</remote-id>
+ <remote-id type="sourceforge">keepassx</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
new file mode 100644
index 000000000000..e5e5d31cfc90
--- /dev/null
+++ b/app-admin/keepassxc/Manifest
@@ -0,0 +1,8 @@
+DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
+DIST keepassxc-2.2.0.tar.gz 3814252 SHA256 9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8 SHA512 e23968c259afade81c8dcf0786ed68ca77ca8e9726dffb12e1017f2f60afb29b60ec1b71450ce7e284d543bcaa72bbc79bec917dea852d5bb923dff7fc6edcb5 WHIRLPOOL a993068922d8fd0bd1b06d434fff7340160c30992a166f15d9692d83e4a985939b88d20fce2b0425d3bab00de0e2ffce6fd2d34ff0bd92d08d95747ae03c9df9
+DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
+EBUILD keepassxc-2.1.4.ebuild 1296 SHA256 21020aa77454309d2b4ec78c59789b1fc5682cf8b2f496d98fd63379ca7e1c4d SHA512 bff1649354cc4188a248409fca71653831ee5af2f59d8ee8cf2fedbf7b0da08211744379ba3d12db70cddfb397000f827703265f74c5b4842dda2b5952a9b990 WHIRLPOOL 508a2cab8eef69078287ea5ee446546160b764d38319553352ee84000bbeddc72748f71186dbb3efe91df5daeab70a0564a653a75f7c913786edcdac26bcb47b
+EBUILD keepassxc-2.2.0.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
+EBUILD keepassxc-2.2.1.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
+EBUILD keepassxc-9999.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
+MISC metadata.xml 819 SHA256 eef8083b85f448c94b9b84f542ac6894cb0d16e91f03a22e27d31cc744667d7d SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d WHIRLPOOL aa80bba4cfa8cb4e5fadb8e36eced51596072c5a01a20b723742940dd1e7ec12a9ccd908fdf0ec04b8c703b81d6fe520a2f8aea4cae248afa9eafe12076e9914
diff --git a/app-admin/keepassxc/keepassxc-2.1.4.ebuild b/app-admin/keepassxc/keepassxc-2.1.4.ebuild
new file mode 100644
index 000000000000..e9a3f3c9ed24
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+else
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test"
+
+RDEPEND="
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+"
+# yubikey? ( sys-auth/libyubikey )
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_HTTP="$(usex http)"
+ #-DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-2.2.0.ebuild b/app-admin/keepassxc/keepassxc-2.2.0.ebuild
new file mode 100644
index 000000000000..00fb3e294475
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_HTTP="$(usex http)"
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-2.2.1.ebuild b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
new file mode 100644
index 000000000000..00fb3e294475
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_HTTP="$(usex http)"
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
new file mode 100644
index 000000000000..00fb3e294475
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit cmake-utils ${SCM}
+unset SCM
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype debug http test yubikey"
+
+RDEPEND="
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_HTTP="$(usex http)"
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
new file mode 100644
index 000000000000..80385e835f0b
--- /dev/null
+++ b/app-admin/keepassxc/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>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <use>
+ <flag name="autotype">Add support to autotype the passwords into other applications</flag>
+ <flag name="http">Add http support</flag>
+ <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
+ </use>
+ <longdescription>
+ KeePassXC provides a safe location for your passwords and similar
+ data. It encrypts its databasee with AES either by passphrase or a key
+ file, compatible with a PDA and Windows version.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">keepassxreboot/keepassxc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
new file mode 100644
index 000000000000..149ed7486bdc
--- /dev/null
+++ b/app-admin/killproc/Manifest
@@ -0,0 +1,7 @@
+AUX killproc-2.13-argz.patch 195 SHA256 d26015079b65cf8e2292ba2edf6e3af59c1ddf5cc65ef25ec2ecfc7881f7883e SHA512 a6f4c0fc6b211af04f6e9137f52c4f911f989dffcb20d3c5069ea3716469ed23f08774f8dfe1aa2ce4f1ac2ef828b440fdcddfd8c77fe2891574145af0a02340 WHIRLPOOL 101590a844bffbe883dcc91eac64dcb35c4c3488de52381ace25265eb94ac1382a311a3fc524eb3768a6c5946b737c33558a3a2e9a3a2e6be4061adcda6fd799
+AUX killproc-2.13-makefile.patch 1212 SHA256 f43f25e13fc2311909fec4f2f4e19eb59037bbde4f61fa1e6c07aa0d5e940aa1 SHA512 c471361ca0fb4e4cb3d2e74c29115cf441b6129c2cbf54540ee7af40e818f1b6df169344c5f44ae8d9a1769aa0bf26bc00d5c6348546e9e37dff5e505b767e68 WHIRLPOOL 4bfec757d192c9e0597ede6aa10f0ac809f0caa8ad6dd5a265ab70f89babb390b169340ba0e0434f027427d02c57b011be8686a8175de4be6b7b6e07fef12673
+DIST killproc-2.13.tar.gz 37953 SHA256 090590f5ab24559889bd134f38258d5ea567590098580c2345ca8183fb9c3e78 SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d WHIRLPOOL 06bcba6d88ec598c5ae31f18a24cc14ae710d4e94f0185c29017b75a475c9e84be6fb01470af24d945f22a169a0c77060741f8228cd8066d5be53dc5d6395b49
+EBUILD killproc-2.13-r1.ebuild 672 SHA256 f501aaca307c0baf438bd14547247222baf7965bde30b10e0e2355dd372b9fbb SHA512 b98fb958aa481ae0ab548f8578ca0ff1644b119cba6f56837903ea3b2380199eaaeca8083d9bc3b31515f3f22f6188a0fa816bddd3acd91b4596f25ea4dfd18b WHIRLPOOL 623c77334dbe453a016941473b37338ca18a18db8b7505825a9bf9aba5687926f9f02cf5a463e81c6ef82af82ac3a0630767360640d926ae75cd93b28c5bf8ca
+MISC ChangeLog 2412 SHA256 75aaaf634bc0b30b49883a8315ff1cacd1506c1512582380d5d44e19219d78b8 SHA512 97769c7fbda55b9ff078997245af0a15c0ccec81f372504aaae76a083ebe4cf6364c7b38ee7847a85432a9336d830a6f09a665cd6276b363cdfc6403333a0afe WHIRLPOOL dff241baf63212989a5cb72548e826b8c0a62ac102a372dba498b05acf7d78634ceba0134181900eb98045479c8bc0448f4a01b029abad4977a84aa5ab694a3a
+MISC ChangeLog-2015 5210 SHA256 e316b8cfbfee815ea0924027e8f7b4c96ec0452fc8b5dbd852acd2e10c6ba42c SHA512 1f3c04c2bcd1d6e308112b2a23af5a3d6382c15e20003320bc99206c28666883cc69a17ae71332bd0737ade40ea0a8395f1b1d182c0cbf126071c391e183ce79 WHIRLPOOL 7c24685c8b37ea3a2618942b53f81214458684c027d42535950549d7691656278b7b51d4b35e6381e0ff8d8b9d8d6e89db0ef37b4ff6ededb38cf0324a353af8
+MISC metadata.xml 237 SHA256 f566a667a52eb683ec4cf493f8542072a718b4a9de2582bacfbe794928cffc3e SHA512 ec2a39c9baa1516733bfbe39044a2fb2b9742b0ddb1b1eebab2ce7cd1027f92ef9c2c48a3e0f7362ea897160818f214542f82bdf8ba7b2a5034c0c5090f137e8 WHIRLPOOL 1d9256ee4a38411d96e59dc468e6895e420cc79a062a266c10575a0d4c781e6c6cc9ebcdfb1a22be35cc4e5cd7799030eca20b700cd77a0b65b261e9af738627
diff --git a/app-admin/killproc/files/killproc-2.13-argz.patch b/app-admin/killproc/files/killproc-2.13-argz.patch
new file mode 100644
index 000000000000..6ea0cc5f8f2c
--- /dev/null
+++ b/app-admin/killproc/files/killproc-2.13-argz.patch
@@ -0,0 +1,10 @@
+--- a/startproc.c
++++ b/startproc.c
+@@ -25,7 +25,6 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/ioctl.h>
+-#include <argz.h>
+ #include <grp.h>
+
+ #define USAGE "Usage:\n"\
diff --git a/app-admin/killproc/files/killproc-2.13-makefile.patch b/app-admin/killproc/files/killproc-2.13-makefile.patch
new file mode 100644
index 000000000000..4eb8131448ee
--- /dev/null
+++ b/app-admin/killproc/files/killproc-2.13-makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile
++++ b/Makefile
+@@ -27,9 +27,7 @@
+ #
+ # egcs used with -O2 includes -fno-force-mem which is/was buggy (1998/10/08)
+ #
+- CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall -pipe
+- CLOOP = -funroll-loops
+- CC = gcc
++ CFLAGS = $(RPM_OPT_FLAGS) $(COPTS) $(DEBUG) $(INC) -D_GNU_SOURCE -Wall
+ RM = rm -f
+ MKDIR = mkdir -p
+ RMDIR = rm -rf
+@@ -59,22 +57,22 @@
+ all: $(SBINPRG) $(UBINPRG)
+
+ libinit.o: libinit.c libinit.h
+- $(CC) $(CFLAGS) $(CLOOP) -DINITDIR=\"$(INITDIR)\" -c $<
++ $(CC) $(CFLAGS) -DINITDIR=\"$(INITDIR)\" -c $<
+
+ killproc: killproc.c libinit.o
+- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ startproc: startproc.c libinit.o
+- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ checkproc: checkproc.c libinit.o
+- $(CC) $(CFLAGS) $(CLOOP) -o $@ $^ $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ usleep: usleep.c
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ fsync: fsync.c
+- $(CC) $(CFLAGS) -o $@ $^
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+
+ clean:
+ $(RM) *.o *~ killproc startproc checkproc pidofproc start_daemon usleep fsync
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
new file mode 100644
index 000000000000..4674fcb3e7e3
--- /dev/null
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="killproc and assorted tools for boot scripts"
+HOMEPAGE="http://ftp.suse.com/pub/projects/init/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-makefile.patch" \
+ "${FILESDIR}/${P}-argz.patch"
+
+ tc-export CC
+ export COPTS=${CFLAGS}
+}
+
+src_install() {
+ into /
+ dosbin checkproc fsync killproc startproc usleep
+ into /usr
+ doman *.8 *.1
+ dodoc README *.lsm
+}
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
new file mode 100644
index 000000000000..1f15fbbf8995
--- /dev/null
+++ b/app-admin/killproc/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-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
new file mode 100644
index 000000000000..360919ce991e
--- /dev/null
+++ b/app-admin/kpcli/Manifest
@@ -0,0 +1,7 @@
+DIST kpcli-3.0.pl 181841 SHA256 947b7b0485215f72e14bb8936c847abb583253c597f58234650922270259049c SHA512 fb1243ed81408507090ce6e7b06e958f923ac9c64e6994b104605bb85deb08e1b63b28fdb2c5a4eb24e128734b65ecb0209000f08ec9a7644f3d6a8fbb781587 WHIRLPOOL 096d8e516fe2e0cabd605232bd8b1f41d6dec6e5081cc2429ff97aea95e575c3a4faf760c59012a1535494afcf2755710496b394dc9153eb1a99d0738d56c3a0
+DIST kpcli-3.1.pl 193792 SHA256 f1f07704a30d0eae126717d5dae0d24ccced43c316454e4a7b868fe0a239a21a SHA512 2bcfaa4535fd35d7bbf512e704392e207237efa669bf5d6845d1657e44511f04b80fddd4404f3a8d409f330f8bfbb5cf9f1e09fb8a425685b3d7309a8040df5e WHIRLPOOL 832d16d71892933b81bc5d29099118cfd838fa5b96b6766d6a4b732fc579f8dd616441c89ebc2eb5670045da2ca2bd183f83a407111c2db64978986b611f7bf2
+EBUILD kpcli-3.0.ebuild 881 SHA256 2b68d1048e05d0664e17bbb8eb26845758e1e250daef9a13e1f83cac8730d834 SHA512 db94cfba8b4ab9ea55a405d95cf2bec7836ee563c2ca1599850b422b20c81984c345798b20c94471466ed1c25dfd083309c89a1573621dfea8ba3e91018aee7c WHIRLPOOL e9baf1ae9ac785e96d23c37b9b8526e70936a71698731cb5faffb2e1bc4d245889fa9d84e043d27bf5af6bba36426afa9b5098d2d47ebb8d18bc937313a4ec44
+EBUILD kpcli-3.1.ebuild 933 SHA256 ce593f2e4ef1ea0119dfd7948cd7d45d965316f810a5c7b16c846bfed5e5783f SHA512 7aed92ec74ae4f429de373b0a2246c84fd1e31a08077890f08e5e6c7cbb199f15a985e64976aec26d5fc627b34031e8e48252d3304fcc97458d839735cb84743 WHIRLPOOL de233e09c90f7370a578f0c61efe183641470f6ef81e46e8ffc2cef3f506ef3dd60ff0ddeaf2e951bb904767d736b398c85dfc534f419c4d5246fbeed304cb09
+MISC ChangeLog 3402 SHA256 41f79d1a2853824ffa732099d0dda1a124bc2515ad6be55c4683d69c5a2b3800 SHA512 8efda5dfceb2f9d1b1b5cd72b842d09740ac7cddb73ae09fe45543ada19cad872215e615a41dcb8203c93578e85c0d8fb70fd46e8a4a1aebd6fa2c9478368082 WHIRLPOOL 988f2a8a5b233d7e5437f65a2523423e68dbf0d5f6eb4eca5c51268626ba5e4a7b76625bc7ff2e488cc3685ad89637298255de827a66ce8689c6f7f88913b430
+MISC ChangeLog-2015 514 SHA256 0c242d62ade8e698b0039518220874517abc2d2269750815b88b4f4e03c5268b SHA512 e43b4567bc0ae42e926216a434da08e385384455e3ad636598cf3d3a41d5c2f3944f31b66fd3fa6747aeadb162992fd4031d65b52f8ff92169f0c0c74f084002 WHIRLPOOL a06eb7ed84b79fa17cc1db2ee9f1c7bd4283228409b8aa315722b806e8667c4e77734b0a737328180d0bd1adbb165c033445ca227d10e9b4d54e3f9e4b4a816a
+MISC metadata.xml 336 SHA256 504e09b85180d72f2ee529e596947c9eb0c2062502ce7e65680d94e3b1cfeea3 SHA512 0d14658777d24fe70a871694ef722f49bd02b138658316470f4a8d5bf83c068d7c9ace11c34423a3a73aefdf590e43f2b56d2578a08c67cbac179ef3b59ca42b WHIRLPOOL 6299befb9da8de6fb063f2e2da2537e9ac835e07ab71541004d39eca18c4cb2284ac6c5a39453cd7f4cf48265d0e2f14c8c70553f5ef9e7e8d13a04b0a21733b
diff --git a/app-admin/kpcli/kpcli-3.0.ebuild b/app-admin/kpcli/kpcli-3.0.ebuild
new file mode 100644
index 000000000000..22e49477c1e0
--- /dev/null
+++ b/app-admin/kpcli/kpcli-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
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="
+ dev-lang/perl
+ dev-perl/Clone
+ dev-perl/Crypt-Rijndael
+ dev-perl/TermReadKey
+ dev-perl/Sort-Naturally
+ dev-perl/Term-ShellUI
+ >=dev-perl/File-KeePass-0.30.0
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ virtual/perl-Digest-MD5
+ virtual/perl-Digest-SHA
+ virtual/perl-Data-Dumper
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Carp
+ X? ( dev-perl/Clipboard )
+"
+
+src_unpack() {
+ mkdir "${S}" || die
+ cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ dobin kpcli
+}
diff --git a/app-admin/kpcli/kpcli-3.1.ebuild b/app-admin/kpcli/kpcli-3.1.ebuild
new file mode 100644
index 000000000000..8283bf2ccefa
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND=""
+RDEPEND="
+ dev-lang/perl
+ dev-perl/Clone
+ dev-perl/Crypt-Rijndael
+ dev-perl/TermReadKey
+ dev-perl/Sort-Naturally
+ dev-perl/Term-ShellUI
+ >=dev-perl/File-KeePass-0.30.0
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ virtual/perl-Digest-MD5
+ virtual/perl-Digest-SHA
+ virtual/perl-Data-Dumper
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-Piece
+ virtual/perl-Carp
+ X? (
+ dev-perl/Capture-Tiny
+ dev-perl/Clipboard
+ )
+"
+
+src_unpack() {
+ mkdir "${S}" || die
+ cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ dobin kpcli
+}
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
new file mode 100644
index 000000000000..ad8e967f1f82
--- /dev/null
+++ b/app-admin/kpcli/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>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">kpcli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/lastpass-binary-component/Manifest b/app-admin/lastpass-binary-component/Manifest
new file mode 100644
index 000000000000..d202dca25e37
--- /dev/null
+++ b/app-admin/lastpass-binary-component/Manifest
@@ -0,0 +1,4 @@
+DIST lastpass-binary-component-4.1.44.tar.bz2 1623477 SHA256 adb0e91f8d212d34dbb85db0b11738fe36db1a741ad5674d7070c4019a9fc75e SHA512 6fd518fa19f7206a1007376460c61e5a5c8d868126a767b3978309f0cc7ccd069e743cb12364e6841d8d3cb29452d058122b95f42bcfd2bd4deb4b8c77dc5f75 WHIRLPOOL c50bde0ee3f82abe56803beb2bda09786f7806b5e480eb8401fe0302ee984465f2682af66243095f3ea83744d59d6d3548806c423b69a8603abed9fc3ba3d00c
+EBUILD lastpass-binary-component-4.1.44.ebuild 1987 SHA256 65c0839b18ac887697fdc4953e14f00f4ff9dbb38e55bbf3c1b99794641f059f SHA512 65bf16de59b633847eef329c2e7333002c442332f86bc284577d0fc4fbd210adeaca455b65c70bc8fd62855198b74cbf4fbb32927b6c4ccd561032ea99147f6a WHIRLPOOL e8641d108f6450664ac461346d771572ed83866c0a189797847516697b83e488e74dbfcb302abb1d9f0fa053bb3dc2fbcceb2c08765500ecdd36b629be1f7ad6
+MISC ChangeLog 1109 SHA256 30bcd9c2fbbc86a284418d51db7de4a4f50308011c4292f7e7cc3a039555dde9 SHA512 59d411167317f3459c4cefb10b5e14ba4faea4c87f6acef301cf74c8d3c0a3377cc5e7233f0b72de4d75dd52507072f468227c44446177ade8d4653b323a0237 WHIRLPOOL b7a4cc7d6720577d1a2dd962dccb63ef44e97b4dc5d72843a984f1e1a8633a4e3cfb8b0daa5d8780737adb6840000117e0b2b742bdf32b870e5bbe642c279074
+MISC metadata.xml 816 SHA256 d35f43fbc54e2d23b6cfd6624949f28a85d3149c4405d83f739453111facb5a6 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b WHIRLPOOL 9b69c840104a8a72413892ad0f6bd9eba9534e14f5a7d8df5e3b7be88dbefd2b9f9eb21e513ef4f820c8c4de7f740c6d91e83546b6d2ad2cec146ba40813fe75
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild
new file mode 100644
index 000000000000..c46f9987de0a
--- /dev/null
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.44.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary component required by the LastPass Password Manager browser extension"
+HOMEPAGE="https://helpdesk.lastpass.com/downloading-and-installing/#h5"
+# sadly, upstream has no versioned distfiles
+SRC_URI="https://lastpass.com/lplinux.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LastPass"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="strip mirror" # We can't mirror it, but we can fetch it
+
+RDEPEND="
+ !!app-admin/lastpass
+"
+
+LASTPASS_EXEDIR=/opt/lastpass/
+
+QA_PREBUILT="
+ ${LASTPASS_EXEDIR}nplastpass*
+"
+
+S="${WORKDIR}/lplinux"
+
+src_install() {
+ # This is based on the upstream installer script that's in the tarball
+ bin=nplastpass
+ use amd64 && bin="${bin}64"
+ exeinto ${LASTPASS_EXEDIR}
+ doexe "${S}"/${bin}
+
+ cat >"${T}"/lastpass_policy.json <<-EOF || die
+ {
+ "ExtensionInstallSources": [
+ "https://lastpass.com/*",
+ "https://*.lastpass.com/*",
+ "https://d1jxck0p3rkj0.cloudfront.net/lastpass/*"
+ ]
+ }
+ EOF
+ cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+ {
+ "name": "com.lastpass.nplastpass",
+ "description": "LastPass",
+ "path": "${LASTPASS_EXEDIR}${bin}",
+ "type": "stdio",
+ "allowed_origins": [
+ "chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+ "chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+ "chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/",
+ "chrome-extension://hgnkdfamjgnljokmokheijphenjjhkjc/"
+ ]
+ }
+ EOF
+
+ for d in /etc/chromium /etc/opt/chrome; do
+ insinto ${d}/policies/managed
+ doins "${T}"/lastpass_policy.json
+ insinto ${d}/native-messaging-hosts
+ doins "${T}"/com.lastpass.nplastpass.json
+ done
+
+}
+
+pkg_postinst() {
+ einfo "This package only installs the components required by the browser extension."
+ einfo "Visit the links below for your browser to install the extension itself:"
+ einfo "Chrome/Chromium: https://lastpass.com/dl/inline/?full=1"
+ einfo "Opera: https://lastpass.com/dl/"
+}
diff --git a/app-admin/lastpass-binary-component/metadata.xml b/app-admin/lastpass-binary-component/metadata.xml
new file mode 100644
index 000000000000..6f4f533e3c35
--- /dev/null
+++ b/app-admin/lastpass-binary-component/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>gokturk@gentoo.org</email>
+ <name>Göktürk Yüksek</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <longdescription lang="en">
+ The binary features for Lastpass include faster encryption/decryption,
+ clipboard integration, smart card authentication and more for
+ <pkg>www-client/google-chrome</pkg>, <pkg>www-client/chromium</pkg>,
+ and <pkg>www-client/opera</pkg> web browsers. For
+ <pkg>www-client/firefox</pkg> this package is not required as the
+ extension bundles the binary components already.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
new file mode 100644
index 000000000000..da69844af8ef
--- /dev/null
+++ b/app-admin/lastpass-cli/Manifest
@@ -0,0 +1,9 @@
+DIST lastpass-cli-1.0.0.tar.gz 92311 SHA256 42096c0bd3972b0e9cc9cef32fbf141e47b04b9e2387fb3abe8b105e135fb41e SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610 WHIRLPOOL 394bfb597f5262dd1e47c7a3c48ef093b398f90c6dcacac6b172bb008891c76faf448ecf6be0ebfa277d18d335b166b7efadc063acc57ce88274004d1734bf21
+DIST lastpass-cli-1.1.2.tar.gz 102796 SHA256 bc737d8e6d713c8aecdfb7f34b29aa9a8ae9b1e9ba80b31059686b18591a8c39 SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c WHIRLPOOL c7e6a4d5ac9b8c52f53e081b367289b390704fa4dfbf13a9ea0086e4ca0d49f9ef5a39f9ea854387ffb66fbd18f9b5263d17ae6573c4286fb7a36ebdce724d7f
+DIST lastpass-cli-1.2.1.tar.gz 108780 SHA256 1a49a37a67a973296e218306e6d36c9383347b1833e5a878ebc08355b1c77456 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62 WHIRLPOOL c74988f37c96d065c0fea58c946c3aa3f4925d889247247b89ffe25012077d8eb3c694a3d539a40cf3f2be1fdd195b6ef6c1ef2d429587cc18fb8a8db8fb8a93
+EBUILD lastpass-cli-1.0.0.ebuild 1012 SHA256 181d3b59b7733521798cd2cf98dbf35aa13c6706708b6e8131faa3c3b91fb8cf SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f WHIRLPOOL 301454d57323c010210efedb18a3e89471774cb1fcdaad56dbb2d1f77148259d17378416e450174625bd06c702681ad27f1f0dc15b28e1c950e2508d51c9625d
+EBUILD lastpass-cli-1.1.2.ebuild 937 SHA256 d51bc2955e555db6cf251c5f55425c4252d5913cfb01362c90999f4c17032cb1 SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be WHIRLPOOL c35423cc750934178522f26c7ea484343d5fb19812a4e6d7d3ba0b98f68994997d935bfd2d216fef1a0f1913bede373050315b035bc53b4c370b9eb9d7ac1e41
+EBUILD lastpass-cli-1.2.1.ebuild 1273 SHA256 769fbc6bba7cd192b602c7fec8a51d4c15f738ce03ceddabd6e6142677333f55 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c WHIRLPOOL d557b8b146d8adbd20afc1e1d4149e24aa49b4dd95aa3f2e29a35c06de122e13d9d95b9e5541f21ae48883f753add824a15d2cadd46dd5378d044c9e6ff5b172
+MISC ChangeLog 8685 SHA256 c5c191dd0b7af5ee8f6c7527afabf1728671c379b50a3743a0aae7dd1ec091c4 SHA512 425f91ed3a9003094527192da9d6d5ad1701ce0fd524d37ffda1550b74f733af0eb3cc5332c7da491a3a5188c0047f02caa36023de1a7ca852926043adec9724 WHIRLPOOL b34ff580eefe5a5b3159b971cc419b2c45ea8e9cf884783eb0e3f6f45c28ed6e8ebf12093781ae0b816b6c88daf5f77489e98c88a719af8e4e0ab379476e1ad6
+MISC ChangeLog-2015 1046 SHA256 84a7da020cc2fdf4df41673d0a8475580995a7e159490cfeb2a29b360558bb81 SHA512 b4759454a0a8113f55caff2ff736903ec4c335730545cac178311ea8b076cd8c522a8104ff9a117bccf2b57b2b37593666e55922c8a46f638a5cadb0dee5149e WHIRLPOOL b3c1ff878c10744bd6f7f54a344f2858ac625d5b5fbb306d0d026b131878271542a9bc7f2b821a89e15073933ef85da2a114c39305d0932b0e60acf77b3bcab9
+MISC metadata.xml 643 SHA256 7b04ceab7153ce462669fca6ee8dd72e37c4c6e9e6f2b9de866c97b03af4d036 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3 WHIRLPOOL 3215f5055176a55e1e0489f560061f242fb2887d4e68ebe0655925aa751a88333de8fd8513cd065e8a74cbdf96df686adbd8fd34021e8a600f4181050786e241
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
new file mode 100644
index 000000000000..a33a27661666
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+ X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-misc/curl
+ dev-libs/libxml2
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Do not include headers from /usr/local/include
+ sed -i -e 's:-I/usr/local/include::' Makefile || die
+ default
+ tc-export CC
+}
+
+src_compile() {
+ emake PREFIX="${EPREFIX}/usr" COMPDIR="$(get_bashcompdir)" all doc-man
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
new file mode 100644
index 000000000000..d81e760b556d
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
@@ -0,0 +1,44 @@
+# 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="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+ X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-misc/curl
+ dev-libs/libxml2
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile all doc-man
+}
+
+src_install() {
+ cmake-utils_src_install install install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
new file mode 100644
index 000000000000..4a4ee2d8677a
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
@@ -0,0 +1,57 @@
+# 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="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+ X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-misc/curl
+ dev-libs/libxml2
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+ cmake-utils_src_install install install-doc
+}
+
+src_test() {
+ local myctestargs=(
+ -j1 # Parallel tests fail
+ )
+
+ # The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+ # which is incorrect for our out-of-source build
+ sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+ -i "${S}"/test/include.sh
+
+ cmake-utils_src_test
+}
diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml
new file mode 100644
index 000000000000..837ad12e8308
--- /dev/null
+++ b/app-admin/lastpass-cli/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>gokturk@gentoo.org</email>
+ <name>Göktürk Yüksek</name>
+ </maintainer>
+ <use>
+ <flag name="X">
+ Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
+ </flag>
+ <flag name="pinentry">
+ Use <pkg>app-crypt/pinentry</pkg> to prompt for passwords.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">lastpass/lastpass-cli</remote-id>
+ <bugs-to>https://github.com/lastpass/lastpass-cli/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
new file mode 100644
index 000000000000..fcc699d0de9b
--- /dev/null
+++ b/app-admin/lib_users/Manifest
@@ -0,0 +1,5 @@
+DIST lib_users-0.10.tar.gz 25636 SHA256 2ccee6967c7da935441cb7f57112f15373ddaafe2f2915744caf271c308c9c98 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a WHIRLPOOL 310d5c187c7c3cd6a4be5dd4282709aeeea9941dea0f2466e80156bd8577e72a0cfe2b92df43a26d2198e7dc7d6320eb34e3e86311c9db956517dc48b856b8b4
+EBUILD lib_users-0.10.ebuild 1117 SHA256 af5745ed620d0d15bf6705d7d0dcbb4141de6bedce7c862d55b6e3700f9bcf4a SHA512 d5e8f63944f2b7e6cc6bb34b170f59b534cc5c6c8346ade237110a621e27dc2253969ec969321d5567e6d0e70dc9a3d57219321d41cbe27462e109b590c2a605 WHIRLPOOL d0d52136c3f1e52fe58a60806c98db8fee822035e360c87fbf4f544d9f4a1e5f9f8940b858b0e0e7334fc375c1ec051b3a5f831cc22ab3da48490d0ef99c3e0d
+MISC ChangeLog 2510 SHA256 e63463aca3fe425b2d37373aa4e9e1e1d4775996ba7de903efb55ebf002615c2 SHA512 b220ec9d88f625304cefb136967a46d3b827b04fddfc42c6bd5f6ca7f86d4e275472db4b593add24d8b409c5c1072514a8a52e7e4042b66f9a397d5f2285d684 WHIRLPOOL d8d8a90f2eaba888710c13d6327cb586f4a030538c06dd912b146cede5ef608bba9944885e1bdc409be87b67d7630c293c5ae2203ca497430fea7d2ddd926d2a
+MISC ChangeLog-2015 6635 SHA256 c3778905eaea420f1eaa2349a303b3477bbbb5ce438e989fb5b3c27da07b45d4 SHA512 dd6eaaef174c19302211b45a18b6bda3cbe73d39757e3121f07cced6ca67b13fa7e4a7e29c0e1d831f2b422473c2909f70a12ac5f977f46be6e54b1bc7127257 WHIRLPOOL 3cfb5283112d30fe6569e47a3397f600f261d99ed5c17e16fe76cf1e99e46d680c8b51a9e91312fe7cf193593f710ddc1d61b87270fe95434ff5fb3611f8f038
+MISC metadata.xml 454 SHA256 d6650d157e36e018296d5c3298aa516a93e96942ce3fe71e2917c01914148b88 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd WHIRLPOOL 195300833028630aba469f15860a19abb237477bfa483f30720c4597326b230987a61f9d782fc1971050150739d205caba7392ac3345a0b4843738cb95e58773
diff --git a/app-admin/lib_users/lib_users-0.10.ebuild b/app-admin/lib_users/lib_users-0.10.ebuild
new file mode 100644
index 000000000000..89d0f323c9a8
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.10.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=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+ )"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+ python_foreach_impl nosetests --verbosity=2
+}
+
+my_install() {
+ python_newscript lib_users.py lib_users
+ python_newscript fd_users.py fd_users
+ # lib_users_util/ contains a test script we don't want, so do things by hand
+ python_moduleinto lib_users_util
+ python_domodule lib_users_util/common.py
+ python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+ python_foreach_impl my_install
+ dodoc README.md TODO
+}
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
new file mode 100644
index 000000000000..3497f56287b0
--- /dev/null
+++ b/app-admin/lib_users/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>jer@gentoo.org</email>
+ <name>Jeroen Roovers</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>klausman@gentoo.org</email>
+ <name>Tobias Klausman</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">klausman/lib_users</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
new file mode 100644
index 000000000000..0e8499adc4b9
--- /dev/null
+++ b/app-admin/lnav/Manifest
@@ -0,0 +1,7 @@
+DIST lnav-0.8.1.tar.gz 616105 SHA256 db942abccdb5327d7594ca9e32e0b44802790fad8577bdbed44f81220fd62153 SHA512 b3514834f42ed647f40c501ad22b68a52755b0c8a558d29305c357b39e598c1386ec9e37d71e8b7e2b5833df41e5f7f398b50b84611d3e6accfb2feb2cdba952 WHIRLPOOL 41f732389bd7d2e5c2edcf6feacdfa2b3cd001d6f59eaa2357be7cf1457448a7430b9829ba324bbfbd961189a8b431ff0e96d2756d88803efe9f89fbdc8f6e8b
+DIST lnav-0.8.2.tar.gz 693219 SHA256 0f6a235aa3719f84067d510127730f5834a8874795494c9292c2f0de43db8c70 SHA512 75c7014e013567e9a0ee78e28a6648d756de7cba3c103b10ddb974c61066db3a1c2efbd14636cb3729bd7c6a4ab534d1999d44e127b8a6728d12bd5be23f30c4 WHIRLPOOL b464e3b00beec18979f40b6790215c1923b65d8e57abdd81affca91afd99ac6371ac814048fd2a09487f663ff894f8ae20cdddb08ba53d7aba9990b0c7d9f0b2
+EBUILD lnav-0.8.1.ebuild 715 SHA256 156e11e3f81abc0e6066967e7c4da5584f4258bcd95d77f1df003de82a07a91b SHA512 27fefba75e2149e09668f807e6978556b12842c8b20e2bad505ce382898a3deac21e74ab47604635cc289e85b6ee4552947d5e54460eade962e78bccb52752a0 WHIRLPOOL 0d6e99fcf457767dd421954abe394ac92a6b13bd3f5872c7f60acbd0fb92b67cd315fe1c2b88d19d4c9ce98cbacabc4fc1ad59cd2c16cfd4cab72b860ade536d
+EBUILD lnav-0.8.2.ebuild 672 SHA256 5bf1932d5cd97305af358f26eef6f3dd5537646bf02005222bfdff1e393a2afa SHA512 58bbf5568efc25df9be91dbc7a233e5b5ec47ed35a1688438f05ae3d489d5f3aa39223a9c49053dc2151ff1e5680a475a1489d738f0792e8106f1176b0c45c03 WHIRLPOOL 02f9d5f074d520fb39fb52632cf97722036366fed53bad223831c555c1df3928bcdddfa962fa5fa0a0a8263e284f29ed9a9d8f55cbb3e1896392f3f92ff1e94b
+MISC ChangeLog 2552 SHA256 19ed16e99bb7c85b739b640d3c946dcc17ebf891dec0902a094599789a0cf5d1 SHA512 239c2731afd5029d95592b3660ed5a6a9b7ee5215ca7e03abc9dedb3dc16e3f1e9810e3a8eaef3bc6e9e5cc3f77c84ac3e0ab877f81ba41df652f6abaa805627 WHIRLPOOL 8cafdf453877f00f01728077f233baaad8c9f17f2d9d5fdc4b84043a2e2ebad945a8d9e57abc596338c20a67e00d309cffe5ebcb592d7403366db38c7c260090
+MISC ChangeLog-2015 920 SHA256 762006cad29440c75171256980dc5bfedfe8139d7952cd4926123cd2805e30c1 SHA512 89fea81a06087a97d26633bc8be101d877570e24e0f34db9b38fcd2298e26461903f4e11173f0a9805798f907b2c6c6a7f96af1c347d7edc4b843b42945593dc WHIRLPOOL db721fd41293423e390f04d53c9e08a2a403eb20321d282fb51a41aed0846d90e2541bedb810ef0bc05275b5c0b77315d24e668e967934fa0e445d3e731a6279
+MISC metadata.xml 332 SHA256 947556616829395a7e57e907bc40f9e1e1dca2fc84f6df1c9a0c4bd333c13624 SHA512 38280dd0af700835f8fdb73eb9085f5c0a027ba9111377253a29f174bc63547f59ddb2025d35a72faeee7f1e9ee3c57f2411242df1c46c5d07d3a8b5211cf9b7 WHIRLPOOL 65e1c2f62b630a11c51de3bc8fd2b6e4c4dfaf3df6166f83839d16d645fa74a46da29ff986ac28d35209762a1f1340e70239d3eb0de24e20713614cc37fea89e
diff --git a/app-admin/lnav/lnav-0.8.1.ebuild b/app-admin/lnav/lnav-0.8.1.ebuild
new file mode 100644
index 000000000000..c11649613fee
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-db/sqlite:3
+ dev-libs/libpcre[cxx]
+ >=net-misc/curl-7.23.0
+ sys-libs/ncurses:0=[unicode?]
+ sys-libs/readline:0=
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with unicode ncursesw)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
diff --git a/app-admin/lnav/lnav-0.8.2.ebuild b/app-admin/lnav/lnav-0.8.2.ebuild
new file mode 100644
index 000000000000..c7ce22bb4de3
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.2.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 curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-db/sqlite:3
+ dev-libs/libpcre[cxx]
+ >=net-misc/curl-7.23.0
+ sys-libs/ncurses:0=[unicode?]
+ sys-libs/readline:0=
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with unicode ncursesw)
+}
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
new file mode 100644
index 000000000000..a78cad49a983
--- /dev/null
+++ b/app-admin/lnav/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">tstack/lnav</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/localepurge/Manifest b/app-admin/localepurge/Manifest
new file mode 100644
index 000000000000..72ffa54aceb9
--- /dev/null
+++ b/app-admin/localepurge/Manifest
@@ -0,0 +1,9 @@
+AUX localepurge-0.5.4-directorysum.patch 799 SHA256 5b0ef49c52debca8a66a79087902b3beeafa91116d5e4eca5f87a4db54380593 SHA512 a7ccb8b1a6963e45ebde2ff72c0612eeaae62cd248b8b5c675d0e0d5d0c91d7d5db34edc6e09ceebab83016f62e233a62a71562537d5dc2ead20274f1bfead2b WHIRLPOOL 5939fbb8f623099f3c912e2fa9bfe698b4de217722286d7e9eb1cce729756c9510e7db400a3545fb5206ec1f7d95f98bb17154e41964aff8583d376c00532f13
+AUX localepurge-0.5.4-evaltotal.patch 366 SHA256 ee62901830d0c370be31279674b174151cfd23cdb7ffbdd7bd67f521b2548aec SHA512 81c10dae3222fee74ab814966745fcf6793aee4601ce3686d19c3ad6a602edb237fe877c94462cdfc5abfd71ce53cfa2fd439c453f38f98335147b1134cc843d WHIRLPOOL 4f76e43a98261a27d548062754104670e9a6980c5378346f9aef7a10d8c4ff5b7011ff6057c97cc7c177bb4b3e77eca533772dc14bccb2d26dac5b6944377444
+AUX localepurge-0.5.4-parentdir.patch 730 SHA256 6c3418108a8e34202fe72ad03a673c088bda49667556ca374b98f6549cd0e592 SHA512 f46501a92fb37645c49d7ed50265cb739b7f0ca0f88be0586aae25f4672caf097ce60d6808c545b2dda31e295e596f58fba501f4470b7ea96c8fe11a1de0f0cb WHIRLPOOL 2bd35c43308b63d85b5a651220b813c0d9579621398b68f5fe8ef298658f132b6f3e49e3346d0c23d42e31378f403a525b7a9d76091ee44283b47a56f1c1e37d
+AUX localepurge-0.5.4-prefix.patch 2872 SHA256 ebc8a9ed23e968edc182777c7e32a86169550b81dc13b6d78f5ebe919ce1f1ad SHA512 994050265349b6fd91d6759368250a25122d207ec3356dc5d7902a4d897012dadf2fead83d7aa36f98191ed309ce0019d8f21a445c7d56139355a9bd471e1ad6 WHIRLPOOL 0320e8dede7929b4db8cfc340aba8d96f69eee6e38d9c8b99b4ad10d34b5b5b0c973536e12cd79948179482c909fc04b1826ec517b35fc26bccd5251d0de8eda
+DIST localepurge-0.5.4.tbz2 5038 SHA256 7aca13f6b44af74480c611c0dd63b6fe05c6084bfd3f08bfd347e7914af2ffaa SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e WHIRLPOOL d1da9a6a4d5fca92e7353e6ed0e6b916b8529ad7f003a0af02b2403ceb33bdd71769b3bd1a3c37095167a0e8b3811a5b6774a089f96eedd76edb4ebf46a992d4
+EBUILD localepurge-0.5.4-r2.ebuild 1005 SHA256 b1d5324c416bc8ae012d6882f66514ad3bf514c29572f2fed163effac94a71ec SHA512 c182cadf66486da8bbcca3c6cd74343bb4b873a16ecee8195e2c64cce143daa3befaf499d78886681dbbafa357c019ed018c6fcbd1619e557437690003f9446a WHIRLPOOL 54eff7587b1f0528e8e7518369e3e3e39da93929c2f1246bbc5c400cb675b5d3ad08a51fd1d52932f77f877c5ea192f4d5fdd9c0d38e27ffe130ab438c6bcd87
+MISC ChangeLog 3230 SHA256 fff328ed1b5070f4ed3312ec593e7459ef7cfad6daadb95901b2810e4b5dece7 SHA512 7f8bffe9fe55752f554bf658283a528031f352e86eac237683d93a4df6a431ed1ec88d68488536e514572a2ba137c270430a7eaa76a829cff1cea9c75f567329 WHIRLPOOL 7b649ca1337b530d9c8651060b25d52ea22f6267d9fa45eb6fd22f4d022715cd33dd1a60f076f149bd093bd0fc372f4c629ba88ca540ac05b81833d4e32b8a2c
+MISC ChangeLog-2015 9066 SHA256 a8c2cc2fd98934fd7e1a588f9421c040a480eaa74ba9e9340ed51238d989fce2 SHA512 b1543854b9359eb68563fe48778aabda2e0726ec30f37d37389e9edbe6edd97ae3055f3e5e167e9d07757f39a76096adc3932ce8dcaa2f0b4096585c28773bc6 WHIRLPOOL 0a6e36b908968abb335ebba606ec2a4505e0b611e93289869ba7e6d217fbfe0e93676bfa714293ef50127c97326a2c71af4d2ec31ca43596487870c4755c3417
+MISC metadata.xml 295 SHA256 0598c44dacaf55313a621a7fd630c589bf7d932cdf25351dfaafe3b25debfaeb SHA512 1828b9bd1dc81e15ab98d4dd17aa1dd165739824cd3c56c32872cee9b42ea6a4d4a110be9dcc21df889341402d1b1bc74c71e84572aa7892f81321e8a74d9cf5 WHIRLPOOL f722afdedea1d25ad7abfc4cd2b4c05c0a04b5089df3a8ddd38a99d6db252411fe1c661484c663e891afc3a970652feb6b1cf901dd01abad3186c2cc5e39751e
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
new file mode 100644
index 000000000000..f837d2845d54
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
@@ -0,0 +1,20 @@
+--- localepurge.orig 2012-12-04 23:15:29.422756767 +0100
++++ localepurge 2012-12-04 23:16:13.313756491 +0100
+@@ -198,7 +198,7 @@
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+ if test $SPACETMP -gt 0 ; then
+- LOCALETOTAL=$SPACETMP
++ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
+ einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+ fi
+ SPACETMP=0
+@@ -230,7 +230,7 @@
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+ if test $SPACETMP -gt 0 ; then
+- MANTOTAL=$SPACETMP
++ MANTOTAL=$(($MANTOTAL + $SPACETMP))
+ einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
+ fi
+ SPACETMP=0
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
new file mode 100644
index 000000000000..df80a7f9c8a6
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
@@ -0,0 +1,11 @@
+--- localepurge.original 2012-12-02 18:32:35.000000000 +0400
++++ localepurge 2013-01-14 19:31:35.327821252 +0400
+@@ -254,7 +254,7 @@
+
+ # Calculating and reporting total disk space freed:
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+- let TOTAL=$LOCALETOTAL+$MANTOTAL
++ TOTAL=$(($LOCALETOTAL+$MANTOTAL))
+ if test $TOTAL -lt 0; then
+ TOTAL=0
+ fi
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
new file mode 100644
index 000000000000..2b052ddf4d99
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
@@ -0,0 +1,18 @@
+--- localepurge.orig 2012-12-04 23:08:17.754765708 +0100
++++ localepurge 2012-12-04 23:09:02.397765264 +0100
+@@ -165,7 +165,14 @@
+ ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
+
+ if [ "$SHOWFREEDSPACE" = "enabled" ]; then
+- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++ # if symlink, REMOVEPATH could be removed
++ # check from parentdir then
++ if [ -d ${REMOVEPATH} ]; then
++ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
++ else
++ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
++ fi
++
+ SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
+
+ if test $SPACESUM -gt 0 ; then
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
new file mode 100644
index 000000000000..66ebbf09ac96
--- /dev/null
+++ b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
@@ -0,0 +1,58 @@
+--- localepurge.orig 2012-12-02 19:56:18.000000000 +0100
++++ localepurge 2012-12-02 20:00:38.000000000 +0100
+@@ -1,14 +1,14 @@
+-#!/bin/bash
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+
+ # Deleting all locale files on system
+ # *not* listed in /etc/locale.nopurge
+
+ set -e
+
+-LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale /usr/share/binutils-data/*/*/locale /usr/share/gcc-data/*/*/locale"
+-MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
+-LOCALELIST="/var/cache/localepurge/localelist"
+-CONFIGFILE="/etc/locale.nopurge"
++LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/binutils-data/*/*/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/gcc-data/*/*/locale"
++MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
++LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
++CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
+ VERSION="0.5.4"
+
+ LOCALETOTAL=0
+@@ -23,7 +23,7 @@
+ BRACKET=$'\e[34;01m'
+ BOLD=$'\e[1m'
+
+-ACTION="/bin/rm -vf"
++ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
+
+ eerror () {
+ echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
+@@ -43,7 +43,7 @@
+ print() {
+ for x in $@; do
+ if [ "${x}" = "" ]; then return 0
+- else /bin/echo $x
++ else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
+ fi
+ done
+ }
+@@ -184,7 +184,7 @@
+ einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
+ fi
+
+- for LOCALE in `/bin/ls ${LOCALEDIR}`; do
++ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
+ if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
+ if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
+ if [ "${LIST}" = "enabled" ]; then
+@@ -216,7 +216,7 @@
+ einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
+ fi
+
+- for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
++ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
+ if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
+ if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
+ if [ "${LIST}" = "enabled" ]; then
diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..cb6dca5900aa
--- /dev/null
+++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils prefix
+
+DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages"
+HOMEPAGE="https://gentoo.org
+https://cgit.gentoo.org/proj/localepurge.git"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-prefix.patch
+ # 164544
+ epatch "${FILESDIR}"/${P}-directorysum.patch
+ # 445910
+ epatch "${FILESDIR}"/${P}-parentdir.patch
+ # 452208
+ epatch "${FILESDIR}"/${P}-evaltotal.patch
+ eprefixify ${PN}
+}
+
+src_install() {
+ insinto /var/cache/${PN}
+ doins defaultlist
+ dosym defaultlist /var/cache/${PN}/localelist
+ insinto /etc
+ doins locale.nopurge
+ dobin ${PN}
+ doman ${PN}.8
+}
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
new file mode 100644
index 000000000000..779ea9e0804e
--- /dev/null
+++ b/app-admin/localepurge/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-needed -->
+<longdescription>Just a simple tool to erase all uneeded locale and man files
+usually generated for USE="nls"</longdescription>
+</pkgmetadata>
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
new file mode 100644
index 000000000000..47c0065fb4f3
--- /dev/null
+++ b/app-admin/logcheck/Manifest
@@ -0,0 +1,10 @@
+AUX logcheck.cron 184 SHA256 cfbe04b278773e775e893c4c4d29f4e465835aa4f79c342868fa9dd4ae5eaeb3 SHA512 fd0b1bc8c836b766bfbb6102012996d27e378475571167b4d4df98301793624483aca2bd51ec19a2aa367e78b062ddde67355452db8dc1d69fe84a20a2081c30 WHIRLPOOL bcdf8bcc5d15497b4d6a004d1d9b4722d4f1ca128f070c07ec522656fbe502ca34449a86ed9b944365945dfd69683ec1870b937584e746d4b00e66a8d7544ed3
+DIST logcheck_1.3.15.tar.gz 162397 SHA256 b29b4753940a9130b5f19f60d2d89af23be220674625f4bd2fb1d40945d0b9e5 SHA512 45c9e779fc1d1f417aea3f02e70eff4dbc7cd0b45e04f7efc458a4552866686cbb095d0b5ebaf32a57d423a3753b4573277a464f5539789350b087569e025abf WHIRLPOOL 7d4c1975453427eb0897b9f05670565643fd36c44204b23470adf1eac17b19ec77aaeae3523b7b1844f20acf39da0d736386b80bfc0f4059c2099ff816ddd08c
+DIST logcheck_1.3.17.tar.xz 130956 SHA256 c2d3fc323e8c6555e91d956385dbfd0f67b55872ed0f6a7ad8ad2526a9faf03a SHA512 e4a30b6ccd7a9f0f51354b1a6e577f6a3837e3db078f61b3d3ceaf630a1f1eeae03324e6ec58307f8f723dbd017e1543c15f7dc34e50c0eeb9ee0b160b2c879d WHIRLPOOL 21db3f57a07cf416a313ccdb393233c47e30c3675870d7fc1b6024eaa54db6df3542a7d3f40d6fc5c3174593cd910efbac71cd86b1865f969e8ca6dd0523e217
+DIST logcheck_1.3.18.tar.xz 131252 SHA256 077b9149ccd2b747b52785afa89da844f3d072c017c9e719925dec6acb9a9af4 SHA512 3ab75969f732efa123d9df2c8b44557e4a7eddef8332a8357463930714148a13130c763c22e562bd60e106abf5e18cf39b3572e0c048727a117fbc67430b7e3f WHIRLPOOL 3f86dedd09be36eb9ecb906c39e73625bc45db25148d4b818d5a784105ba2d1987eab0e4bb82fda9ced68422e6a9caf52f1ca7aa861f4b8e1cef65079e444038
+EBUILD logcheck-1.3.15-r2.ebuild 1189 SHA256 704004385dadd88f8b8f29722f853a51a00f0919b2519fd7e93582053984f5fb SHA512 bcfc87c796cbbd553ffc18a5777ca0114c7be968512d17fc42c8dd99e80658e4d93d88208823258bebdce1323a2715aeb3a4df3888da11776bd946f9bbebf0aa WHIRLPOOL 8c4401dcc37f84ed382c4b8c6158681fe5ad4b6cee12265b7662f5afe6d295feeccec1cb08bc72acd2b0f30a7490ce53b38590c7080579ca57d72b9a44fad148
+EBUILD logcheck-1.3.17.ebuild 1190 SHA256 a40ffe0069f8d853addaaed82aec705191f661b46852fee855fa7ce9f6c7e4ab SHA512 161ac902f0aa625c9c26c41956926d39d63f50f8daaffb3df42f0f8faf68d45e5392b4679c1e8294f1140388692801f318644de18b6b38953ac784886f4758da WHIRLPOOL 02d00cb86cd1a558c4420dbd906e2c2c8a3c3b483dc90ae5c5962f0c742cab9a00dc9c6422cb6c4772b4e260081ae2862506806c243e29b584e6f01a73ac2d8e
+EBUILD logcheck-1.3.18.ebuild 1190 SHA256 f4a4c3fa987bdaa391fb5f1694f735097bc52b8d0d1f2b898fa78716d3d36236 SHA512 792074adc44cd65d44be803f9f0ee718dcfde3d6436b2662c02736811a163d3fa8a080500f5e2dde94c5fe086095cd6169b309dfb9cc2c923c451007451f35a0 WHIRLPOOL ee2e9cfb55a5a397a339f853d8660eaa95fc86c0d1155fc1cd4b2448e336b66b8bc9109896c84672e80e73d6a2bb0625521b1a9ebf1abd9e31aea03d88692fab
+MISC ChangeLog 2834 SHA256 861fe2805189c275932400caf3d744aed571e454d012ab3a95a832b208aecf09 SHA512 e62148cf87e7e40ec11b30df6e634a25a8e9aeebb3b4a8b15abd71f992dfb63f9e7afa599228dadac0de5d81bcc9ec49e4ecd8d1ea514964613e0918eb415467 WHIRLPOOL c7792b6fe9fcc500066f8ff0d1c31fc608933e1fe823c7dc9ffee37713ac57463ba3ab859be3d13357b1e4cf2d765ca0bc478836d163e7ad33ba8b1601eba5e5
+MISC ChangeLog-2015 5381 SHA256 f57a45653a4c1433f641ed353d57de34967deb9b7df1b6fdf9a487da831191ea SHA512 f93642dcefea7475077b58c5b196d21f67d2b9c894b1d97b6d172b72bab0376654a55fa3a30c6649eddbde095d4c7b6d018be5cb66f9b09e610d2457d6be5324 WHIRLPOOL beaf5fe1582702da717641a2353afbfc2c8fe86bff110e67b47206cc2da4e1540439a05ec8e2c7e2455405b2457662ba72bfeb5e43c1b86f4fcb1b51db1f00f5
+MISC metadata.xml 167 SHA256 5fe493e76bba84455c54b3a46adfae5a1bfe01c764ef0d9e5f6d3e8a1d142188 SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 WHIRLPOOL dc6c3dfc7fd7f0d76c97f0786cb76a55b8564f8437f96d4ccebf985817b9f6dcc4c61830aa5df80d725e4a54b281ea2e03d6b0859214af081112cba15025e64b
diff --git a/app-admin/logcheck/files/logcheck.cron b/app-admin/logcheck/files/logcheck.cron
new file mode 100644
index 000000000000..3b3f4fcf62bd
--- /dev/null
+++ b/app-admin/logcheck/files/logcheck.cron
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -d /var/lock/logcheck ]; then
+ mkdir -p /var/lock/logcheck
+fi
+chown -R logcheck:logcheck /var/lock/logcheck
+
+su -s /bin/bash -c /usr/sbin/logcheck logcheck
diff --git a/app-admin/logcheck/logcheck-1.3.15-r2.ebuild b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
new file mode 100644
index 000000000000..15c4b76c81c4
--- /dev/null
+++ b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit user
+
+DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
+HOMEPAGE="http://packages.debian.org/sid/logcheck"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-admin/logsentry
+ app-misc/lockfile-progs
+ dev-lang/perl
+ dev-perl/mime-construct
+ virtual/mailx
+ ${DEPEND}"
+
+pkg_setup() {
+ enewgroup logcheck
+ enewuser logcheck -1 -1 -1 logcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Do not install /var/lock, bug #449968 . Use rmdir to make sure
+ # the directories removed are empty.
+ rmdir "${D}/var/lock/logcheck" || die
+ rmdir "${D}/var/lock" || die
+
+ keepdir /var/lib/logcheck
+ dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
+ doman docs/logtail.8 docs/logtail2.8
+
+ exeinto /etc/cron.hourly
+ doexe "${FILESDIR}/${PN}.cron"
+}
+
+pkg_postinst() {
+ chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
+
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
+ elog "for installation instructions."
+}
diff --git a/app-admin/logcheck/logcheck-1.3.17.ebuild b/app-admin/logcheck/logcheck-1.3.17.ebuild
new file mode 100644
index 000000000000..412128f50978
--- /dev/null
+++ b/app-admin/logcheck/logcheck-1.3.17.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit user
+
+DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
+HOMEPAGE="http://packages.debian.org/sid/logcheck"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-admin/logsentry
+ app-misc/lockfile-progs
+ dev-lang/perl
+ dev-perl/mime-construct
+ virtual/mailx
+ ${DEPEND}"
+
+pkg_setup() {
+ enewgroup logcheck
+ enewuser logcheck -1 -1 -1 logcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Do not install /var/lock, bug #449968 . Use rmdir to make sure
+ # the directories removed are empty.
+ rmdir "${D}/var/lock/logcheck" || die
+ rmdir "${D}/var/lock" || die
+
+ keepdir /var/lib/logcheck
+ dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
+ doman docs/logtail.8 docs/logtail2.8
+
+ exeinto /etc/cron.hourly
+ doexe "${FILESDIR}/${PN}.cron"
+}
+
+pkg_postinst() {
+ chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
+
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
+ elog "for installation instructions."
+}
diff --git a/app-admin/logcheck/logcheck-1.3.18.ebuild b/app-admin/logcheck/logcheck-1.3.18.ebuild
new file mode 100644
index 000000000000..05809634d694
--- /dev/null
+++ b/app-admin/logcheck/logcheck-1.3.18.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Mails anomalies in the system logfiles to the administrator"
+HOMEPAGE="http://packages.debian.org/sid/logcheck"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!app-admin/logsentry
+ app-misc/lockfile-progs
+ dev-lang/perl
+ dev-perl/mime-construct
+ virtual/mailx
+ ${DEPEND}"
+
+pkg_setup() {
+ enewgroup logcheck
+ enewuser logcheck -1 -1 -1 logcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Do not install /var/lock, bug #449968 . Use rmdir to make sure
+ # the directories removed are empty.
+ rmdir "${D}/var/lock/logcheck" || die
+ rmdir "${D}/var/lock" || die
+
+ keepdir /var/lib/logcheck
+ dodoc AUTHORS CHANGES CREDITS TODO docs/README.*
+ doman docs/logtail.8 docs/logtail2.8
+
+ exeinto /etc/cron.hourly
+ doexe "${FILESDIR}/${PN}.cron"
+}
+
+pkg_postinst() {
+ chown -R logcheck:logcheck /etc/logcheck /var/lib/logcheck || die
+
+ elog "Please read the guide at https://wiki.gentoo.org/wiki/Logcheck"
+ elog "for installation instructions."
+}
diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/app-admin/logcheck/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-admin/logmon/Manifest b/app-admin/logmon/Manifest
new file mode 100644
index 000000000000..bc9575ef3759
--- /dev/null
+++ b/app-admin/logmon/Manifest
@@ -0,0 +1,9 @@
+AUX logmon-0.4.4-char2int.diff 169 SHA256 6c549a9c88bf5839382f886b4afa360a70f22a426e43d84dfab18dec018950da SHA512 49e7c6564cda45c70007efab6a94f64d2b50dc157c535b1260c63d9e391e526bbf911850558ad9299c8422d6349bc0c25d9a30030d88b45dc3e8b644e6ec2e2e WHIRLPOOL 7bed4b9d5b15140f921b5be1b5aa0f2d0886842bfa06db5bbcba4542bfcaf91dda4ef5395337fa0d1fe318d5b45b5ac2ff45eaa86594ab44efd1c11617bd36ba
+AUX logmon-0.4.4-gcc43.patch 211 SHA256 2cfbf3d7ad00b2dd4b62f4b4a502d71b6aee1f1025609955d1c07d8c5dcb4bfd SHA512 8e5594fc769b1fe3807cc296e50dd2ae6f5035d60d6dc2faf586467d8693c1d7565f671025e2b588948abf27b2942d02f5afcdbeb02f4c60a3ce02f6acdfcd08 WHIRLPOOL d325715b59ce9420e4dd0eb35127433cceb4ca94d125c982fab0c0d0ec3dfb792d3d88ea93f2dc7de5c48da02dbae847d5671614ea273306e345c689de40af8b
+AUX logmon-0.4.4-maintainer-mode.patch 284 SHA256 9fe96d7da37a653b0585561b93c11074f4cd29f5638e6acb4353730c00455a62 SHA512 5720b1db0f9c449f02aee075cc677e83e0393b33ae990e6b88aa5d0b637b28d69d11b7813360f899510cf1a7d39b30d17117fccc1ceae2cf88aebb509eadb600 WHIRLPOOL 8e514bc4b94cbd31fd7f547e3c3d8ba8c6788ae0c114becb178be95b4b5ff12d8981529ce412bb69786016b2d62faf109d94ecf8cd5a9a132dc7375c84b91a47
+AUX logmon-0.4.4-tinfo.patch 247 SHA256 fff8f0cadcef25f19d1131981012aed19ddfe11ef293a898bc009d762f8a4b16 SHA512 3d11e8c19aff181a6886c6dd14cfe3956d1bc60c3919e9c1a1ce693111c407f9c631113386381c4391ccf4d81bdd6625fc255c7608c7f688880e22e84e9e1af7 WHIRLPOOL ef424bb0ce9c20c5131dee4303b2a6dc74bb9ee699c2be8ea0495c63ae6d34afd195833668b0ca5a5a19d00118bd68f3a68a3b24c3cc2abd94d8c6e3949d81d6
+DIST LogMon-0.4.4.tar.bz2 65975 SHA256 9b7192c651069cc7d98508b25841610b2cd7a318cbf3b1b55564ae6f0d5468f2 SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac WHIRLPOOL ffec8263e1559a22088bb228d075ee8919c577ef21267b2260eed96d43258a6e850be1194ae26727700f0dcaf88e8bc5017396a83748306f6a5956f1e4dd23d0
+EBUILD logmon-0.4.4-r1.ebuild 850 SHA256 ad8cb04d8fd62ead3f706d3a2d733871ea355e6f4e4ced8997597e0c6da5a790 SHA512 a7756e88d77dba0e9cf5a582a12e972244974b219158291011e1ca4babf5315b01d82bc81ebcc3d8b01e59917b57896e5a92db4ab51aa9dae33d4b8179225458 WHIRLPOOL b00565577337f680a96cdb886f8b3ceae09f84f36db0c3a52ac09622411f9fd2f9c7e4829032636f750e082e81ef455fd026e2607080137a1f8125c335b36943
+MISC ChangeLog 2328 SHA256 5d84c6c75c223ffe58483cb22196db406871ba4bc42ef6ef73f6e59bb6fd7b01 SHA512 d7b425a1869ecce701a6b21cb49c3c403202cf0e3f26ea101a52dc3e625a3b79100936fe87118ef509aa2f972c7722924bff229d9243077102dfcacd21b5e6a2 WHIRLPOOL 67cb883b41528ab24fe31929b4ae0580c3890f9f94c69e8dbfef031214915aa8d7a08edfa361e696bcbd2cefb06074ccbad7d550b5d222184dc3714fa5e7a2f9
+MISC ChangeLog-2015 3124 SHA256 e77fe488e6642019dc35fa01f8c17ed9419ff133d0c78a6a646c583de87592ca SHA512 f4a43b341df5ca2761f3801b132a6e9906ea9b490d0de2a8b29deb9f62c5045d432f903347e96c426510f992e4d0f0aabf36f9f5ac68e7410cf8f871a5d55ce6 WHIRLPOOL d37fa33f224f41ad3313052bd7872d09cfa1045a92428a71e10d02624a1bbaf96a513cd7ae1d6c77e54f98ed25e199d28e07962c1251ae8db7c730818fb4a8fe
+MISC metadata.xml 336 SHA256 4b78b1cea030d9526505991474f9f4d0254fb8f769c64092f05eccc4606a9844 SHA512 e4d5565793ec2c2b9993f9561c8c84069afd5c7111ebc55339a545c146fc408c9f2ccd952d18152a07d12009634f27647295d4616f189ea5062b5db8bb6a8a59 WHIRLPOOL be541402b220e19f68298467f002bb52429da4cab60d7982bc216f41003c317854c23e6e9ec09e2d251fb2fd5e2cb8b1a9d6918f43ada71b82ba811f48506ba4
diff --git a/app-admin/logmon/files/logmon-0.4.4-char2int.diff b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
new file mode 100644
index 000000000000..f460d182ed00
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-char2int.diff
@@ -0,0 +1,11 @@
+--- a/Main.cc
++++ b/Main.cc
+@@ -264,7 +264,7 @@
+ {
+ (void) signal(SIGINT, sig_int);
+
+- char c;
++ int c;
+
+ #ifdef __DEBUG__
+ ferr = fopen("err.txt","w");
diff --git a/app-admin/logmon/files/logmon-0.4.4-gcc43.patch b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
new file mode 100644
index 000000000000..de58b5a35798
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-gcc43.patch
@@ -0,0 +1,14 @@
+--- a/LineManip.cc
++++ b/LineManip.cc
+@@ -3,10 +3,11 @@
+ //
+
+ #include <unistd.h>
+ #include <ncurses.h>
+ #include <ctype.h>
++#include <cstdlib>
+
+ #include "LineManip.h"
+ #include "Util.h"
+
+ #ifdef __DEBUG__
diff --git a/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
new file mode 100644
index 000000000000..6f19ade7c9ad
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-maintainer-mode.patch
@@ -0,0 +1,15 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,11 +1,11 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Main.cc)
+
+
+ AM_INIT_AUTOMAKE(logmon, 0.4.4)
+-
++AM_MAINTAINER_MODE
+ AC_CONFIG_HEADER(config.h)
+
+ dnl Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_CXX
diff --git a/app-admin/logmon/files/logmon-0.4.4-tinfo.patch b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
new file mode 100644
index 000000000000..4aa37b881ed2
--- /dev/null
+++ b/app-admin/logmon/files/logmon-0.4.4-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -16,6 +16,7 @@
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+ AC_CHECK_LIB(ncurses, initscr)
++AC_SEARCH_LIBS(halfdelay, tinfo)
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..8fede639a21f
--- /dev/null
+++ b/app-admin/logmon/logmon-0.4.4-r1.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 autotools
+
+MY_P="LogMon-${PV}"
+DESCRIPTION="Split-screen terminal/ncurses based log viewer"
+HOMEPAGE="http://www.edespot.com/code/LogMon/"
+SRC_URI="http://www.edespot.com/code/LogMon/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # Bug 119403 - should be in upstream next release
+ epatch "${FILESDIR}"/${P}-char2int.diff
+
+ # Bug 250602, gcc43 fix
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+
+ # Fixes maintainer-mode detected.
+ epatch "${FILESDIR}"/${P}-maintainer-mode.patch
+
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+
+ eautoreconf
+}
+
+src_install() {
+ dobin logmon
+
+ dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/logmon/metadata.xml b/app-admin/logmon/metadata.xml
new file mode 100644
index 000000000000..9d1727e6bd92
--- /dev/null
+++ b/app-admin/logmon/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>
+ <longdescription>
+ Split-screen terminal/ncurses based log viewer.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
new file mode 100644
index 000000000000..8cbeb931bd04
--- /dev/null
+++ b/app-admin/logrotate/Manifest
@@ -0,0 +1,29 @@
+AUX logrotate-3.11.0-Werror.patch 468 SHA256 633ec5e7d0d44e490d4fc2f71ccb7742ee44087143f2a175077c5ea71c3bf3e8 SHA512 a846e9d3778a33622d7daccbd5880cadf2201ec3914c9f47c0c67c1786edd720a33c140f18f7259024e13e1f5cedcd447deb9cfb0d70882fb52332bfffe3c42e WHIRLPOOL ed64892d93334eeaee8ad244227f396a23c8d005177d32952b2575cef5efc6c52ef23d6e0d3ce889c5a652e4b511df11857a7fd717efb54ee9240da117b6c6e6
+AUX logrotate-3.11.0-fbsd.patch 1421 SHA256 04bd0e7a2fd75d41a424d35b31dbbcc3e25ed44c3cac7bc5b2ae5db643a06b27 SHA512 dd552c5879cc9cc120a7ff953d1934278a9976a46e84c010bb135e1988dd12cadfe7cb5e2f5067d5b882dc521713fb2a024cb61ad0216cdb33297f356bc0307e WHIRLPOOL 4d6556b6f72e7843e910ba8519c6e8f0986fbb516e8d7700e4feac337cc6e8cb1f802302e0bb228c5597aaefd41a752174871cc027da740bc775f51d5339c1c0
+AUX logrotate-3.11.0-ignore-hidden.patch 548 SHA256 56fca1f490e9a9f13f110297a8988e59800b10b9d06b4f284f76dbaba4ad717e SHA512 a86caa30b787abc1328652e590dd73633a38830739ff6c6c9f5d43fb2919e53383ec8091f5e0d6af475d13fd68bd1e636cd43cd5adf377c22ff2ea694ba32cf1 WHIRLPOOL 5164d9048e9f147197077e73933a219d8074bd57bd2835e997cba12ba7e815f87495d46bc6c6bf9f54957f4f501fb24284a75aef9bac0d1c84cee9c94e5beb1e
+AUX logrotate-3.11.0-lfs.patch 346 SHA256 ad8cfab537560d663afa954e654592c9f139aefc9848f08619212ee46ab074f4 SHA512 cdffb9f1481bb8777319423c9617898b50712129a80d721fef8c243a030248a70540d2db0d421e8e974bc6623d8739d1a50da8b65894cdc385dd8d741c2710e1 WHIRLPOOL 82fec61a2bd484cbcc18cea898197923ea8cfea86039bdb2bef7effa9635f6287d06e879bccf11b22f770cb1b93542756e2f11d9f8564f35966f69e6fea9f3d4
+AUX logrotate-3.11.0-noasprintf.patch 1274 SHA256 8a84f7c46b117f0c9705333e50c9a2c3173b62b6fb2a86b3752d9cb597a84c8d SHA512 d673aa820cd95b744deb24b1c5ccbc82f22d5f6220028a0b96c7abc3190cfc5f85fed1f8bba7fd98b8b3ff458fccb08c2adb80046151088bc0797f814de2a9f5 WHIRLPOOL 573505eea80a433d47d83cde1e252d704a1e543b149816a75854de7042dd417af31d2848c04e0a225e16b6d00cae3d6b673a336cf018ee2438bb3102a1244705
+AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
+AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
+AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
+AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
+AUX logrotate-3.9.1-Werror.patch 344 SHA256 63ce419252a8e2ed52c78b018bb1b2247e02f5c2c322168a5772d3faa957bd88 SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493 WHIRLPOOL 808769d911f49ed40c572e6f21d42e578aba056b3815017f25bb66d5d14a9fd78c16a92f30874346324ab1e0e7af57f6fa678707d88e8b3f69055c25b4b9a81a
+AUX logrotate-3.9.1-atomic-create.patch 1253 SHA256 f5a93032a0d7f48b4eb295fd40400d527a66804e3f959d391f895cebd86ef7ad SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99 WHIRLPOOL 29b74ceae23035e4423753042375f1fc713fc780b3ea31d166034746c0d4c89ec1be7979c570f13437902ba7c155299eb870510742fa73656517f5accd43d100
+AUX logrotate-3.9.1-fbsd.patch 1393 SHA256 543a7e7118f66cda16446d5bfd7abdae1c72e786f49f701c515ea595e72fe7ef SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822 WHIRLPOOL dd34fb0f8070e297a6f760d9d77ed3191ff3e91b152710ac6acaaada70236b12e6cc192259c06e15ef0d54f75a28de23dd3052a3c37d20b888c8069b77794a07
+AUX logrotate-3.9.1-ignore-hidden.patch 551 SHA256 3f04aa2ff9ff85cf0486c40f6a81c28ed3eed8c4d31c30de1d86100db4564a9f SHA512 8a2060b4f3a92f7920090b4d02b4f66b7320c068936028f07dfefc0411b0f78b1477565cef627ce131d2cd5e98ead04b7d0289c4961e68da36a69a81d8b40acb WHIRLPOOL 56fe4edda60adf4d1dd106ab45d8e2aa79c941384cc44fde928314a772be58f3204573f6c3f8ee0cfdcbf2ec08c3dc2c99bd2a90822d903f1f492a118d722f88
+AUX logrotate-3.9.1-noasprintf.patch 1263 SHA256 edc5f3db12c27c3353cfe1764c10d3b97581f249096e61f875440e429afc778a SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6 WHIRLPOOL 0d702f6c92483791e9fe2b5128e324fcda7c5ee825c46fab4405b5752f836bce00aaaf8ec9a284a5214aa2e10a4818bfb2e8cd9a4e2bce6f0836ec1c543dd3ea
+AUX logrotate.conf 743 SHA256 9144148139ab9aaaaa5b02d3f88e44b6dfd23b8ddd6c86d2f543eb5ad566f775 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24 WHIRLPOOL b2cd43773242adc78b2b322679db16946a5db95d56591a6e53316660937f7696f51b66fb8c106f7e2b98fc119070397f986ecfd1563409749801a5331c058357
+AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b2840fc252fb09504209 SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36 WHIRLPOOL 6fc46fb539199e992112081a3d8d24bd6bf50597b268a08b36eb86158f513ead488cdcec23eec88750c79767f6a7f8024d17909e5d14888f9b1634eaaece00b7
+DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
+DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
+DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
+DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
+EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
+EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
+EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
+EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
+EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
+EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
+MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
+MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
+MISC metadata.xml 1119 SHA256 b7371408e490b8daaa817a32cca5415613c41b1810498fc74423cb1446d90444 SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79 WHIRLPOOL 483f4c22f62575c599cd687b1b5303c1c084b35723090041e72418d5b8086f5c44fd14a0f96960b91a355eeef01bb1c1f7220031720f2cfd27c77b3904ef9911
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch b/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
new file mode 100644
index 000000000000..43c0ebaeb189
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.11.0-Werror.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2016-11-30 13:05:55.000000000 +0100
++++ b/Makefile.am 2016-12-02 23:46:15.288908073 +0100
+@@ -8,7 +8,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ sbin_PROGRAMS = logrotate
+ logrotate_SOURCES = basenames.c config.c log.c logrotate.c \
+ basenames.h config.h log.h logrotate.h queue.h
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
new file mode 100644
index 000000000000..f5aa65272b88
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.11.0-fbsd.patch
@@ -0,0 +1,57 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2016-12-02 23:33:36.768905615 +0100
++++ b/config.c 2016-12-02 23:36:15.568906130 +0100
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* Alloca is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -24,6 +24,10 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c 2016-11-30 14:07:15.000000000 +0100
++++ b/logrotate.c 2016-12-02 23:36:44.218906223 +0100
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -26,6 +26,10 @@
+ #include <limits.h>
+ #endif
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/Makefile.legacy b/Makefile.legacy
+--- a/Makefile.legacy 2016-11-30 13:05:55.000000000 +0100
++++ b/Makefile.legacy 2016-12-02 23:37:33.938906384 +0100
+@@ -22,7 +22,9 @@
+
+ ifeq ($(WITH_ACL),yes)
+ CFLAGS += -DWITH_ACL
++ifneq ($(OS_NAME),FreeBSD)
+ LOADLIBES += -lacl
++endif
+ # See pretest
+ TEST_ACL=1
+ else
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
new file mode 100644
index 000000000000..104f202efd27
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.11.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2016-11-30 13:05:55.000000000 +0100
++++ b/config.c 2016-12-02 23:33:36.768905615 +0100
+@@ -383,7 +383,9 @@
+ int i;
+
+ /* Check if fname is '.' or '..'; if so, return false */
+- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++ /* Don't include 'hidden' files either; this breaks Gentoo
++ portage config file management http://bugs.gentoo.org/87683 */
++ if (fname[0] == '.')
+ return 0;
+
+ /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch b/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
new file mode 100644
index 000000000000..9cd5745e846a
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.11.0-lfs.patch
@@ -0,0 +1,11 @@
+diff -Nuar a/configure.ac b/configure.ac
+--- a/configure.ac 2016-12-02 14:08:40.000000000 +0100
++++ b/configure.ac 2016-12-02 23:48:03.878908425 +0100
+@@ -12,6 +12,7 @@
+ AC_PROG_CC_STDC
+ AC_STRUCT_ST_BLKSIZE
+ AC_STRUCT_ST_BLOCKS
++AC_SYS_LARGEFILE
+
+ dnl Use 64-bit file offsets on 32-bit systems (defines C macros if necessary)
+ AC_SYS_LARGEFILE
diff --git a/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
new file mode 100644
index 000000000000..36733a25d03b
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.11.0-noasprintf.patch
@@ -0,0 +1,55 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2016-12-02 23:36:15.568906130 +0100
++++ b/config.c 2016-12-02 23:41:17.438907108 +0100
+@@ -49,39 +49,6 @@
+ #include "asprintf.c"
+ #endif
+
+-#if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+- va_list arg;
+- char *str;
+- int size;
+- int rv;
+-
+- va_start(arg, format);
+- size = vsnprintf(NULL, 0, format, arg);
+- size++;
+- va_start(arg, format);
+- str = malloc(size);
+- if (str == NULL) {
+- va_end(arg);
+- /*
+- * Strictly speaking, GNU asprintf doesn't do this,
+- * but the caller isn't checking the return value.
+- */
+- fprintf(stderr, "failed to allocate memory\\n");
+- exit(1);
+- }
+- rv = vsnprintf(str, size, format, arg);
+- va_end(arg);
+-
+- *string_ptr = str;
+- return (rv);
+-}
+-
+-#endif
+-
+ #if !defined(HAVE_STRNDUP)
+ char *strndup(const char *s, size_t n)
+ {
+diff -Nuar a/logrotate.h b/logrotate.h
+--- a/logrotate.h 2016-11-30 13:05:55.000000000 +0100
++++ b/logrotate.h 2016-12-02 23:40:54.518907034 +0100
+@@ -82,8 +82,5 @@
+ extern int debug;
+
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+
+ #endif
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
new file mode 100644
index 000000000000..67a60e3af177
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.12.2-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-04-22 23:46:08.201991730 +0200
++++ b/config.c 2017-04-22 23:49:43.021996055 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200
++++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+
diff --git a/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
new file mode 100644
index 000000000000..0bbb91dcb4fc
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.12.2-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-04-18 14:57:02.000000000 +0200
++++ b/config.c 2017-04-22 23:46:08.201991730 +0200
+@@ -389,7 +389,9 @@
+ int i;
+
+ /* Check if fname is '.' or '..'; if so, return false */
+- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++ /* Don't include 'hidden' files either; this breaks Gentoo
++ portage config file management http://bugs.gentoo.org/87683 */
++ if (fname[0] == '.')
+ return 0;
+
+ /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
new file mode 100644
index 000000000000..67a60e3af177
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-04-22 23:46:08.201991730 +0200
++++ b/config.c 2017-04-22 23:49:43.021996055 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200
++++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
new file mode 100644
index 000000000000..0bbb91dcb4fc
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2017-04-18 14:57:02.000000000 +0200
++++ b/config.c 2017-04-22 23:46:08.201991730 +0200
+@@ -389,7 +389,9 @@
+ int i;
+
+ /* Check if fname is '.' or '..'; if so, return false */
+- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++ /* Don't include 'hidden' files either; this breaks Gentoo
++ portage config file management http://bugs.gentoo.org/87683 */
++ if (fname[0] == '.')
+ return 0;
+
+ /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
new file mode 100644
index 000000000000..b8cecc4ebfb2
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2015-04-03 09:39:35.000000000 +0200
++++ b/Makefile.am 2015-06-28 14:03:12.429999875 +0200
+@@ -1,7 +1,7 @@
+ MAN = logrotate.8
+ MAN5 = logrotate.conf.5
+
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ sbin_PROGRAMS = logrotate
+ logrotate_SOURCES = logrotate.c log.c config.c basenames.c
+
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
new file mode 100644
index 000000000000..fdad8b6ea002
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
@@ -0,0 +1,43 @@
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c 2015-06-28 13:57:18.449999884 +0200
++++ b/logrotate.c 2015-06-28 14:02:20.799999876 +0200
+@@ -371,15 +371,18 @@
+ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
+ {
+ int fd;
+- struct stat sb_create;
+- int acl_set = 0;
+-
+- fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
+- (S_IRUSR | S_IWUSR) & sb->st_mode);
++ int acl_set = 0;
++ struct stat sb_create;
++ char template[PATH_MAX + 1];
++ mode_t umask_value;
++ snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
++ umask_value = umask(0000);
++ fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
++ umask(umask_value);
+
+ if (fd < 0) {
+- message(MESS_ERROR, "error creating output file %s: %s\n",
+- fileName, strerror(errno));
++ message(MESS_ERROR, "error creating unique temp file: %s\n",
++ strerror(errno));
+ return -1;
+ }
+ if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
+@@ -430,6 +433,13 @@
+ }
+ }
+
++ if (rename(template, fileName)) {
++ message(MESS_ERROR, "error renaming temp file to %s: %s\n",
++ fileName, strerror(errno));
++ close(fd);
++ return -1;
++ }
++
+ return fd;
+ }
+
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
new file mode 100644
index 000000000000..6e329d6149f3
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
@@ -0,0 +1,57 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2015-06-28 13:54:18.309999889 +0200
++++ b/config.c 2015-06-28 13:56:49.599999885 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* Alloca is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -24,6 +24,10 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c 2015-04-03 09:39:35.000000000 +0200
++++ b/logrotate.c 2015-06-28 13:57:18.449999884 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -26,6 +26,10 @@
+ #include <limits.h>
+ #endif
+
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile 2015-04-03 09:39:35.000000000 +0200
++++ b/Makefile 2015-06-28 13:58:05.729999883 +0200
+@@ -22,7 +22,9 @@
+
+ ifeq ($(WITH_ACL),yes)
+ CFLAGS += -DWITH_ACL
++ifneq ($(OS_NAME),FreeBSD)
+ LOADLIBES += -lacl
++endif
+ # See pretest
+ TEST_ACL=1
+ else
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
new file mode 100644
index 000000000000..31d9298779c2
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
@@ -0,0 +1,15 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2015-04-03 09:39:35.000000000 +0200
++++ b/config.c 2015-06-28 13:54:18.309999889 +0200
+@@ -359,7 +359,10 @@
+ char *pattern;
+
+ /* Check if fname is '.' or '..'; if so, return false */
+- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++ /* Don't include 'hidden' files either; this breaks Gentoo
++ portage config file management http://bugs.gentoo.org/87683 */
++ if (fname[0] == '.')
++
+ return 0;
+
+ /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
new file mode 100644
index 000000000000..7983943ca89b
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
@@ -0,0 +1,55 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c 2015-06-28 13:56:49.599999885 +0200
++++ b/config.c 2015-06-28 13:59:34.799999880 +0200
+@@ -49,39 +49,6 @@
+ #include "asprintf.c"
+ #endif
+
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+- va_list arg;
+- char *str;
+- int size;
+- int rv;
+-
+- va_start(arg, format);
+- size = vsnprintf(NULL, 0, format, arg);
+- size++;
+- va_start(arg, format);
+- str = malloc(size);
+- if (str == NULL) {
+- va_end(arg);
+- /*
+- * Strictly speaking, GNU asprintf doesn't do this,
+- * but the caller isn't checking the return value.
+- */
+- fprintf(stderr, "failed to allocate memory\\n");
+- exit(1);
+- }
+- rv = vsnprintf(str, size, format, arg);
+- va_end(arg);
+-
+- *string_ptr = str;
+- return (rv);
+-}
+-
+-#endif
+-
+ #if !defined(strndup)
+ char *strndup(const char *s, size_t n)
+ {
+diff -Nuar a/logrotate.h b/logrotate.h
+--- a/logrotate.h 2015-04-03 09:39:35.000000000 +0200
++++ b/logrotate.h 2015-06-28 13:59:47.429999880 +0200
+@@ -80,8 +80,5 @@
+ extern int debug;
+
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+
+ #endif
diff --git a/app-admin/logrotate/files/logrotate.conf b/app-admin/logrotate/files/logrotate.conf
new file mode 100644
index 000000000000..ff3319fd8351
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate.conf
@@ -0,0 +1,42 @@
+#
+# Default logrotate(8) configuration file for Gentoo Linux.
+# See "man logrotate" for details.
+
+# rotate log files weekly.
+weekly
+#daily
+
+# keep 4 weeks worth of backlogs.
+rotate 4
+
+# create new (empty) log files after rotating old ones.
+create
+
+# use date as a suffix of the rotated file.
+dateext
+
+# compress rotated log files.
+compress
+
+notifempty
+nomail
+noolddir
+
+# packages can drop log rotation information into this directory.
+include /etc/logrotate.d
+
+# no packages own wtmp and btmp -- we'll rotate them here.
+/var/log/wtmp {
+ monthly
+ create 0664 root utmp
+ minsize 1M
+ rotate 1
+}
+/var/log/btmp {
+ missingok
+ monthly
+ create 0600 root utmp
+ rotate 1
+}
+
+# system-specific logs may be also be configured here.
diff --git a/app-admin/logrotate/files/logrotate.tmpfiles b/app-admin/logrotate/files/logrotate.tmpfiles
new file mode 100644
index 000000000000..dfb4ab66c132
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/misc
diff --git a/app-admin/logrotate/logrotate-3.11.0.ebuild b/app-admin/logrotate/logrotate-3.11.0.ebuild
new file mode 100644
index 000000000000..2570ecbb1bf9
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.11.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.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"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? (
+ sys-libs/libselinux
+ )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+install_cron_file() {
+ sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+ "${FILESDIR}/${P}-noasprintf.patch"
+ "${FILESDIR}/${P}-Werror.patch"
+ "${FILESDIR}/${P}-lfs.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+ emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate*
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
new file mode 100644
index 000000000000..15b0107f6562
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.12.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.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"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+install_cron_file() {
+ sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+ emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate*
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
new file mode 100644
index 000000000000..b5f5d4e95d90
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.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"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate-default
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ move_old_state_file
+ elog
+ elog "If you are running systemd you might need to run:"
+ elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+ elog "in order to create the new location of the logrotate state file"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
new file mode 100644
index 000000000000..f0661a39594e
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.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"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate-default
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ move_old_state_file
+ elog "If you are running systemd you might need to run:"
+ elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+ elog "in order to create the new location of the logrotate state file"
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/logrotate-3.12.3.ebuild b/app-admin/logrotate/logrotate-3.12.3.ebuild
new file mode 100644
index 000000000000..34807c80e888
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.12.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.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"
+IUSE="acl +cron selinux bzip2"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? ( sys-libs/libselinux )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )
+ bzip2? ( app-arch/bzip2 )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+ elog "logrotate state file is now located at ${STATEFILE}"
+ elog "See bug #357275"
+ if [[ -e "${OLDSTATEFILE}" ]] ; then
+ elog "Moving your current state file to new location: ${STATEFILE}"
+ mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+ fi
+}
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ignore-hidden.patch"
+ "${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+ if use bzip2 ; then
+ compressconf="--with-compress-command=/bin/bzip2 --with-uncompress-command=/bin/bunzip2 --with-compress-extension=.bz2"
+ fi
+ econf $(use_with acl) $(use_with selinux) ${compressconf} --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dobin logrotate
+ doman logrotate.8
+ dodoc ChangeLog.md examples/logrotate-default
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ systemd_dounit examples/logrotate.{service,timer}
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ elog "The ${PN} binary is now installed under /usr/bin. Please"
+ elog "update your links"
+ elog
+ move_old_state_file
+ elog
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
new file mode 100644
index 000000000000..060e11be388f
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.9.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="mirror://gentoo/${P}.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"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+ >=dev-libs/popt-1.5
+ selinux? (
+ sys-libs/libselinux
+ )
+ acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+ >=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-logrotate )
+ cron? ( virtual/cron )"
+
+install_cron_file() {
+ exeinto /etc/cron.daily
+ newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-ignore-hidden.patch \
+ "${FILESDIR}"/${P}-fbsd.patch \
+ "${FILESDIR}"/${P}-noasprintf.patch \
+ "${FILESDIR}"/${P}-atomic-create.patch \
+ "${FILESDIR}"/${P}-Werror.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+ emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ insinto /usr
+ dosbin logrotate
+ doman logrotate.8
+ dodoc CHANGES examples/logrotate*
+
+ insinto /etc
+ doins "${FILESDIR}"/logrotate.conf
+
+ use cron && install_cron_file
+
+ keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you wish to have logrotate e-mail you updates, please"
+ elog "emerge virtual/mailx and configure logrotate in"
+ elog "/etc/logrotate.conf appropriately"
+ elog
+ elog "Additionally, /etc/logrotate.conf may need to be modified"
+ elog "for your particular needs. See man logrotate for details."
+ fi
+}
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
new file mode 100644
index 000000000000..e5648d41d70a
--- /dev/null
+++ b/app-admin/logrotate/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>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+ </maintainer>
+ <longdescription lang="en">
+ Logrotate allows for the automatic rotation compression, removal
+ and mailing of log files. Logrotate can be set to handle a log
+ file daily, weekly, monthly or when the log file gets to a certain
+ size.
+ </longdescription>
+ <longdescription lang="es">
+ Logrotate permite la rotación, compresión, eliminación y
+ notificación por correo electrónico de forma automática de ficheros
+ de registro (logs). Logrotate se puede configurar para gestionar
+ estos ficheros diariamente, semanalmente, mensualmente o cuando
+ su tamaño alcanza cierto valor.
+ </longdescription>
+ <use>
+ <flag name="acl">Installs acl support</flag>
+ <flag name="cron">Installs cron file</flag>
+ <flag name="selinux">Installs Security Enhanced Linux support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">logrotate/logrotate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/logsentry/Manifest b/app-admin/logsentry/Manifest
new file mode 100644
index 000000000000..c2a784199332
--- /dev/null
+++ b/app-admin/logsentry/Manifest
@@ -0,0 +1,6 @@
+DIST logsentry-1.1.1.tar.gz 30267 SHA256 dfe4cb29305c619dc0a0aca5b11b2bd397baccf3076b48f03457f66f299ab42e SHA512 4be045289259655e7b4da05dd1a07c649b2289fbc6f15dd424dc48ab980478f3ae49501f0e9e2035fddb9a40acaf2f4ab310ff8d95355196d82d41d6fc860143 WHIRLPOOL 0a0d63c135186c6035fc6e9e20dbf5a647cb90f09979ccb0e296cbc9caec18fa83d744c5015e87a79bc42e951383559078b0d893cc6e293491fd229221d70a4e
+EBUILD logsentry-1.1.1-r2.ebuild 1677 SHA256 1b4545d971b08e83b7a72d73d27b4778cd4aae9a3783ff62666636a49390cbe4 SHA512 869e1ae5feece9c7bc54378bfda40a174074bc9cf8ee18624f993a2452264962b477770295924bb5afbad7dcd7a1c52ef05e5c61f3b396d7acaa35a015fbc663 WHIRLPOOL 8db38c86da8187c222bce5d77b9e30a195786ea3cab6d364063d8355590f0c23e2a5ba5235f40b4c37fa7fe315643cd3dfe83efee47a898a3712a9b983952dfa
+EBUILD logsentry-1.1.1.ebuild 1538 SHA256 367757cb8d273763c9f2d64b78879ab91a900b8db83e4a384107255cfa81415b SHA512 69d37361a5d87fd1051a2742ffea623f49afbac03a9ee7b8e1ff256f985500cceb42072c7bd3c13f8b052d78afdd7d22d646489d4ec52681e177f476d365392e WHIRLPOOL 7928451257c266d87174bf75a8e48ff48e49b1d91eaa2aed14edafd016c7a69db46b865f12c5cfdc84241e87e6d75bfaeee6494a4b7c4401d05beae6da666082
+MISC ChangeLog 3280 SHA256 b785f2245beaf7f20f36b313ad3c1f15d66586092faefb4881bb1dd3e6035409 SHA512 31b09d0671327d6160df19fb0782a6465b77fdd407b05a25852ee6a74bc70a04d62e029ff8cd0241f093112f857ee536a48bf83397295b76d97b261f7ff5c492 WHIRLPOOL d3c11370bec1d058fe1cc7da2d12d40073c6fd6a6ac5e911283cb25b79d6c9b006433e2048b2035396232d3b4aecfd7563eeefc15c66a01ded61e530a25dc3db
+MISC ChangeLog-2015 2706 SHA256 90c3338d3abac15352c35936978a4106efbc461e7e085738da99ea88d8fee181 SHA512 edb633a818477f523f91dff486204dfa295f1d8bd031081ffe00d4667f335787ca99635c16e3f773b38119b3be13636c224a8ec2fdda8c8f059f65b141e5745e WHIRLPOOL f843fe88581eb015fc678f6779bb6404c1354a4e5c21a0f4fd205e737e7d817aa9565e1f36584ecab99bbd2a7741d7c479b0534a3f0a3a4207f31e5130056c4d
+MISC metadata.xml 248 SHA256 e36322b1de5fa4d2dd4f54a2f1b57cfa15655a7ef81cc45cb938ae1dbcfe8190 SHA512 52d286d2ecc5d8b66e2468683db28439cdcbcc96c88d8dba8a415049def3c53bc130783853aee9918c6b0dc4ae295aba44d601687d440196399903b25e92b5f9 WHIRLPOOL c88043a53a0fd171df407e36e8283c249c5623babe105a679790f52e1b5a7a6312d03d425cb006914cb5a271102b92ba15ec48fe651109ce9d1172ddee8f3516
diff --git a/app-admin/logsentry/logsentry-1.1.1-r2.ebuild b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..bc8f5c7ed176
--- /dev/null
+++ b/app-admin/logsentry/logsentry-1.1.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically monitor system logs and mail security violations"
+# Seems that the project has been discontinued by CISCO?
+HOMEPAGE="https://sourceforge.net/projects/sentrytools/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/mailx"
+
+S="${WORKDIR}"/logcheck-${PV}
+
+src_compile() {
+ einfo "compile and install mixed in the package makefile"
+}
+
+src_install() {
+ dodir /usr/bin /var/tmp/logcheck /etc/logcheck
+ cp systems/linux/logcheck.sh{,.orig} || die
+ sed -i \
+ -e 's:/usr/local/bin:/usr/bin:' \
+ -e 's:/usr/local/etc:/etc/logcheck:' \
+ -e 's:/etc/logcheck/tmp:/var/tmp/logcheck:' \
+ systems/linux/logcheck.sh || \
+ die "sed logcheck.sh failed"
+ sed -i \
+ -e "s:/usr/local/bin:${D}/usr/bin:" \
+ -e "s:/usr/local/etc:${D}/etc/logcheck:" \
+ -e "s:/etc/logcheck/tmp:/var/tmp/logcheck:" \
+ -e "s:\$(CC):& \$(LDFLAGS):" \
+ Makefile || die "sed Makefile failed"
+ make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" linux || die
+
+ dodoc README* CHANGES CREDITS
+ dodoc systems/linux/README.*
+
+ cat << EOF > "${S}"/logsentry.cron || die
+#!/bin/sh
+#
+# Uncomment the following if you want
+# logsentry (logcheck) to run hourly
+#
+# this is part of the logsentry package
+#
+#
+
+#/bin/sh /etc/logcheck/logcheck.sh
+EOF
+
+ exeinto /etc/cron.hourly
+ doexe logsentry.cron
+}
+
+pkg_postinst() {
+ elog
+ elog "Uncomment the logcheck line in /etc/cron.hourly/logsentry.cron,"
+ elog "or add directly to root's crontab"
+ elog
+}
diff --git a/app-admin/logsentry/logsentry-1.1.1.ebuild b/app-admin/logsentry/logsentry-1.1.1.ebuild
new file mode 100644
index 000000000000..06bf9e80257a
--- /dev/null
+++ b/app-admin/logsentry/logsentry-1.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically monitor system logs and mail security violations"
+# Seems that the project has been discontinued by CISCO?
+HOMEPAGE="https://sourceforge.net/projects/sentrytools/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc s390 sh sparc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/mailx"
+
+S="${WORKDIR}"/logcheck-${PV}
+
+src_compile() {
+ einfo "compile and install mixed in the package makefile"
+}
+
+src_install() {
+ dodir /usr/bin /etc/logcheck/tmp
+ cp systems/linux/logcheck.sh{,.orig}
+ sed -i \
+ -e 's:/usr/local/bin:/usr/bin:' \
+ -e 's:/usr/local/etc:/etc/logcheck:' \
+ systems/linux/logcheck.sh || \
+ die "sed logcheck.sh failed"
+ sed -i \
+ -e "s:/usr/local/bin:${D}/usr/bin:" \
+ -e "s:/usr/local/etc:${D}/etc/logcheck:" \
+ -e "s:\$(CC):& \$(LDFLAGS):" \
+ Makefile || die "sed Makefile failed"
+ make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" linux || die
+
+ dodoc README* CHANGES CREDITS
+ dodoc systems/linux/README.*
+
+ cat << EOF > "${S}"/logsentry.cron
+#!/bin/sh
+#
+# Uncomment the following if you want
+# logsentry (logcheck) to run hourly
+#
+# this is part of the logsentry package
+#
+#
+
+#/bin/sh /etc/logcheck/logcheck.sh
+EOF
+
+ exeinto /etc/cron.hourly
+ doexe logsentry.cron
+}
+
+pkg_postinst() {
+ elog
+ elog "Uncomment the logcheck line in /etc/cron.hourly/logsentry.cron,"
+ elog "or add directly to root's crontab"
+ elog
+}
diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
new file mode 100644
index 000000000000..83faec9523ff
--- /dev/null
+++ b/app-admin/logsentry/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">sentrytools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
new file mode 100644
index 000000000000..30754dea6e45
--- /dev/null
+++ b/app-admin/logstalgia/Manifest
@@ -0,0 +1,5 @@
+DIST logstalgia-1.0.7.tar.gz 902050 SHA256 5553fd03fb7be564538fe56e871eac6e3caf56f40e8abc4602d2553964f8f0e1 SHA512 862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9 WHIRLPOOL 499afaa7dc95231a619bc69be3337463ea75784d23a435d862d6a587f4fbd7fd89fd4a5d821b6a7f14636c988e33fb1feb26e689736c1b0525283106e8dd5759
+EBUILD logstalgia-1.0.7.ebuild 673 SHA256 e4bbe8adca56f38c8235b2782bb5c06b1bde093707981bcdab3bb535d2363d5b SHA512 96f12f71f73dcc569712d9a9c888078786c28c3892cef7a370c88709696bfaec69c7a7a4614e22018079f62430178c9489974b53beee609b64c8af4ff1624e59 WHIRLPOOL 0dc02fdc05c243dec21d51da13e726290e7af1865f56df1c52a56a8458e4296bd3d278dec254dfe81fc927f1f1d5b4b06f23e00946a8d34f141682a96d2920b2
+MISC ChangeLog 2809 SHA256 917fe4be923d1de46a62e5ae37b3ad9dd9171e38c98e36616dbb7387704e332c SHA512 6d6876e6e0c852f58381816222297f3f3da0bcd53fe079131d6bea0fbed036798ee5dcb5c87543ebdcb9958cd08896c35b8ba07cbd1e46d5f3cc7ce59b1e7e22 WHIRLPOOL 2e80f19c2b2d266d6d9f28edd2b92d1aa9499696b7c4cf2648d16cb744507b00cafc1ae8e86e5232e15b50d67995d3b4b2e6130b17cbb6bd2c889e3c07dfc2c8
+MISC ChangeLog-2015 988 SHA256 5ae481f6094e72ff47ed6262c11bd84d8c2cd2a737d93df261e4b00a3930acbe SHA512 d2b9aa1eabc32c26b845b542a40b83fd141bbbbbb6305366910c44944556b54bfb46591f4505d9df2a316091c86a077f2f0b40a697a5690a86ec20b83a86032d WHIRLPOOL d22eb8214021cb9ca1666113c9d42496dc16bfcd02803df3a841fc56e69d6080396796831e534eefb4e270fae63830362c578d602419a82001a6d8930f2bd35c
+MISC metadata.xml 399 SHA256 f8a8a82338b8f2952505005857d3740a047c6ac1fd00f9e83ffc65e5a9ba09ff SHA512 0af3dd67c742ed83c332389f6ca3709d3382fe4bca940b6ce05b0271a08b2a5a7ee3d49789db4b8fb66831d17cc01acdff60d5064cb9ab4540e5b2f965ff2b41 WHIRLPOOL e200502828b5f11c6b9137ddb5d1bb6b94d444a04aaadd1deb17dde713e491eeda4ffda4099d7183ae719cc78279209dc3365dbd5a8a7ca077f4ca80dc88b802
diff --git a/app-admin/logstalgia/logstalgia-1.0.7.ebuild b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
new file mode 100644
index 000000000000..91fcf17890cc
--- /dev/null
+++ b/app-admin/logstalgia/logstalgia-1.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
+HOMEPAGE="http://logstalgia.io/"
+SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libpcre
+ media-libs/freetype:2
+ media-libs/glew:0=
+ media-libs/libsdl2[opengl,threads]
+ media-libs/libpng:0=
+ media-libs/sdl2-image[jpeg,png]
+ virtual/glu
+ virtual/opengl"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ media-libs/glm
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog INSTALL README THANKS )
diff --git a/app-admin/logstalgia/metadata.xml b/app-admin/logstalgia/metadata.xml
new file mode 100644
index 000000000000..788aa1a7159b
--- /dev/null
+++ b/app-admin/logstalgia/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>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">logstalgia</remote-id>
+ <remote-id type="github">acaudwell/Logstalgia</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
new file mode 100644
index 000000000000..3a6d9b55b05d
--- /dev/null
+++ b/app-admin/logstash-bin/Manifest
@@ -0,0 +1,14 @@
+AUX agent.conf.sample 409 SHA256 d8f0ccd0e852396459bb68e46bb2c3a87ea0ed20ffbef34b26c1ec61910bb624 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0 WHIRLPOOL 9b51aa49174e5a7481e36057260dbcb3e119f34c9f7bf0f72c83dbad65c78920f3ab9d62295a0c7198ef660967fe976d67866cf393741c1d27930004d4e06144
+AUX logstash-plugin.eselect 1768 SHA256 762afe30bb09a0d0470d2f29f9371042044009df04831456e4d195b9ee08d70e SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb WHIRLPOOL 7f781cb0ff4cf32e981284fb95fb683423c0acf25c7c2e8f28f0a1d0bd84686bd7aeaacd1779af55bd4ea6ab6f8852dbc12fffd565e5a4b8fad8f8404d32ad9d
+AUX logstash.confd 775 SHA256 d3121a3b49f4e516c6a138e0a571a9b20c22e0653052998a67aa508d6e6c3fc4 SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a WHIRLPOOL 09b626a3ffa683a2392ca3a840f3a550ad0a888810a0446f9f5a34daa6050992c42c23a6b68eee999457e7074b8289e125053be2e02b6bdab8f5d5d218bb1764
+AUX logstash.confd-r1 837 SHA256 38ecbae83559e695d41e75e6bf2944c72679bd742ec808ed1e3e536bc5bf4a7c SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e WHIRLPOOL 210033420695d85e864d0bb100e100004b0de071aee8305b25b5d22c6be7c0b14a671fd034d7666cb78264adaf1978fb0a2b06dd0420b2622e01d4b8fe843b52
+AUX logstash.initd 2091 SHA256 228a8f760f9f47667fa44e4138f63fd141dfe5d5f6c4bfd6d57b037498b86e91 SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30 WHIRLPOOL 17516aeb4c5ee5b0565eb33d7f47b727dba1b745c597c3911e1ef1a8a8bd92e1cba2e4f3ea372e8772db4e2d0466c044cdd5270db3122fb8ba417941621216f6
+AUX logstash.initd-r1 2176 SHA256 516b6c3813692b069b18e485fb087c31a946d440f45b8a00b7c3f231a683c2bb SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af WHIRLPOOL 2ef498b7b095bb5753dd1afe1aa642fb2f6686b9b9b254610ea528405d00a5f0d1084a430f04ccc02f892c6842801a19b05785b30bed902989ebaefd3794afa0
+AUX logstash.logrotate 103 SHA256 404746c99df44f7dd617fc6c435251018ceffa3820995a00f1241ac4065da124 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6 WHIRLPOOL 0a6900c95dea6e52bc8370f21c4becd1b1d2d23c5ac2419fae7f182129874de6ca4f53c36cd7f1a86d117646933ddb2f2866d6d21952af46f8f0924e34875eab
+DIST logstash-5.5.3.zip 99551442 SHA256 f81ff55feb21ff4edd4283938ac8362c2906d98f9427d8660dab8465e08f0da9 SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa WHIRLPOOL d3482df4a7729f6b34973816e39315c69254a641e9811131d7d5e12ede54003a326c5773e799ee471dda01a6113762919ea81ab56ede62d29221f63ed5a7f8c7
+DIST logstash-5.6.2.zip 107836581 SHA256 ae339c18e0f68c3b98faceff6857369ef6488916e191f1598e4b01b1855b8533 SHA512 7c944c121091053be72fea4546142aa79ea2103aef0009752f9ddceaaafdad2ff91ef1d2495d1e7bccb8e3c18c70353f6359adba5bb737aff860f5d500ff198c WHIRLPOOL ff28ed652c108dac01156eed2adc693ad9c166636bf7be805584742d49da7a575562582af9c381fd73785a6ad2c53e4777d0ac1dca8a51dfc30867b569e973dd
+EBUILD logstash-bin-5.5.3.ebuild 2158 SHA256 4aa6c176f2f6b82f5661ac5cc32f784e1ef80e07ae62284bbc14a2968aabe7eb SHA512 e756ea562c886d1f4d1f1196a683eb17ef7f36de2dc04ca61d9f8f10bb458b779efe00c4a8c2d24360a99fc0691ffc3c509d8ef2da1d7a8d8d83b5aced7d8dca WHIRLPOOL 4e966f89a00e0e87100d810aeabc46314f040c23f9615c0346337b1aa0153b6e18b28cc55c2a84328988d2c16c68fe90f38c4abd921f1b0fc2272978133b30d1
+EBUILD logstash-bin-5.6.2.ebuild 2182 SHA256 ae1f0f93d448ccd80cd7e24b49fea5c731d3fd824cfe36c57a82541684d23b2f SHA512 827051b3b3d0a649e666195c5e44f9177a89cf58bd5773c03b6343138f21ef0fb5f28390a13c758a8be4c8ccf1184b57c563c47509d1013d45347b5854cbd894 WHIRLPOOL cebb2031ed9256a464e23b19453d530e7e006b69c17b8bb2c47449b2b719ca35e7ad1adc1f84fff8f0c9787177a60c1a5d144daaec6b4bf5fdcfea802449d5c3
+MISC ChangeLog 11629 SHA256 9309ec6269563641ab027dac18b6db0643e4097ca03ece455adb5f35148ca672 SHA512 d7b9200f9d2ea056eff3f564ac0bae29d018af1596e954d69d8f57f16678ba5b90fa76e1f74f8e0a830bf2ffa8255a2b9987470aa1a83bbd6135410aaf19586b WHIRLPOOL c31c703601c3b788946591ee5eeb7962c27b368fe4b95235e51947be90510917901a50b1134ffc2cdde8a3e7503c52de140f6af21bf0c4e74e8fe11dfa40daa5
+MISC ChangeLog-2015 1201 SHA256 b789b9b4f8fa642f89efadd1fc139304bea788fb2e91899556992e95811194a7 SHA512 f13b81a399382943cd6982303660b36633e108f71ecff4457ceee3ca3d8ee3ddfa75df69e3502839249eb68e2823833aaf9089c165569453e8208198b44755ee WHIRLPOOL bebb44c1c904ea0bf0c0c907c041399583479840c591946cad10523ad78e75b4739bb5f4728e1e91dbed4f42fe381a329e61103e9d8c65636547f38f3f7396d7
+MISC metadata.xml 578 SHA256 0198cb4bce189b8deb37b0b094a0a6ed934539ef39081e916efc2324a5722640 SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049 WHIRLPOOL 07fe1cbe860745fd932e66360999d0fd3baae93a0de8782f9cd8472ebbbb20f0cd08e2681e1abbd609db9862f07a3c1551d8ae50a1016a2fa53bbe9c1a29dabf
diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
new file mode 100644
index 000000000000..85c9b5c93d2a
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -0,0 +1,29 @@
+input {
+ beats {
+ port => 5044
+ }
+
+ # may need root privileges
+ file {
+ type => "syslog"
+ path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+ }
+
+ redis {
+ key => logstash
+ data_type => list
+ }
+
+ stdin {
+ type => "stdin"
+ }
+}
+
+output {
+ stdout {
+ codec => rubydebug
+ }
+
+ elasticsearch {
+ }
+}
diff --git a/app-admin/logstash-bin/files/logstash-plugin.eselect b/app-admin/logstash-bin/files/logstash-plugin.eselect
new file mode 100644
index 000000000000..29678309f411
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash-plugin.eselect
@@ -0,0 +1,85 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 2005-2017 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+
+DESCRIPTION="Manage user installed plugins of logstash"
+MAINTAINER="hydrapolic@gmail.com"
+
+PLUGINS="/var/lib/logstash/plugins-list.txt"
+LS_INSTALL_DIR="/opt/logstash"
+
+ls_plugin_wrapper() {
+ JARS_SKIP=true "${LS_INSTALL_DIR}/bin/logstash-plugin" "${1}" "${2}" || die
+}
+
+### install action
+describe_install() {
+ echo "Install plugin"
+}
+
+describe_install_parameters() {
+ echo "<plugin>"
+}
+
+do_install() {
+ [[ ${#} -lt 1 ]] && die "Please specify at least one plugin"
+
+ local plugin
+ for plugin; do
+ ls_plugin_wrapper install "${plugin}"
+ echo "${plugin}" >> "${PLUGINS}" || die
+ done
+
+ sort -u "${PLUGINS}" > "${PLUGINS}.tmp" || die
+ mv "${PLUGINS}.tmp" "${PLUGINS}" || die
+}
+
+### list action
+describe_list() {
+ echo "List user installed plugins"
+}
+
+do_list() {
+ if [[ -f "${PLUGINS}" ]]; then
+ write_list_start "Installed plugins:"
+
+ local plugin
+ while read -r plugin; do
+ write_kv_list_entry "${plugin}"
+ done < "${PLUGINS}"
+ fi
+}
+
+### reinstall action
+describe_reinstall() {
+ echo "Reinstall plugins"
+}
+
+do_reinstall() {
+ if [[ -f "${PLUGINS}" ]]; then
+ local plugin
+ while read -r plugin; do
+ ls_plugin_wrapper install "${plugin}"
+ done < "${PLUGINS}"
+ fi
+}
+
+### uninstall action
+describe_uninstall() {
+ echo "Uninstall plugin"
+}
+
+describe_uninstall_parameters() {
+ echo "<plugin>"
+}
+
+do_uninstall() {
+ if [[ -f "${PLUGINS}" ]]; then
+ local plugin
+ for plugin; do
+ grep "^${plugin}\$" "${PLUGINS}" || write_warning_msg "Plugin ${plugin} not recorded"
+ sed -i "/^${plugin}\$/d" "${PLUGINS}" || die
+ ls_plugin_wrapper remove "${plugin}"
+ done
+ fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
new file mode 100644
index 000000000000..6dbbe627a5ad
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -0,0 +1,37 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Set data directory
+#LS_DATA_DIR=${LS_HOME}/data
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
new file mode 100644
index 000000000000..5f59b606fed2
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r1
@@ -0,0 +1,40 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Set data directory
+#LS_DATA_DIR=${LS_HOME}/data
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash settings directory
+#LS_SETTINGS_DIR=/etc/logstash
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
new file mode 100644
index 000000000000..2133421377d6
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} --path.data ${LS_DATA_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+ --chdir ${LS_HOME}
+ --nicelevel ${LS_NICE}
+ --env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+ --env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+ --env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+ if [ ! -f ${LS_CONF_DIR}/* ]; then
+ eerror "Please put your configuration in ${LS_CONF_DIR}"
+ exit 1
+ fi
+
+ ebegin "Checking your configuration"
+ ${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
+ eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ rc_ulimit="-n ${LS_OPEN_FILES}"
+
+ local d
+ for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+ done
+}
+
+stop() {
+ ebegin "Stopping logstash"
+ if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
+ start-stop-daemon --stop \
+ --pidfile=${pidfile} \
+ --retry=TERM/5/KILL/5
+ else
+ start-stop-daemon --stop \
+ --pidfile=${pidfile}
+ fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
new file mode 100644
index 000000000000..2e7350d06f5a
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r1
@@ -0,0 +1,75 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_SETTINGS_DIR=${LS_SETTINGS_DIR:-/etc/logstash}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+ --chdir ${LS_HOME}
+ --nicelevel ${LS_NICE}
+ --env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+ --env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+ --env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+ if [ ! -f ${LS_CONF_DIR}/* ]; then
+ eerror "Please put your configuration in ${LS_CONF_DIR}"
+ exit 1
+ fi
+
+ ebegin "Checking your configuration"
+ ${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
+ eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ rc_ulimit="-n ${LS_OPEN_FILES}"
+
+ local d
+ for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+ done
+}
+
+stop() {
+ ebegin "Stopping logstash"
+ if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
+ start-stop-daemon --stop \
+ --pidfile=${pidfile} \
+ --retry=TERM/5/KILL/5
+ else
+ start-stop-daemon --stop \
+ --pidfile=${pidfile}
+ fi
+}
diff --git a/app-admin/logstash-bin/files/logstash.logrotate b/app-admin/logstash-bin/files/logstash.logrotate
new file mode 100644
index 000000000000..013c8ea921b9
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.logrotate
@@ -0,0 +1,6 @@
+/var/log/logstash/*.log {
+ copytruncate
+ compress
+ missingok
+ notifempty
+}
diff --git a/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild b/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild
new file mode 100644
index 000000000000..0c945e550909
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/lib/${MY_PN}"
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+ ewarn "Please ensure any running logstash processes are shut down cleanly."
+ ewarn
+ ewarn "The default data directory has been moved from /opt/logstash/data to"
+ ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+ ewarn
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ einfo
+ einfo "Installing plugins:"
+ einfo "eselect logstash-plugin install logstash-output-gelf"
+ einfo
+
+ einfo "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ einfo
+ einfo "Sample configuration:"
+ einfo "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild
new file mode 100644
index 000000000000..05628cebc543
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/lib/${MY_PN}"
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ rm -v config/startup.options
+ insinto /etc/${MY_PN}
+ doins config/*
+ rm -rv config data || die
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+ ewarn "Please ensure any running logstash processes are shut down cleanly."
+ ewarn
+ ewarn "The default data directory has been moved from /opt/logstash/data to"
+ ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+ ewarn
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ einfo
+ einfo "Installing plugins:"
+ einfo "eselect logstash-plugin install logstash-output-gelf"
+ einfo
+
+ einfo "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ einfo
+ einfo "Sample configuration:"
+ einfo "${EROOT%/}/usr/share/${MY_PN}"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
new file mode 100644
index 000000000000..d4758fc50621
--- /dev/null
+++ b/app-admin/logstash-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>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>
+ <upstream>
+ <remote-id type="github">elastic/logstash</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/logsurfer+/Manifest b/app-admin/logsurfer+/Manifest
new file mode 100644
index 000000000000..9597548bf615
--- /dev/null
+++ b/app-admin/logsurfer+/Manifest
@@ -0,0 +1,8 @@
+AUX logsurfer-1.8.initd 1049 SHA256 0f345344a564c9743990a372e14b4fb5cb99017d4d2717d8b5567224c03a5b17 SHA512 c7fa4f0bf37125562ba3bd6594a84121f4ac47b71f33a73cf1856ba6c0e728523fa9d29dc778f3f613c477b640143d0c8ee608096aabfc0d11046cc4e838fa03 WHIRLPOOL 19ac4bba0e0c58f0858ec704b4145af4e4655c9a152150c9b217e68d6e08a4c7f98e1b201c01f2b60de2c437a328c5f52e454b0e722af470dd3a1b32b0f761d1
+AUX logsurfer-1.8.initd-r1 785 SHA256 c2063de54478ff58dd6f5b741722761db4938039de40643b508bdc1c6cb83494 SHA512 dc02f6f317437adfe216992a0095912e73f9ad5abcbd2912bb4cdf0d71c4e0653eaeb14f3ff7164d20f1dee168c7b5352a3db96b9520a711e5f7ef04eca9e800 WHIRLPOOL a00a6b7a0c8ea5ed257a880151d31899fda265d0e77870d9ee8d2a7c1273f71ae6c9e4c6aa33fdd011a78ca185f97cf067d645ec4620d5c4f9494eadf983fb71
+AUX logsurfer.confd 106 SHA256 28dca27c656d36f0f007c1acf08b822d0ff8584ea5aad8e158bc6c63c162b321 SHA512 872004ae1aedc3adb550da30ebc544ccbf11af5ad399bb9788a4db336138c3f5ec03c3704eaaa2cecb0559de6a2bcab9e96da062e6af9a6daa22afdec709a43a WHIRLPOOL 0865d832b85e6c9ed0a432d4bc62306775023ca38a3f80b1cb82687433d6dccdec661b50e2765c1e93d442711bed5eda5f01593ded8e09bf81bf03f7b4abe2a9
+DIST logsurfer-1.8.tar.gz 197433 SHA256 e0a6becc1d105acff35baa4b1dd51db3f6664156000ad23bf803193a8361ce50 SHA512 470276cb70489528a0a14dfc8c85a41d2b5ce0768ca373ec6367b137e614fef2e1174363a9987724da8682d7dc20570ba360203feda431daf21026eb28bec9f6 WHIRLPOOL c2a64f7d9ce3ef9a058b1ee60f0c1d92372b1ceb634822443ebeb90e3e9d138d47d06bc8104cae76f8686ad7b9797862842dbcda3fd588e8cacf5bcaf9c60ab4
+EBUILD logsurfer+-1.8-r3.ebuild 851 SHA256 6f297062e79cbac0755625d70ee4b5b193cff1aa01fe2651bf698de7fded4107 SHA512 78332731c6293b5290258f35602c114e232e39cc1ff4db84c325e1b1fe3ad10aecb3bc23282fa91f78f77344728319b2acc9a25d74d4962710f00afead6f7797 WHIRLPOOL cdc684ac78e8018c18b28b4a97ec2b97c0ae13d247b83d2fc4edb9a0ab752c3bd99c3e0b70318493ae61153085016f2663f91809277009bcf67a0b12332bc23a
+MISC ChangeLog 3388 SHA256 c1d3e4a8a2995c16457f342c8f5bd36e09d73829061010599ddf47353b9e59e4 SHA512 f313ba0669b8bf2d90ad87244e570b86637f6226a85bb1a0d1e726160959e008491af2b221866735d5e09abcb5032c77242e9109a5738f521b025d70d6f3d231 WHIRLPOOL a1bc5960823281f9c895ec01f453944e1cc653ae8890b8c4b9b15909628664536a58d602d84b998cffe7ca19dc6aeedd9aff6d26e5d4d96346723c18c53315ee
+MISC ChangeLog-2015 1711 SHA256 8e78017d4b07686e05550fd23016412d56146e65decb3c4ab91b54061fc43f42 SHA512 960302ba6dfb7d6b9ae8f5ea85360f015170aef7967e72d269874c8afdb334e5602dd3be36abefc480519842794f943a9f85157e4061477f8b71a430ec1a929a WHIRLPOOL 040f9d793f86432fc299d788418e45b113e63a633c923b28ae737e38d7dfd4fb79f7fff037ff9beccce29a9b29d6b54874d56f656d18f43047b48ce113a1e78e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/logsurfer+/files/logsurfer-1.8.initd b/app-admin/logsurfer+/files/logsurfer-1.8.initd
new file mode 100644
index 000000000000..9ef420cfad30
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer-1.8.initd
@@ -0,0 +1,50 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/logsurfer.pid"
+command="/usr/bin/logsurfer"
+command_args="-D -p ${pidfile} ${LOGSURFER_OPTS}"
+extra_started_commands="reload dump"
+
+conffile="/etc/logsurfer.conf"
+
+depend() {
+ use logger
+}
+
+checkconfig() {
+ if [ ! -f /etc/logsurfer.conf ] ; then
+ eerror "Please create /etc/logsurfer.conf"
+ return 1
+ fi
+ return 0
+}
+
+start_pre() {
+ checkconfig || return $?
+
+ checkpath --file --owner logsurfer --mode 0644 "${pidfile}"
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon \
+ --start \
+ --user logsurfer \
+ --exec ${command} \
+ -- ${command_args}
+ eend $? "Failed to start ${SVCNAME}"
+}
+
+reload() {
+ ebegin "Reloading ${SVCNAME}"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $? "Failed to reload ${SVCNAME}"
+}
+
+dump() {
+ ebegin "Dumping ${SVCNAME} internal state"
+ start-stop-daemon --signal USR1 --pidfile "${pidfile}"
+ eend $? "Failed to dump ${SVCNAME} internal state"
+}
diff --git a/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1 b/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1
new file mode 100644
index 000000000000..03b87a4868fa
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer-1.8.initd-r1
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/logsurfer.pid"
+command="/usr/bin/logsurfer"
+command_args="${LOGSURFER_OPTS}"
+command_user="logsurfer"
+command_background=true
+extra_started_commands="reload dump"
+
+depend() {
+ use logger
+}
+
+start_pre() {
+ # logsurfer won't start without a config file, but
+ # it doesn't mind an empty one.
+ checkpath --file /etc/logsurfer.conf
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $? "Failed to reload ${RC_SVCNAME}"
+}
+
+dump() {
+ ebegin "Dumping ${RC_SVCNAME} internal state"
+ start-stop-daemon --signal USR1 --pidfile "${pidfile}"
+ eend $? "Failed to dump ${RC_SVCNAME} internal state"
+}
diff --git a/app-admin/logsurfer+/files/logsurfer.confd b/app-admin/logsurfer+/files/logsurfer.confd
new file mode 100644
index 000000000000..cb4e596bf543
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/logsurfer
+
+# Options to pass to the logsurfer process
+LOGSURFER_OPTS="-f /var/log/messages"
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
new file mode 100644
index 000000000000..10d757186505
--- /dev/null
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs user
+
+MY_P="logsurfer-${PV}"
+DESCRIPTION="Real Time Log Monitoring and Alerting"
+HOMEPAGE="http://www.crypt.gen.nz/logsurfer/"
+SRC_URI="http://kerryt.orcon.net.nz/${MY_P}.tar.gz
+ http://www.crypt.gen.nz/logsurfer/${MY_P}.tar.gz"
+
+LICENSE="freedist GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="bindist" #444330
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf --with-etcdir=/etc
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/logsurfer
+ doman man/logsurfer.1 man/logsurfer.conf.4
+
+ newinitd "${FILESDIR}"/logsurfer-1.8.initd-r1 logsurfer
+ newconfd "${FILESDIR}"/logsurfer.confd logsurfer
+ dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+ enewuser logsurfer -1 -1 -1 daemon
+}
diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/logsurfer+/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-admin/longrun/Manifest b/app-admin/longrun/Manifest
new file mode 100644
index 000000000000..c55357df4d40
--- /dev/null
+++ b/app-admin/longrun/Manifest
@@ -0,0 +1,8 @@
+AUX 0.9-makefile_cflags.patch 577 SHA256 b6a6a4aa96047c8f4fd398270784e1ea881f5e2a56f212af79b0008d4cd3f823 SHA512 a461d9fc0b1a0d7aa2f36c02d5121b2a8e433b7254f08e53a6a8b8a7cc0ad25bb707a80b6d07148543b74aa78696868583e1004a64c631694eef85c787cdd051 WHIRLPOOL 17f287a497175eee8f9fd6f83c0cede36c88431b4c4efbeff6da00c6d6c931afceb31c35ab2b16def00c446c212e8df6814132fcc07abb669b66930050c6e3cb
+AUX 0.9-replace-loff_t.patch 992 SHA256 96da9a90490f0140047f522020d86f26d1d64f9ee18890cc86c84cb58731fe56 SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b WHIRLPOOL 56f8c977c57d372010037006ce8c865941446f0c3842b7555d7e7b4f618135b8aff79c85e1b6341e53ab1e2d1661f91e47954e145d708057169cabaf170cf09b
+DIST longrun-0.9.tar.bz2 11539 SHA256 85d2bb0694ded7d727c3f819b12432a78b7c3d9723580d17d7a9e3a21d969f7b SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055 WHIRLPOOL 96654665434f789c8fe84d394161b5b3fb2a4d3ceb8e2decf67ac52ffc5ff2f2b51ea885aae8a1a428fc0d1a4c00848deaa1ecd28f48ac1abd40291c2feb06e7
+DIST longrun_0.9-19.diff.gz 14697 SHA256 4f9d133c8739ac2bbf0ec53d1356a42064b9b06b3559a93af538c809f851fc14 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35 WHIRLPOOL efd02ab3b3a949b77edf1b04313fca51482b50fcd5d2b73dd66a225218e04cb67eb830aca1b15b63582dcbcad1367acad88532c8495b074e6d23f3c4e8f071c4
+EBUILD longrun-0.9-r4.ebuild 1892 SHA256 54073779aab65d049933df3f46ecf5d07e59cc921c6ce660a74b814c7049756b SHA512 31eb732fc24e9753b50bee89048126ca6b644889ad875fc72e87d91be8897ce6385bea2836f353902656f2430c71ece3e909a15031279bb06949e72efca69275 WHIRLPOOL 8c08bee2dc8e1606ff485d7dcadb71789bdda498489dafe58a2605b8befcce4fdb58fa8d8ac8ff819861091949325104ab42efebadb23560e0ddd66054b45f85
+MISC ChangeLog 2594 SHA256 051249a1a1b1a0294371344a4ad63b9aea1f625d4cf6063fa89f9f551c881565 SHA512 2c900e56bc6ea39ffef095c505b91a0f68c7fd6b1dda439c731994c080fcb97961b4709ad33b73ef6e99812bb3d1ddeaedf86ab335ec2729b530ae9329673951 WHIRLPOOL 042a2b8ed5c89fc5d47ea2f4abc2665ba752c537c594e11cdaf4024351bb6ea7e7f55dca32fc30886ee5ec7646b1c3806a43896ef00d0bc0dfe8b8c039c6665b
+MISC ChangeLog-2015 3767 SHA256 7d167489e2439db581d0de27519b19dea2aa2cafeba6bd63ff3acf9b89784f42 SHA512 ad33e345ecdb76cdbaec9790de281cd8cd4f4477d890686725fb83ece4962d5a81f2f090832842dc76cfc8086c05cb374e6f40f403b33948db15ed501b96ac72 WHIRLPOOL cf105073951b20dc01235c3c004c6a9c81bcd032bd5804af8f7070c1c155e1243c06f05e2bc60f791fba1009bbec5d8f8e98a4a215f529de860dcf3d07e4ac83
+MISC metadata.xml 430 SHA256 e132440d8e511b56a58bdcffc2656eaf56c96725d522200a21bda532ba6770c6 SHA512 5cdee63c75352e195e930b08f01a3829529ab59267e3e3df63ed48aae7d2b8097279df91c07ff871d5c6934afc182626df2c994366a9fa88cd72b9309426b677 WHIRLPOOL ee48ecace82cfa532c4d13bd80cc8ba7d9a36dc7464ebca4699880fd841b5ba41ccec82cbfe4fd16af71a5bf98ffa26e6911c328043950b4dce62f8fd680ab12
diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch
new file mode 100644
index 000000000000..a15229177881
--- /dev/null
+++ b/app-admin/longrun/files/0.9-makefile_cflags.patch
@@ -0,0 +1,14 @@
+Common subdirectories: longrun.old/debian and longrun/debian
+diff -u longrun.old/Makefile longrun/Makefile
+--- longrun.old/Makefile 2005-08-12 22:36:14.186390784 +0300
++++ longrun/Makefile 2005-08-12 22:37:36.157929216 +0300
+@@ -3,7 +3,7 @@
+ all: longrun README stamp-po
+
+ longrun: longrun.c
+- gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -W -Wall -o longrun longrun.c
+
+ README: longrun.1
+ groff -Tascii -man longrun.1 | col -bx > README
+Common subdirectories: longrun.old/po and longrun/po
diff --git a/app-admin/longrun/files/0.9-replace-loff_t.patch b/app-admin/longrun/files/0.9-replace-loff_t.patch
new file mode 100644
index 000000000000..589c0947b155
--- /dev/null
+++ b/app-admin/longrun/files/0.9-replace-loff_t.patch
@@ -0,0 +1,35 @@
+Use off_t instead of loff_t. Both pread() and pwrite() take
+off_t not loff_t types. This breaks the build on musl. See
+
+https://bugs.gentoo.org/show_bug.cgi?id=541694
+
+diff -Naur longrun.orig/longrun.c longrun/longrun.c
+--- longrun.orig/longrun.c 2015-03-07 19:05:19.166652462 +0000
++++ longrun/longrun.c 2015-03-07 19:06:05.419651899 +0000
+@@ -181,7 +181,7 @@
+ }
+
+ /* note: if an output is NULL, then don't set it */
+-void read_msr(loff_t address, int *lower, int *upper)
++void read_msr(off_t address, int *lower, int *upper)
+ {
+ uint32_t data[2];
+
+@@ -193,7 +193,7 @@
+ if (upper) *upper = data[1];
+ }
+
+-void write_msr(loff_t address, int lower, int upper)
++void write_msr(off_t address, int lower, int upper)
+ {
+ uint32_t data[2];
+
+@@ -206,7 +206,7 @@
+ }
+
+ /* note: if an output is NULL, then don't set it */
+-void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
++void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx)
+ {
+ uint32_t data[4];
+
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
new file mode 100644
index 000000000000..afe681e3a693
--- /dev/null
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
+HOMEPAGE="http://freshmeat.net/projects/longrun/"
+
+DEBIAN_PATCH_VERSION="19"
+DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff.gz"
+SRC_URI="
+ mirror://kernel/linux/utils/cpu/crusoe/${P}.tar.bz2
+ mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-ppc x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+CONFIG_CHECK="~X86_MSR ~X86_CPUID"
+
+ERROR_X86_MSR="
+Longrun needs a MSR device to function. Please select
+MSR under Processor type and features. It can be build
+directly into the kernel or as a module.
+"
+
+ERROR_X86_CPUID="
+Longrun needs a CPUID device to function. Please select
+CPUID under Processor type and features. It can be
+build directly into the kernel or as a module.
+"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+ cd "${S}"
+ epatch "${DISTDIR}/${DEBIAN_PATCH}"
+ epatch "${FILESDIR}/${PV}-makefile_cflags.patch"
+ epatch "${FILESDIR}/${PV}-replace-loff_t.patch"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc MAKEDEV-cpuid-msr
+}
+
+pkg_postinst() {
+ if linux_config_exists; then
+ if linux_chkconfig_module X86_MSR; then
+ elog "You have compiled MSR as a module."
+ elog "You need to load it before using Longrun."
+ elog "The module is called msr."
+ elog
+ fi
+
+ if linux_chkconfig_module X86_CPUID; then
+ elog "You have compiled CPUID as a module."
+ elog "You need to load it before using Longrun."
+ elog "The module is called cpuid."
+ fi
+ else
+ elog "You have no kernel configuration available."
+ elog "Longrun needs both CPUID and MSR capabilites,"
+ elog "in the kernel you intend to run it under."
+ fi
+}
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
new file mode 100644
index 000000000000..36cfa75cbc14
--- /dev/null
+++ b/app-admin/longrun/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>
+Longrun is a user space utility program for controlling the Longrun
+thermal and power save functionalities found in the processors made
+by Transmeta.
+</longdescription>
+ <upstream>
+ <remote-id type="freshmeat">longrun</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
new file mode 100644
index 000000000000..3e8e96dfa03e
--- /dev/null
+++ b/app-admin/lsat/Manifest
@@ -0,0 +1,8 @@
+AUX lsat-0.9.7.1-gentoo.patch 1484 SHA256 f76f127f56139d8d8cf20ead7dd3e72b0a91b90dc85c4f5730bbb5388b35dcca SHA512 55d0806addabf5b431ac18016f1f1737a30994b3558dc511a850d747f7b11f344c2070c0ea239c24a11511bccdb0693f54701586561d4b018934fa7ffd63ef69 WHIRLPOOL 6081f011f9a9cc93a12a5cc43a888d5a2d7983a0534ff85700c1bcc8b7b6118612f2000a5e1e2c39ca0cec0c59e5923a346b0a9e2364535d2bbc9ba60fa6c07b
+AUX lsat-0.9.7.1-segfault-fix.patch 1695 SHA256 ffdd87e42c0e7cb83f38e5c2876fe539b3af303bf7df041a7d86e49cecd0cac9 SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2 WHIRLPOOL 28db1025c2db54cbe34e6bab69e40f14d57f14dcd03e1765d41da6c5b27a1c31aa57cf839bf4fa82b02cefc1a8e161d8b800df3a28ed310c2b705ee1f5ea7a20
+DIST lsat-0.9.7.1.tgz 86077 SHA256 825b4578e7e90f937c492722801fd6b35785264747cd6e7e45bded2545d2d956 SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb WHIRLPOOL 81db8c06bf9bd8ae82a29ca751e378ffbc051e8184e7dac208e43064960949fe9483522600f023d064411338ea76d83e0cbc8b5d1f7f8d7861a2d73581fbc71b
+EBUILD lsat-0.9.7.1-r1.ebuild 1034 SHA256 b460bddd630e07af65daf7b4ac904c580fd00f6ac3c82b52f079738f61a3c3d8 SHA512 4912b221df15b5bda32fbf5269bdea29259b25785e07b3c30dc1043934d9441e6c81edfcea4d0cb5f0191f22976a1335e167de6c5ae87cf805089094f17b292c WHIRLPOOL febf456566200f07fa308c298db03eed9f87cab06bc8967f8faee7d8bf997b1f7687064c365c7495f10bf11d1829a80c7a505e9d4f080695ee96a94fa5f419f4
+EBUILD lsat-0.9.7.1-r2.ebuild 1005 SHA256 964647ca94f428e7ffdbdc6d5d69f14a0f9289ae99415a775c913243840c07cb SHA512 5b912cca76ecd34375b71c7dffd1341be6936e5998d1f5cc3a3933889308c1982e5e6044edf1a769835a102e88c11e39e6904d744c9fda1bfb39a48a103f450c WHIRLPOOL dee88e861267deadab348a8d2cfd01ac0ae91e7808a4f60e9c13dd83fbf901dce4aa09ac00b8dfa6bc0cc7d628a3417543285b9b286e36d21ca1f6b82023579e
+MISC ChangeLog 3146 SHA256 010b9fb14d1940293eb57e49873b4935a9e4849b36196837bbc9980cacd98acc SHA512 bd6ffe74138743c0214b25bfe30677656ec77063fcbec94ecf8067920be2d210e6a1855ec1edb9f4c1880280f9a1ae2f13537b8b1749c1ea26d2ce578d66f266 WHIRLPOOL 32726ba6d2f1390ea964d0ccc08df181b757560b9fae1fcb49e42920ba6ad9bf1f959368f67782820d5e29cfe22a390bff5ba6a3215742fc64dc4d1bf4143b79
+MISC ChangeLog-2015 3982 SHA256 25b25af260af6e45ba1fb74dd1587cfda19e1fee97d551cf4bf23189d21d3b8a SHA512 259aa7f99549c2f2c272c355f323790362c1dc2e249319a3f6d7b54e23ef1e8efcd07bb6f122e1463ed9ee7bf2b9479d3a659b7eedb73ff853fe5ec4185ad6dc WHIRLPOOL f6ce1cc2c0afb7a4448a9b1972b3406a262a7edaccb7392b654dcf3d9685fb7e3575e1cc9df0230bb5249ab43ce357e5e7cd67eb773d4b522d929a6fef914b40
+MISC metadata.xml 608 SHA256 d2f0c6de69d5254deb78229fcbf6f865e5f135be3b8945948a580b32f3a57d39 SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a WHIRLPOOL 2845a1c38f3b52a0f1201001b4ef6319dd93913379e1cbfb720cbf8a1b012f9273da065416c7f4ddff7d62dd67fd157a3b0ad612d9b27c90e1cb7c5aabe67325
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
new file mode 100644
index 000000000000..631dcd7322f7
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in
+--- lsat-0.9.6.orig/Makefile.in 2007-05-22 11:38:28.000000000 +0900
++++ lsat-0.9.6/Makefile.in 2007-05-25 18:55:25.000000000 +0900
+@@ -12,6 +12,7 @@
+ PROGRAM= lsat
+ INSTALL = /usr/bin/install -c
+ prefix = @prefix@
++exec_prefix = @exec_prefix@
+ BINDIR = @bindir@
+ DATADIR = @datadir@
+ MANDIR = @mandir@
+@@ -38,9 +39,7 @@
+ rm -f $(PROGRAM) $(OBJECTS) Makefile config.* lsat.old lsatmd5.out lsatmd5.old
+
+ manpage:
+- pod2man $(PROGRAM).pod > $(PROGRAM).tmp
+- sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \
+-sed 's/Perl/LSAT/g'\
++ pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \
+ > $(PROGRAM).1
+ rm -f $(PROGRAM).tmp
+ # cp -vf $(PROGRAM).1 debian/manpage.1.ex
+diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c
+--- lsat-0.9.6.orig/checkpkgs.c 2007-04-27 00:48:31.000000000 +0900
++++ lsat-0.9.6/checkpkgs.c 2007-05-25 18:46:00.000000000 +0900
+@@ -113,14 +113,14 @@
+ }
+
+
+- /* if distro = gentoo, use pkglist */
++ /* if distro = gentoo, use qpkg */
+ if (distribution == 4)
+ {
+ if (verbose > 0)
+ {
+ printf(" Generating list of pkgs on system.\n");
+ }
+- shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat";
++ shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat";
+ if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0)
+ {
+ /* rhut-rho...something bad happened */
diff --git a/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
new file mode 100644
index 000000000000..558c8de60321
--- /dev/null
+++ b/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch
@@ -0,0 +1,45 @@
+--- lsat-0.9.7.1/lsatmain.c.orig 2008-12-29 11:09:04.000000000 -0500
++++ lsat-0.9.7.1/lsatmain.c 2008-12-29 13:31:00.000000000 -0500
+@@ -232,7 +232,7 @@ int versions(char release[], char kernel
+ } /* end while (fgets...) */
+ close(fileval);
+ /* clean up even though we will rm it */
+- close(infile);
++ close((int)infile);
+
+ if ( (system("rm -f /tmp/lsat1.lsat")) < 0)
+ {
+@@ -308,9 +308,9 @@ int main(int argc, char *argv[])
+ */
+ char release[50]; /* array for release level */
+ char kernel[50]; /* what kernel user is running */
+- static char *man_distro; /* if the user specifies a distribution */
++ static char man_distro[10]; /* if the user specifies a distribution */
+ const char * header =NULL; /* to print out the header */
+- static char *out_file = "lsat.out"; /* output filename var */
++ static char out_file[255] = "lsat.out"; /* output filename var */
+ char xlist[100]; /* modules to exclude */
+ int xarray[33] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ int somethinginxlist = 0;
+@@ -350,10 +350,10 @@ int main(int argc, char *argv[])
+ diff = 1;
+ break;
+ case 'm':
+- strcpy(man_distro, argv[i]+3);
++ strncpy(man_distro, argv[i]+3,sizeof(man_distro));
+ break;
+ case 'o':
+- strcpy(out_file, argv[i]+3);
++ strncpy(out_file, argv[i]+3,sizeof(out_file));
+ break;
+ case 'r':
+ rpmmodule = 1;
+@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
+ break;
+ case 'w':
+ html = 1;
+- out_file="lsat.html";
++ strcpy(out_file,"lsat.html");
+ break;
+ case 'x': strcpy(xlist,argv[i]+3);
+ somethinginxlist = 1;
diff --git a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
new file mode 100644
index 000000000000..2df288ba1a6e
--- /dev/null
+++ b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Linux Security Auditing Tool"
+HOMEPAGE="http://usat.sourceforge.net/"
+SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="minimal"
+
+DEPEND="dev-lang/perl" # pod2man
+RDEPEND="!minimal? (
+ app-portage/portage-utils
+ net-analyzer/nmap
+ sys-apps/iproute2
+ sys-apps/which
+ sys-process/lsof
+ )"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+
+ # patch for segmentation fault see bug #184488
+ epatch "${FILESDIR}"/${P}-segfault-fix.patch
+ sed -i Makefile.in \
+ -e '/^LDFLAGS=/d' \
+ -e '/^CFLAGS=/d' \
+ || die "sed Makefile.in"
+}
+
+src_compile() {
+ tc-export CC
+ econf
+ emake CFLAGS="${CFLAGS}" all manpage || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install installman || die "emake install failed"
+ dodoc README* *.txt
+ dohtml modules.html changelog/changelog.html
+}
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
new file mode 100644
index 000000000000..ca91252d82d5
--- /dev/null
+++ b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Linux Security Auditing Tool"
+HOMEPAGE="http://usat.sourceforge.net/"
+SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND="dev-lang/perl" # pod2man
+RDEPEND="
+ ${DEPEND}
+ !minimal? (
+ app-portage/portage-utils
+ net-analyzer/nmap
+ sys-apps/iproute2
+ sys-apps/which
+ sys-process/lsof
+ )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gentoo.patch"
+ "${FILESDIR}/${P}-segfault-fix.patch"
+)
+
+HTML_DOCS=( modules.html changelog/changelog.html )
+
+src_prepare() {
+ default
+
+ # patch for segmentation fault see bug #184488
+ sed -i Makefile.in \
+ -e '/^LDFLAGS=/d' \
+ -e '/^CFLAGS=/d' \
+ || die "sed Makefile.in"
+}
+
+src_compile() {
+ tc-export CC
+ emake CFLAGS="${CFLAGS}" all manpage
+}
+
+src_install() {
+ emake DESTDIR="${D}" install installman
+ dodoc README* *.txt
+ einstalldocs
+}
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
new file mode 100644
index 000000000000..301bfd358039
--- /dev/null
+++ b/app-admin/lsat/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 lang="en">
+ Linux Security Auditing Tool (LSAT) is a post install security auditing
+ tool. It is modular in design, so new features can be added quickly. It
+ checks inetd entries and scans for unneeded RPM packages. It is being
+ expanded to work with Linux distributions other than Red Hat, and checks
+ for kernel versions.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">usat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
new file mode 100644
index 000000000000..6a62b630ee0f
--- /dev/null
+++ b/app-admin/lsyncd/Manifest
@@ -0,0 +1,10 @@
+AUX lsyncd-2.2.0-mandir.patch 284 SHA256 c71c833501b95819d251be946688c0efc5e91f8dcf9a417b09743d630b8cc0de SHA512 c46043b4938b42bc4bd8d0f9387dff4561ee103e9a7847825a57415aa2c91b7902059f3f103834958bcf1c0132785c44e729cfb0af82d63cf94d3782f1b6f501 WHIRLPOOL a025a78122a54efc1208e20535ab0e5c283b9e78711bba88102fb6cb3f73272c4150b3182766b8a13478a39caf00e639cfc565aab5b9f87f4d894d155477e66a
+DIST lsyncd-2.2.0.tar.gz 81034 SHA256 fb4b49c314846c251b624f9ee3129483c4b3d4d53c5263bb36086feb17f2e800 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81 WHIRLPOOL 9560a44f77aede8159871d3f3a857aa1c82b1db8832a72ba8a048e324836e1da6ca3ea376bc4c1c5312d0b19ed1a07105a5060adeae64f45db6965cefd729e57
+DIST lsyncd-2.2.1.tar.gz 81005 SHA256 f41969454a17f9441a9b1809bb251235631768393bf5d29ad8e8142670ae4735 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5 WHIRLPOOL 2aeb6e7f968deab8b9eeec455efab3d80e601da60720a4b4b6699ef88589ccb5e552d118cf68aed4dec6ad35a6c79f49a3c6bffec1d979a3fda4101ac180e7c3
+DIST lsyncd-2.2.2.tar.gz 82231 SHA256 0bdb12f40f1a52ed2d8e6cb47242d296663a42b30f38d2b8efcb66b43129e009 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0 WHIRLPOOL f95422345802bf99a2fdc9c0c63b167b1928138f99b0114688d1bf8e4271078ab03fe51b1d182af3ae3f87154736deae8684bb7aae259e68cfa8d68860418a08
+EBUILD lsyncd-2.2.0.ebuild 649 SHA256 030a6aab749e4efc53c23dd7925bfe050d6248d6288fc1eb3e4ed253b00e20e0 SHA512 c892f63e274ef4ace17fbfa5b45692013c3b0e4058ccb70a040d49db024308c31338b9c7658294d2068729dd8f0729116baf082fbb4007826b1437e63740c410 WHIRLPOOL c07fca8c435384ec224ad2eaa7a50a85092ed6747de5569ad427b72a419cb41306fbe1f1f78d4d34593cb08886e2f240d8cdab9a6a12c9f3bacf77be66f0a8eb
+EBUILD lsyncd-2.2.1.ebuild 658 SHA256 0f3fffe49e7e845de62c55589065397829fa0ef1dfadb8bc4ea12d85d2977e5b SHA512 11317953b16f5b0f59e7d8f27a2c35d8523bfa078bc50cbb2ad51f901a738c730d1b00eb0b23de6562d15125a776bd6c903029b19f3a4deb68b6d43c8e02fac5 WHIRLPOOL 752f114af72d7034358210818eab0457102cf2d6a8bc2f09052e4558dcbf1f3f18f7408593cc101bc01592fee0a2f567e6ffb08b85d7a8f44fe83882fdeb99a0
+EBUILD lsyncd-2.2.2.ebuild 658 SHA256 0f3fffe49e7e845de62c55589065397829fa0ef1dfadb8bc4ea12d85d2977e5b SHA512 11317953b16f5b0f59e7d8f27a2c35d8523bfa078bc50cbb2ad51f901a738c730d1b00eb0b23de6562d15125a776bd6c903029b19f3a4deb68b6d43c8e02fac5 WHIRLPOOL 752f114af72d7034358210818eab0457102cf2d6a8bc2f09052e4558dcbf1f3f18f7408593cc101bc01592fee0a2f567e6ffb08b85d7a8f44fe83882fdeb99a0
+MISC ChangeLog 3537 SHA256 8c472dc0d97a9fff2f3a756344d306facabf88329ce4bed0106ec28a51fbd877 SHA512 748e9b7cd8ba1e1f813039347cbe793591049a67293c87411d46a823227d03e48027d3cb499c3b4545173968ac9219e51a5936b15482f1c4642e9cc89510c155 WHIRLPOOL 330507766e4bcb7099383988fd6946d20b86a719ad6cb2facbc63c9ad71c1e73662ecbe056634315847a0f7e8550191157e31c986df814bfae3a4b55e188904a
+MISC ChangeLog-2015 5087 SHA256 c3d9115010f2877f6ec939991cbdacc92312cb22d80df0ab0b1af384d8f2616a SHA512 09296be000376e0003a624d59db61f41a1d29198984454591fc79b6ea039388e586deaa04fc2e71de6e460b5bfdd49ef7bed887d82a0a91584385a822bd9a246 WHIRLPOOL 4436e15a4c3379181149d2954e817bdf7bd28a770a97805297d3fcd8823c3d14f171694c6fcd4741e1d1f3de4595b0db9ddad9c8e8e2156277c5e17a2993ff87
+MISC metadata.xml 382 SHA256 e71161576a8fb1ee654fc770afddd9c29d20a28ce91256d4c14b9b46202c09fe SHA512 e3ca2e232c642a516f74db6c66b6900645e3e44352f95992ff06c95652c06d0ca1186cf05f50126408a575411a30a13c909f1401bea75766933188b9d76d09c0 WHIRLPOOL 4b7a4db69241968b230589202ad7c31e8f7c87596f698f812ea5ce2a6ed917944dc15c011f0c09ff8aa41ba2b8851f82fad6159f6d6b8b29b77ee05f7822148c
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
new file mode 100644
index 000000000000..76e01d5bcacb
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.0-mandir.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,4 +92,4 @@
+ target_link_libraries( lsyncd ${LUA_LIBRARIES} )
+
+ install( TARGETS lsyncd RUNTIME DESTINATION bin )
+-install( FILES doc/manpage/lsyncd.1 DESTINATION man )
++install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
new file mode 100644
index 000000000000..7f8661b1a697
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ net-misc/rsync"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
new file mode 100644
index 000000000000..4e14745a58b4
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ net-misc/rsync"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/lsyncd-2.2.2.ebuild b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
new file mode 100644
index 000000000000..4e14745a58b4
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.1[deprecated]"
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ net-misc/rsync"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
new file mode 100644
index 000000000000..3aa5c24c6858
--- /dev/null
+++ b/app-admin/lsyncd/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>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">lsyncd</remote-id>
+ <remote-id type="github">axkibe/lsyncd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
new file mode 100644
index 000000000000..c916ebdf9c63
--- /dev/null
+++ b/app-admin/makepasswd/Manifest
@@ -0,0 +1,5 @@
+DIST makepasswd_1.10.orig.tar.gz 12382 SHA256 41491f361d810f9bb3e08b40df3c3034faec306d434dab15534e19023f91a75c SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac WHIRLPOOL 60f2ce490828c8d947a48197f68b557c59473a8da74e82d734c99997a245733be64013868d1b6e9bd6bf623db02726f0abaa3038f5e2940d462200ddf2cb097d
+EBUILD makepasswd-1.10.ebuild 559 SHA256 97307650e238a886ebb4a9929536954325a3844d3be24ae653b2fca07f107df5 SHA512 c03e089c4c6840f86d20ad625eb965f429c08050805691c9ad73b93cc774150f568a9aedc312c63e0ffb9b6f434ade35c7090845cc3f00df056d8833e828213c WHIRLPOOL 0c63bf96ac07d64ed94cdef169f7e74f575cf7aff10e87e2f680c06144210d9da8bc2d14d53f250c5c37e15d2f44fae4d3216f6832c21c5182cc014e02435f3a
+MISC ChangeLog 2184 SHA256 f8567b86be96396b2b3367dfa7ce2d99ca3e1621571a29c095d76bd14f456a04 SHA512 7730aa4224394e5f730af27342fdba41bcb9ca8a5e7638c19b05cb960b06a78a98adf8c4df25c992c325570403c163c0d2832d56b487c25117e850c8bc85bd9a WHIRLPOOL 66b5d12fdda4671c1e492cdd4ebb9d5fa45e8e3db4d822cafb34cb4961aaded104f10337a2df27b0d3ee5b679632560f94bd472e9f7229bb8f65ba20c7e40313
+MISC ChangeLog-2015 2345 SHA256 ef444eaf71409ea2268727a6be3657e8577f16c0cbfac377cbd3e8f3e3d7d104 SHA512 3a27ff894556c783c49d7a6031cd0a1afe8410da238eaafa72061730976cb1cf27b5b775608967de2ed3c20a8912b2a0e8c802552766b33c3b8480bbf14e7a9b WHIRLPOOL d276de4912dbabcc2808de6fd6ba7890b765b42df71a271b77a344dff17b48943acfe86f73339b7aa84f45c9f4ffd535aebb0f7f20e7186b6293b68fb36e2eca
+MISC metadata.xml 359 SHA256 67fd95fb1bd8853d7c03991d1052df847fda01e7ce39d8309a3a902ebf8e1a25 SHA512 35b42b251968ad982920a16df9575110cbd74d46ef39fc62e3212525aa1c291effd399ea870ecf0caa722c9d556aaa7211509550db2867f90b9008ee856092c1 WHIRLPOOL 20ed7663accbfd923b29ec372d315e63e5a19c2d8f0df138fef83e15a46c71816cb350d497bc1814fd7c18c6f20c33ba8a44bc9bf6d9d061e509ad024705be42
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
new file mode 100644
index 000000000000..55a550379ba0
--- /dev/null
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Random password generator"
+HOMEPAGE="http://packages.debian.org/stable/admin/makepasswd"
+SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+ dobin makepasswd || die
+ doman makepasswd.1
+ dodoc README CHANGES
+}
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
new file mode 100644
index 000000000000..48fe1ac76d44
--- /dev/null
+++ b/app-admin/makepasswd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription lang="en">
+ A random password generator, for all your secure password needs.
+ </longdescription>
+ <maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest
new file mode 100644
index 000000000000..5f9a2d91b39b
--- /dev/null
+++ b/app-admin/matter/Manifest
@@ -0,0 +1,5 @@
+DIST entropy-302.tar.bz2 1701434 SHA256 968267d65d3a4f1480fb1d4eac43f33777efe0b4486c80f9b3baef093f052f95 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e WHIRLPOOL e03a7669d9c98a2a060822f5000d859158724730d172e536da7577c365864109990ea9e7fe143f5a8fa496474d637b57a93e18dc39f6282037e0f7941a4eba43
+EBUILD matter-302.ebuild 903 SHA256 135ad7bb5e519c8aa403875c47f2726a1a8b0b115f269509326228201869006f SHA512 5726e57bb3a94c9ca263a5be2aaf83ae2894f54b9a1f8958ceb286d13af609798f4928a498d6ade9f445d9554cbcf6d1449f303aa2c13f4e0e69058139f8c331 WHIRLPOOL 82600be803c2a8b4c95edc1b528cb1feb33f8916469e2647b1f15e154e1bf52398f091ba5cf17ca7763c182f5923f19423bb17dbfea013129d3497c16a24a4f9
+MISC ChangeLog 3480 SHA256 701048c09dab1a41b8698c5c079291adeea1e6ce8f3b58e9e5cf1712cf652583 SHA512 3828d77cde33942a6c5d14807f550a51561c96baafe1776dfb68053f088c2f4274279fe1fd6e9197cd957501fb635276dfb17c008b6239d98f7c2b6a3c4bea84 WHIRLPOOL 2c14b56935da70c26a71f8625851ebef63378126bda58b63ebb6dcd7b0f760af828ed927382facc259af6afa96faeeac098cc64d6d44cccab77b4817f835f28c
+MISC ChangeLog-2015 959 SHA256 f06be9145d2152a58e8c43e9423c488b9086ca3eef2022b30a28a6a9115e27e3 SHA512 989afe85b2cdbb65430a110502fd1816d5f7ee72fceaa5fae7295f5a305dab85c358679f21d12a1dfc34ecad455a48a6115a1f41d5c422aa3fe6d6c600261249 WHIRLPOOL 549c8e09491015b266f93a21b762e24cc426de2710cb03ec8d0a6e4cfe7b5074b8f28801c42cef1279cfdfe2e9d08847d146ce4b7d05ba897a9b786dd17979fb
+MISC metadata.xml 512 SHA256 761dbf567da09b3737516d9a1e4a089cbd13b262ff2d3c156f8a95926256fc89 SHA512 6ae26acad143c56b2434dd81529657e78bd8b462c53937cfc900631b21ccb1b96447aa5fddcb959fe756501a9206041b1c997e714b85e95b5510b6eba104c90b WHIRLPOOL 480efbae4d80a8ce564aa1b8d9423957c90e29117bc151033ef2a53058d580b3b1d8d41662751e963de5a71a583e929c0f6cb869a0df775e94d4082ee8a15755
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
new file mode 100644
index 000000000000..47f0521d6aab
--- /dev/null
+++ b/app-admin/matter/matter-302.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Automated Packages Builder for Portage and Entropy"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+entropy"
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/${PN}"
+
+DEPEND=""
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
+ sys-apps/file[python]
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" base-install || die "make base-install failed"
+ if use entropy; then
+ emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
+ fi
+
+ python_optimize "${D}/usr/lib/matter"
+}
diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
new file mode 100644
index 000000000000..d8870835adbf
--- /dev/null
+++ b/app-admin/matter/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>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+ <use>
+ <flag name="entropy">Add Entropy support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
new file mode 100644
index 000000000000..fac2cbf6d610
--- /dev/null
+++ b/app-admin/mcelog/Manifest
@@ -0,0 +1,13 @@
+AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 SHA256 7ead10c71b0941950e7c69b1211a0643360c725f923c9b0336ba39c38bba7780 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db WHIRLPOOL 17427dab2baa1df6fe1c0ff6cebbdc1c645fd56e35bb5865ca5fd38db760728054d4c9d9edad778d2357b7ef2ee109d21c788208d91c8ec408cc6c8b4df507f6
+AUX mcelog-129-debugflags.patch 416 SHA256 5c94bd92035c24038bd05caf0357e72a3085fed57b73513a7cfdd08810d02d01 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20 WHIRLPOOL 4287c0327484317824ec568763542ec3e55c493c0bb0cf2a094404a4f3ca7e26d6c1880f0286f0d376e2b0ffcb677b786fd4c0a160baff1a35063ad485c020fa
+AUX mcelog.init-r1 349 SHA256 bd2419d3e68a1d79a6f799af8760bb8498f70b4a1cf21227f141b167c8d367f1 SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4 WHIRLPOOL 1c79b79164fb94cf434353038c8ed2ebd6c0e4b02cb5da25f2ced6b9e2c6d2e9af6c35c4d8036c7beec9579ceb307a3387ba0b21f61f27b28281d11df608d5ee
+AUX mcelog.service 213 SHA256 6c9d5bad415f8ed7c6cb4bb111d7ad2d4f916f5737c2559f4fdc3a04b9fc3ff4 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75 WHIRLPOOL 2066c70585a5204786983d1139737a584c12b34d03a7373d717a98d1d880993d953cc509de6b5a02a3a5212c42f42bd0e20ae3d9d9b905c4ff20b3365c68589f
+DIST mcelog-149.tar.gz 296943 SHA256 a9313ed45cabaf7ef0a4d986ecf24a3c9ced9a4b1e34032d380af4e70c73512f SHA512 d2cb7cb26d4407dd03a425568a19c96e5f53cc9447c58cd105d74a2f69b645ef6b444c9533186aac6b052f0721959a321a3f8061477d1451a62be36add097aeb WHIRLPOOL ddea0a8efca6e5180d4d3ce663a0366b1a2eb78d8d11690e21aea81d3956838013aec7e83f29f6a745a63d18e95e8c71a2b00be135a5982013462b3911aa7f57
+DIST mcelog-152.tar.gz 297083 SHA256 7a903710a8ae0a031d337cc1e9e01f5353467e7f9aecea44bd50659793163022 SHA512 e89a4d81c87211f345d2f90dfb36bbb6ef4474745ac878285801b6ab4edd1ebc32feaf38b60f5976e7b9f29700495c2325f0e05c8ec432a22d77c1e9207a5e1a WHIRLPOOL 38e9526e2a16e4f25d0c4b218884c871b84cf0c2416ed80069746d0af3b7c2eff9d17b6f350b04f53564a172fb61b61ff8b51038ca639c37dbfbc7e6d3b34cec
+DIST mcelog-153.tar.gz 297099 SHA256 9b827f708855804b6952de6f6cbf2f6523fa1203c621e6050064388f459646f1 SHA512 9a92587c13680e83fd1b89d45c160cec91c6a90cfa32f5858fea444b2013f1a9ec3349edf0f7777908898967b1c1604761f481b91e87fd31b0c5255530b9453d WHIRLPOOL 2572ee54b68fcdab7b83207ef84035cb8096cb30fa225a2d11f823a8b2ecd4d19a728ba7f094e9b67c8f293a4611b2824eb555e6bf646939af47444c101fae14
+EBUILD mcelog-149.ebuild 1216 SHA256 305dd87d7987c249084b01c4ec1bb45711f9a7b3294b28804047d70db22e5a13 SHA512 a0414d1608bfde9177e2f10dcd135f6f1dd8c9f9498a187fce8e3868db02a65f09dd74520b6659aa1424725a15d7a4c58542d505c1ce1ad12ffd48afce1e8b86 WHIRLPOOL 97c7efb4750b001d72a6952584783774bb4173e9041255582616b9ff46d3293d393842554fdf7bcdcdeb5baf836803586f12a6dce0faee28d1c6c1ebc94a84cd
+EBUILD mcelog-152.ebuild 1218 SHA256 962a0ac4c29a822efae0b33abca073a0bdfd6b2992f0a29ae2c56494cc365cf1 SHA512 8ff47aa8e9c52bdcbc0734accd716d514d89c0936c24340ddb7ce1b13e1c3c8992d56bce98378d7a6d5cd74579183049861d97ce67919cffa2650d202ba24364 WHIRLPOOL 3e0c3c00c2196c838f294b00e6ca46ee6e416c5d04cff0ccb28ef191e5a7b10c8899e5ae7661586f3440bf66b905bf3cdd847ded3ef036f2290b8035bff61da6
+EBUILD mcelog-153.ebuild 1372 SHA256 80774217d878f68286e3a14c846b52ae35c3a97e6ef2cc98e89643a1313a4eee SHA512 cf76774ce8ec0634a8a8e8eed22d6048085a4bbbf767e871963d37617bdeb0383590d85d00a7709e76d9a460dfbe90867c4b62e93e829c4081ed14025469b505 WHIRLPOOL 32d365e0bab72e105825dc2de67174be91151f70e7d3c87711fa8793a3fe0808c2c431e33ca13cc6d7f64ac51f55965c5712362b4e8d336f429a680009b5429f
+MISC ChangeLog 3878 SHA256 487ad272bd946e20585e24c42fee9904d70395ca9f203b303a63c87e59e3f21a SHA512 729fbff0e43c1424fe279707ffbbd052ed2084b8274ef34307c1ea8984eb33e45b9c9c0724db624e54c863f52d92e1415d090366d94de00a75c56a6ef97193a7 WHIRLPOOL e49a4df2b397508bb73dde74c9abb469e40eb7f367eb3993e224c163edce3c0485dfb8f267865f33218b623dab4d1662aade526d540434ca0f54e989be3809bb
+MISC ChangeLog-2015 6067 SHA256 cd64e94164463a072484250bb9b73182b1e491a600d910710eb565fb4cb86b42 SHA512 f20d1f881f6a77470c629c1c23ced367eefe144ffc1459794d030fd4af428b99cf39ac774caa30853131934bb988dcaf872b9d2d452df9e627f8dde12a562411 WHIRLPOOL a07cb5f6e7e7f165616ff6484b36550a66998ced271e3e6ea8bdd3a2e7f93043f7af0eb648b39ae8173ca6b073600f002ddd463444f15f8cf95c04267571d90f
+MISC metadata.xml 837 SHA256 85fedba2c329867f241e36c6b464a640fa324d39f56e55642289a389791b4dd1 SHA512 f6e69af6afc0de8c5436fbe468a3afbcb96e808c5e21d8a5fa65878bbff0c31ee883c4cda638acfeef1dabd77c85d0fbb3091b180b0cd16df14471e64db8df80 WHIRLPOOL f8c9ac9caf750b21604909620c8435c0c7f7a2f3dbb0f18d93a256acfe81896029a72e88dd0d99eceafe35ad20b8a4dd6244a5b6028583d3b118468a553108dd
diff --git a/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch b/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
new file mode 100644
index 000000000000..d24afdbfe00e
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch
@@ -0,0 +1,8 @@
+diff -Nuar mcelog-0.8pre.orig/mcelog.cron mcelog-0.8pre/mcelog.cron
+--- mcelog-0.8pre.orig/mcelog.cron 2006-02-08 05:09:03.000000000 -0800
++++ mcelog-0.8pre/mcelog.cron 2008-02-22 11:32:06.717012502 -0800
+@@ -1,2 +1,3 @@
+ #!/bin/bash
+-/usr/sbin/mcelog --ignorenodev --filter >> /var/log/mcelog
++header="$(date +"%b %d %H:%M:%S") $(hostname) "
++/usr/sbin/mcelog --ignorenodev --filter | sed "s,^,$header,g" >> /var/log/mcelog
diff --git a/app-admin/mcelog/files/mcelog-129-debugflags.patch b/app-admin/mcelog/files/mcelog-129-debugflags.patch
new file mode 100644
index 000000000000..eb46439a62dc
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog-129-debugflags.patch
@@ -0,0 +1,22 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Oct 24 15:41:33 UTC 2012
+Subject: build system
+
+don't overwrite system CFLAGS, only append "-g -Os" if DEBUG=1 is passed
+as argument
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,11 @@
+-CFLAGS := -g -Os
++CC ?= gcc
++
++# set to 1 to enable debug flags
++DEBUG = 0
++ifeq ($(DEBUG),1)
++CFLAGS += -g -Os
++endif
++
+ prefix := /usr
+ etcprefix :=
+ MANDIR := ${prefix}/share/man
diff --git a/app-admin/mcelog/files/mcelog.init-r1 b/app-admin/mcelog/files/mcelog.init-r1
new file mode 100644
index 000000000000..bddafa1f12d5
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog.init-r1
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description='Start/stop mcelog in daemon mode'
+
+pidfile="/var/run/mcelog.pid"
+command="/usr/sbin/mcelog"
+command_args="--daemon --pidfile ${pidfile} ${MCELOG_OPTS}"
+
+depend() {
+ after udev
+ need localmount
+ use logging
+}
diff --git a/app-admin/mcelog/files/mcelog.service b/app-admin/mcelog/files/mcelog.service
new file mode 100644
index 000000000000..4bd553012c95
--- /dev/null
+++ b/app-admin/mcelog/files/mcelog.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Machine Check Exception Logging Daemon
+After=syslog.target
+
+[Service]
+ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/mcelog/mcelog-149.ebuild b/app-admin/mcelog/mcelog-149.ebuild
new file mode 100644
index 000000000000..fffa27b121a3
--- /dev/null
+++ b/app-admin/mcelog/mcelog-149.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/mcelog-152.ebuild b/app-admin/mcelog/mcelog-152.ebuild
new file mode 100644
index 000000000000..4ac0a016c0dd
--- /dev/null
+++ b/app-admin/mcelog/mcelog-152.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+CONFIG_CHECK="~X86_MCE"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/mcelog-153.ebuild b/app-admin/mcelog/mcelog-153.ebuild
new file mode 100644
index 000000000000..1e3b09353f30
--- /dev/null
+++ b/app-admin/mcelog/mcelog-153.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
new file mode 100644
index 000000000000..79bbe0245ebd
--- /dev/null
+++ b/app-admin/mcelog/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>mattst88@gentoo.org</email>
+ <name>Matt Turner</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>bkohler@gmail.com</email>
+ <name>Ben Kohler</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ Starting with version 2.6.4, the Linux kernel for x86-64 no longer
+ decodes and logs recoverable Machine Check Exception events to the
+ kernel log on its own.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">andikleen/mcelog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
new file mode 100644
index 000000000000..f80122ce125c
--- /dev/null
+++ b/app-admin/mcollective/Manifest
@@ -0,0 +1,10 @@
+AUX mcollectived.initd 497 SHA256 97de82c744874ad18356eb34b4b9ac411c8fdaa5b54482a68a68939df40aee2c SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0 WHIRLPOOL 1900da65b5d6f47fe98de411bd60dd88fc4ace9fffad48c38df2797ebe93dc350d38fa8563d2373c803dce5fab89ee55a2c9fe7128e6431c7d6458275641861b
+DIST mcollective-2.11.1.tar.gz 1516922 SHA256 d5e150408e61d51b3844e14c6304cf61f27243c5dc658e689bbaaee91dce6b0b SHA512 88d2511829936a5987c8ddab068f59d17f16230cb339801672238ae54ce2115e93d7271a78001176ccc203a1b70f7ee2f35992e414059f1db9cb05db210463e5 WHIRLPOOL cff40347c46464a18d6d98e3a3e2a7dab4169f5c0e1b60f08f3292cc87adcc123fc423203d664bcee1dac47a1dd44e44726702de5c2ea0ed0c5e55d8dbe0b45a
+DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
+DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
+EBUILD mcollective-2.11.1.ebuild 1638 SHA256 8b055a142d13d0436d3ef1be2093df2ad0e4d58f38f40681d0166a103fcd27a4 SHA512 59bf34c79a512b0a83807e36658bbabb5dec625ea54a4ee406bc54b9a330b8936f83aa59870b0ac30ca1f00694b71f4a8eefc1a84e60ae5ebd1e8aff43cc836e WHIRLPOOL 3fe6f79a49c1243fa4760622affac8c0320e2b9428ec87750f270e1bf9732bd2852b8bac05dd343af4ba33662384de183dda60a5070c4a1df9dc6ef2ce33df07
+EBUILD mcollective-2.11.2.ebuild 1641 SHA256 324bc04c36bbdcfa98b84a6f61c9182ee41559448e1621a8271cc0e593fdd1db SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a WHIRLPOOL 8b10bedb9bd77b74c73bb80238496c36c1bfab0160dd7aaf589f8916be53a01551e9717c6f8ab1deea4ffdcd88f5caa166e523cc35fbb16037cc3d8f874292e1
+EBUILD mcollective-2.11.3.ebuild 1643 SHA256 d962c900fda8a21403f3ae1b4e9bf1281ff5b73e9e57ae31c2031a37942790b8 SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec WHIRLPOOL 02ece74395a5259517209d333c3a7e32213113f74a5e1f364dc5c404c9ab762eb90a6cdebc8f23c56b358e9a17ca30c82d8e0aef0f18dfc7e96991133a70b868
+MISC ChangeLog 3721 SHA256 312164363f75e97271f70aaec2869307d5d636513297acc7d943f8d3d680adc0 SHA512 01765da77e3c2806cd60d4802a2e57971a627aaec2525363391ba723366382a31a47bc7d6f7c108f2609926ff08a173b36bca5dfd99e6d8e29af84f8cfbccee8 WHIRLPOOL 0a56b19ee5d3558597907e7eea53a1900e694f969875c5514d1a43dcdfcb8be746be7e11c8edc9e3d1b2c42612022094197339b0c6fe860e93c0cc3b8becf1f6
+MISC ChangeLog-2015 4747 SHA256 1555e32b0cce5896f5aa1dc96dbfab9ee18005ca9861412adc257970943236c5 SHA512 588921e55eae4d4e2c5af0bdc1f5dcc1c5fdc75e1afa00505e71dac184015213f613151d82012c781e0206553e8ed24641daf569b3a31280efb3420ea1ad0607 WHIRLPOOL 7ffc8e316e46570275c026a87bc20a53c0e05819d5bb491b6072dc159593806b4bbdef069c48c3ad004cc266f110edf3a5318105961e4955c6ff36979c49b922
+MISC metadata.xml 534 SHA256 a49b8acc987ea0c9e2a42cfc4191bb1b0788d6b344d76483951eadc1fbd3b0c0 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199 WHIRLPOOL 1b04bb250ec256dd971405639ae14f047ec37862fb56b6eb42c4fd98dc0fdd521ea9342a48139d35d4757a1b8b3592ab80180f55ed4bdb26191df7ca2541a8fd
diff --git a/app-admin/mcollective/files/mcollectived.initd b/app-admin/mcollective/files/mcollectived.initd
new file mode 100644
index 000000000000..8e295ceaa41c
--- /dev/null
+++ b/app-admin/mcollective/files/mcollectived.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the Apache License, Version 2.0
+
+mcollectived="/usr/sbin/mcollectived"
+pidfile="/var/run/mcollectived"
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting mcollectived"
+ ${mcollectived} --pid=${pidfile} --config="/etc/mcollective/server.cfg"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping mcollectived"
+ kill `cat ${pidfile}`
+ eend $?
+}
+
+restart() {
+ svc_stop
+ sleep 2
+ svc_start
+}
diff --git a/app-admin/mcollective/mcollective-2.11.1.ebuild b/app-admin/mcollective/mcollective-2.11.1.ebuild
new file mode 100644
index 000000000000..4caa041bf9c9
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.11.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="http://marionette-collective.org/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ cd "marionette-collective-${PV}"
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ use client && dosbin bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r doc/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] https://activemq.apache.org/"
+ einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/mcollective/mcollective-2.11.2.ebuild b/app-admin/mcollective/mcollective-2.11.2.ebuild
new file mode 100644
index 000000000000..1e7cca4d5674
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.11.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ cd "marionette-collective-${PV}"
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ use client && dosbin bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r doc/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] https://activemq.apache.org/"
+ einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/mcollective/mcollective-2.11.3.ebuild b/app-admin/mcollective/mcollective-2.11.3.ebuild
new file mode 100644
index 000000000000..795e37902641
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.11.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ cd "marionette-collective-${PV}"
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ use client && dosbin bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r doc/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] https://activemq.apache.org/"
+ einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/mcollective/metadata.xml b/app-admin/mcollective/metadata.xml
new file mode 100644
index 000000000000..bbf72aa5c8c7
--- /dev/null
+++ b/app-admin/mcollective/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>prometheanfire@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="client">Install client utilities</flag>
+ </use>
+ <longdescription lang="en">
+ mcollective is a framework to build server orchestration or parallel job
+ execution systems.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">puppetlabs/marionette-collective</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/mei-amt-check/Manifest b/app-admin/mei-amt-check/Manifest
new file mode 100644
index 000000000000..9406ef807f30
--- /dev/null
+++ b/app-admin/mei-amt-check/Manifest
@@ -0,0 +1,3 @@
+DIST mei-amt-check-0_p20170515.tar.gz 10793 SHA256 d84d8b25b60cc434236cad0c5a59ac0763ab3e61fe5c563c300e72b2a1860e34 SHA512 62ac6d3b2cacfc4770a076bffad1a4f8ba9233acef09b2e7bc77da545a67886b86e4076cceecd5ca8aab38c661cf8a1ddb178e7caf181b2da6171c467fbd8988 WHIRLPOOL 8e179423972082618162654c413a776e6b9d04be7c8d73b8b7c079f3cb1e439aa1f0c56c39a65c1f4349e5816c56046b67b53ff9ad1a84b2e6c72e23f7db43e2
+EBUILD mei-amt-check-0_p20170515.ebuild 703 SHA256 13b5c5e3d276cb87d37dc5e71985497fffc766cf2d4442b7e6c803a326e95a97 SHA512 bcec63bb7edecfc74bffde92433775d900a9946609c1c7a11044efc57d42ec90717bf08a8b8c856c10de8c4252536cbe26eba74ec1fa9b4af2983d29214e9668 WHIRLPOOL ede724f8d299218608195812809b57a0b59f50b2a4bd0df23aa291738d77fc771d35a368a40b34e70115e9b9c4ebf9009b46b45f5661c931040c1e7022f948a9
+MISC metadata.xml 256 SHA256 ca5743f0dab0d056f7fc09fa77bf5399b710f1bcc6a80ee67aa2e00414c6da0f SHA512 e157b88fb4a80a7efd644e78794f964897ddfd949d41ccd6e62c989927f165081533bd07e9685b2aa31e3268a87568bde6af02649cb887dcfce913af930a483f WHIRLPOOL 70232d79a0fd1f985db1923cffa79e63107feb3f7774fcbb16a28c1c7818f0b73c5a16d17b1d8b313755d4b460b9f48f767e705bd747b0f1593879abe2324ee5
diff --git a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
new file mode 100644
index 000000000000..e6400ff43960
--- /dev/null
+++ b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot linux-info toolchain-funcs
+
+DESCRIPTION="AMT status checker"
+HOMEPAGE="https://github.com/mjg59/mei-amt-check/"
+COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700"
+SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CONFIG_CHECK="~INTEL_MEI_ME"
+ERROR_INTEL_MEI_ME="Need to activate INTEL_MEI_ME to run the tool"
+
+src_prepare() {
+ default
+ sed -i -e "/CC :=/d" Makefile || die
+}
+
+src_compile() {
+ CC=$(tc-getCC) emake all
+}
+
+src_install() {
+ dosbin ${PN}
+ dodoc README.md
+}
diff --git a/app-admin/mei-amt-check/metadata.xml b/app-admin/mei-amt-check/metadata.xml
new file mode 100644
index 000000000000..91fd90ac48e9
--- /dev/null
+++ b/app-admin/mei-amt-check/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">mjg59/mei-amt-check</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/metadata.xml b/app-admin/metadata.xml
new file mode 100644
index 000000000000..b15417f502c1
--- /dev/null
+++ b/app-admin/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-admin category contains non-core applications which relate to
+ system administration.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría app-admin contiene aplicaciones para la administración
+ del sistema.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-admin enthält Applikationen zur Systemadministration,
+ die nicht Bestandteil des Basissystems sind.
+ </longdescription>
+ <longdescription lang="ja">
+ app-adminカテゴリにはnon-corシステム管理に関連したアプリケーションが含まれます。
+ </longdescription>
+ <longdescription lang="nl">
+ De app-admin categorie bevat applicaties met betrekking tot systeem
+ administratie.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm app-admin category chứa các ứng dụng liên quan
+ đến quản trị hệ thống (không tính các ứng dụng lõi).
+ </longdescription>
+ <longdescription lang="it">
+ La categoria app-admin contiene applicazioni per l'amministrazione del sistema.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-admin contém aplicações para a administração
+ do sistema.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-admin zawiera aplikacje dla administratorów systemu.
+ </longdescription>
+</catmetadata>
+
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
new file mode 100644
index 000000000000..ad6c740cedcc
--- /dev/null
+++ b/app-admin/metalog/Manifest
@@ -0,0 +1,11 @@
+AUX consolelog.sh 269 SHA256 b076ed8329052c8ec6d61722c15c589dbf53487cc3e7dbc0c54af6965c54048e SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332 WHIRLPOOL 0d07497cbf1889b07911972e7bb681c98f8d9b9a1cda0569e182f553f6fd676366c8dc574d3283186f101ab8bfc1bf058f3c058290b398a576d59a1812d7d1cf
+AUX metalog-0.9-metalog-conf.patch 269 SHA256 55c41e40d0e46584c1449d2704a3e29196850318d7d5d512bf9c5945e1807cce SHA512 0c95e8461e89d9469452d2ef66fa52f469b61578b12a6c72adb73e48807f998f8fb58cf0b3f1bc5caa38296fd59c8f8d1fc209beec81790387816d1c497a07df WHIRLPOOL 85fa9879d7ec564f7e52751ab5f7c0e815ede48d7c5f0f27bcd6aa6d8ca60984d6ce2cdff52edfe3107ebb7c3cf8fd1c830f61022275053514dd1fed4dfc9f37
+AUX metalog.confd 393 SHA256 dd9d30a6c22dca6d072a9c63e1494d3d0a26709a5f045ce5985642933fe24efc SHA512 4fea6b7f48e55d5f69a9c9a69f54623bb9d515e2fd2eda6829f8b769eec85e3de448eb42feb6bf65645400480169b3d70d56dff090103cfc95a3810515c42b2e WHIRLPOOL fdd0afe33686b1a403a901e26315188b429cdb522f06eb593a6d103edf2707cf1dc23fa2351a92b9edba8bbd59fbff9a306a0df5fc494880bc93fcfa69b3cde1
+AUX metalog.initd 701 SHA256 78e372a0c04c36e590a66d0750083fcb6302159eaae06a81c19a379e6115087e SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096 WHIRLPOOL 7794154e2f27e328ccf4fee668fc797c74e5332f9ae6835db203182207aa8da7c85d8ba7952c018063e814a2e1ca40870bd0cf6e31ec7dc82f7b0afb330cb73b
+AUX metalog.service-r1 153 SHA256 68131c0c7480712b59265c7ba57deb5430c14d4b8c8ca3dcc3c84757e9a6c70c SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8 WHIRLPOOL daa8d2188ba10508eb1d6a5c9d052a0ce8dfe285bf1292b68b82925935184a8b75ccfeb141dd56ebee90176114bc59c3583713c46a23c1f0d16a2deab91442b9
+DIST metalog-3.tar.xz 360784 SHA256 0c3a1e19008b3d525eab6e5548a4e8cbb0fb235f2804dc41aace82c67ceeebe0 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289 WHIRLPOOL d06a23622bfcef053ac4d959952060c8c1649ea0a5e2f759612caf5819a32944b3c7f6d78233fec83944fe7b5535851d7dca4579b7849e08951da18be503ed09
+EBUILD metalog-3-r1.ebuild 1533 SHA256 585bac71502403575515dc0684237f41592ddb731a702c5e46bd2cfa44008491 SHA512 3e1f0ff8ddd35d3ba9432489ae3ff35e30bc24af43056144c3eacc9a2654378c157699c86ce1ab2ff39c4f38bef8be0d07d21ee9d14ca6978709767ca7b0e87a WHIRLPOOL a4898077adee20dfe0d49e99051d8cbb9b37b70d41994d9e4df80b6210897ea8033b636d36ae8e444a17c2b846d165b1a41aba987fb14d03b42dc8ea186495ac
+EBUILD metalog-3-r2.ebuild 1496 SHA256 327bd1d097abecd60af59db802d433affda5917b3967d623c0d6cb29d7aa9e80 SHA512 91b3e9287583c61a375bbc9603021948f8508bf594ab6eff6398585419e30aba11ea6f600eb1305a8cf87f5c0b33aa80225b80fd003d74c8e17b31b2c543619b WHIRLPOOL da0bb29eb2148dee66b41b865a58e96bdf0b40ce41d83ba408bb09b338403b93d5f4f5adf342bfa6c52bf157c2f40060392b64a927c6a878802de51f14590d60
+MISC ChangeLog 2814 SHA256 0686ce19743df77440fd505e4ad20fe24660861908c7f5207c53ec65656ab9c2 SHA512 4da52d962d0d8ebb293fa8ae5ea7a06b54dce6175a7e1bf6afaa318bcf361d46e3678f5c573fe7ba3fbefe8462b0236603da21f2d3cf325ec488fc748bcbdb43 WHIRLPOOL ebe0532632c663fa3f04a52492541aa9e5d303323250f33cc0df29badec0962960418d354c9a61fc6b92d6fc2d31f0204b009d7d950e12d50726a8488d10c5e6
+MISC ChangeLog-2015 15409 SHA256 7b534edc547a716c20e34531f4b200f8463deb7fe6c7006a4423a0f6f74d07c7 SHA512 fa2e58da5d7e652622375fe9a608dc73e40bb6bed99f11d1540d07e217ac98c51bfae7aca2ee65ff34667556069be983e4a6c06d855150b7865b56790fad21ce WHIRLPOOL 1b1b36808eeae9bfc6a9ea0589b195ea1067d42df05e372b09fc2effaca6bd0be7a18c3627681537e6108ca8a84aed97a90ee49b6f07df293dc2cdac3152236e
+MISC metadata.xml 412 SHA256 c50d7550b9b253bce0339a26c3fcfa548921ce52ee740184fe8c05b6d4ce7376 SHA512 3c5b8ad724089154480e4a1672e714fba022f30e371d317e53c144411ded8d8ca92bddac9eb51503ed9eb9e8069b851a8ff5078f9c9b576542efc54e621a98a8 WHIRLPOOL 4015be7464f2d87e56e0aeabdf2862d61638563e919e2709957f7365bebb0d8240480ac279b1b6a913e1c3242f22b309f29023f252e9dd386a79171eabb7f50b
diff --git a/app-admin/metalog/files/consolelog.sh b/app-admin/metalog/files/consolelog.sh
new file mode 100644
index 000000000000..90fb38e9921a
--- /dev/null
+++ b/app-admin/metalog/files/consolelog.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# consolelog.sh
+# For metalog -- log to a console
+
+set -f
+
+. /etc/conf.d/metalog
+if [ -z "${CONSOLE}" ] ; then
+ CONSOLE="/dev/console"
+fi
+
+if [ -z "${FORMAT}" ] ; then
+ FORMAT='$1 [$2] $3'
+fi
+
+for d in ${CONSOLE} ; do
+ eval echo ${FORMAT} > ${d}
+done
+
+exit 0
diff --git a/app-admin/metalog/files/metalog-0.9-metalog-conf.patch b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
new file mode 100644
index 000000000000..efb794de5454
--- /dev/null
+++ b/app-admin/metalog/files/metalog-0.9-metalog-conf.patch
@@ -0,0 +1,11 @@
+--- a/metalog.conf
++++ b/metalog.conf
+@@ -21,6 +21,8 @@
+ # merely write $@ to some device (your console for messages):
+ # echo "$@" > /dev/tty10
+ #
++# Hint: you can control the consolelog.sh behavior in /etc/conf.d/metalog
++#
+ #console logging :
+ #
+ # facility = "*"
diff --git a/app-admin/metalog/files/metalog.confd b/app-admin/metalog/files/metalog.confd
new file mode 100644
index 000000000000..ec7e64edae2b
--- /dev/null
+++ b/app-admin/metalog/files/metalog.confd
@@ -0,0 +1,18 @@
+# /etc/conf.d/metalog
+
+# Some useful options:
+# -a Log with buffering
+# -s Log without buffering
+# See `metalog --help` for more
+
+METALOG_OPTS=""
+
+
+# Options used by /usr/sbin/consolelog.sh
+
+# Space delimited list of devices to write "console" messages to
+#CONSOLE="/dev/console /dev/tty10"
+CONSOLE="/dev/tty10"
+
+# Format of logging (make sure you use single quotes)
+FORMAT='$1 [$2] $3'
diff --git a/app-admin/metalog/files/metalog.initd b/app-admin/metalog/files/metalog.initd
new file mode 100644
index 000000000000..f81e9eec51ca
--- /dev/null
+++ b/app-admin/metalog/files/metalog.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="buffer unbuffer"
+
+PIDFILE=/var/run/metalog.pid
+
+depend() {
+ need localmount
+ use clock hostname
+ after bootmisc
+ provide logger
+}
+
+ssd() { start-stop-daemon --exec /usr/sbin/metalog --pidfile "${PIDFILE}" "$@" ; }
+
+start() {
+ ebegin "Starting metalog"
+ ssd --start -- \
+ --daemonize --pidfile="${PIDFILE}" ${METALOG_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping metalog"
+ ssd --stop
+ eend $?
+}
+
+buffer() {
+ ebegin "Enabling log buffering"
+ ssd --signal USR2
+ eend $?
+}
+
+unbuffer() {
+ ebegin "Disabling log buffering"
+ ssd --signal USR1
+ eend $?
+}
diff --git a/app-admin/metalog/files/metalog.service-r1 b/app-admin/metalog/files/metalog.service-r1
new file mode 100644
index 000000000000..862881aee165
--- /dev/null
+++ b/app-admin/metalog/files/metalog.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=System Logger Daemon
+
+[Service]
+ExecStart=/usr/sbin/metalog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
new file mode 100644
index 000000000000..e6a099eb943e
--- /dev/null
+++ b/app-admin/metalog/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>vapier@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">metalog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/metalog/metalog-3-r1.ebuild b/app-admin/metalog/metalog-3-r1.ebuild
new file mode 100644
index 000000000000..b67bb91b753a
--- /dev/null
+++ b/app-admin/metalog/metalog-3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit eutils systemd
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ app-arch/xz-utils"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+}
+
+src_configure() {
+ econf $(use_with unicode)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+ dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+ into /
+ dosbin "${FILESDIR}"/consolelog.sh || die
+
+ newinitd "${FILESDIR}"/metalog.initd metalog
+ newconfd "${FILESDIR}"/metalog.confd metalog
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+}
+
+pkg_preinst() {
+ if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+ mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+ rmdir "${ROOT}"/etc/metalog
+ export MOVED_METALOG_CONF=true
+ else
+ export MOVED_METALOG_CONF=false
+ fi
+}
+
+pkg_postinst() {
+ if ${MOVED_METALOG_CONF} ; then
+ ewarn "The default metalog.conf file has been moved"
+ ewarn "from /etc/metalog/metalog.conf to just"
+ ewarn "/etc/metalog.conf. If you had a standard"
+ ewarn "setup, the file has been moved for you."
+ fi
+}
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
new file mode 100644
index 000000000000..073d55ec90e1
--- /dev/null
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils systemd
+
+DESCRIPTION="A highly configurable replacement for syslogd/klogd"
+HOMEPAGE="http://metalog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="unicode"
+
+RDEPEND=">=dev-libs/libpcre-3.4"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ app-arch/xz-utils"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9-metalog-conf.patch )
+
+src_configure() {
+ econf $(use_with unicode)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README NEWS metalog.conf
+
+ into /
+ dosbin "${FILESDIR}"/consolelog.sh
+
+ newinitd "${FILESDIR}"/metalog.initd metalog
+ newconfd "${FILESDIR}"/metalog.confd metalog
+ systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+}
+
+pkg_preinst() {
+ if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
+ mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
+ rmdir "${ROOT}"/etc/metalog
+ export MOVED_METALOG_CONF=true
+ else
+ export MOVED_METALOG_CONF=false
+ fi
+}
+
+pkg_postinst() {
+ if ${MOVED_METALOG_CONF} ; then
+ ewarn "The default metalog.conf file has been moved"
+ ewarn "from /etc/metalog/metalog.conf to just"
+ ewarn "/etc/metalog.conf. If you had a standard"
+ ewarn "setup, the file has been moved for you."
+ fi
+}
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
new file mode 100644
index 000000000000..f03041d03d15
--- /dev/null
+++ b/app-admin/mktwpol/Manifest
@@ -0,0 +1,7 @@
+DIST mktwpol-0.2.6.tar.gz 55328 SHA256 e1adfe151d4bf98eb28d4f4c6cd9303ec9e2cf3a8c5efc3f4fa9fc38a2ac62b7 SHA512 58d739bf789f7e25678adb19cc2d05bf98920d4f42a761f2c1fc45c72ac9080def9f2533f63c10dfea50f5d8428f7d4a19760a38dcc34bff9aaeb6fdd7e89434 WHIRLPOOL 33170e4fa54e99644a32977637fd2d47ee6739150cd70a2e381cb2ecba89b2fe20bcf6b8566f607a2dc45d725feb0ec7db63beb13903373461feefb158f9bcde
+DIST mktwpol-1.0.0.tar.gz 59748 SHA256 1aad28f5b90bfb4ad7ae0218470b7e7e046f1419c86ea6ae6f0e6a0210238e9c SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e WHIRLPOOL 997488dcee1ce4b55beee3225af58bc88c23420d9458eebd6a07b5ecb50efae4476efac3489527187cb580d3868aa0a179674360b7e19df301453b50434e763a
+EBUILD mktwpol-0.2.6.ebuild 1327 SHA256 53b53f10aee15f6f8fd3c72687b6d5da08eb647ed1b01c0f750df56df03fcdb4 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc WHIRLPOOL 26718ffab8b3acbadba0dbeabc184633ee2a6e87221d16f448ff9f91d77f4f3b07eb7c7be45abeaead17d843d0eb1c65a8457ec8bf6db623f58f8e89e2544517
+EBUILD mktwpol-1.0.0.ebuild 1327 SHA256 53b53f10aee15f6f8fd3c72687b6d5da08eb647ed1b01c0f750df56df03fcdb4 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc WHIRLPOOL 26718ffab8b3acbadba0dbeabc184633ee2a6e87221d16f448ff9f91d77f4f3b07eb7c7be45abeaead17d843d0eb1c65a8457ec8bf6db623f58f8e89e2544517
+MISC ChangeLog 2358 SHA256 59077479696b6b2ffe104199ff34585a3582d310de133d79f16e7d329128a9de SHA512 02e7f8f81ec8c6d762f4fc117e3297a2d373f4c7a8a2d2f633b118848eef602e8652215c09353f5962ca75e8a11de1a11634d09d7da0ef448c47d254bd6c6025 WHIRLPOOL 116e74a3261e759474c9ea7be4d47ffa4077421aa98bbae653be0582d555a9ec259445410bc96f7719d84b762883b4a3855cd2da8edfc591dc93743ba7098bd6
+MISC ChangeLog-2015 2288 SHA256 488ded941b7e60015321af413000ce215d834f7f8ebab500f38a610d61fca947 SHA512 9cd656c85147e2e702ef9acea35d84239bb127dcd8de5725c41881c25b09d1a7f2ca8a7891d2197d8c78f7975e302cea9c181a8c3d713f9df152f4a3e9cc313b WHIRLPOOL 5d422b84212522ee49b51f7dd2c5fddd588734a01a8f203e31400eaecb551d0e94e638c6daee4d9cf240b7d77968f0ea4b3be9abd0da2851a0be4b2dda5c40d5
+MISC metadata.xml 1814 SHA256 f00d66c77e1bb1e989f13fc15dd9204c32894fd0272b785b636ff9f6b85a4ed8 SHA512 861a3e0c87dee0750caff734aa96708c72d6cb8a79b33a29b8aff5442b11e3e9855beb3d80428f3d6ab91542b3d1df033f55dc6942150d1eabc02fff46139e50 WHIRLPOOL 8a743adf0749362add25a22178ba18a5066b36510f467af3c945bcbf00a421a9ab73372d565373e1250e35ab74e7a8a466d3a423d81c8ee815590e207c92a01c
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
new file mode 100644
index 000000000000..e635c47b95a4
--- /dev/null
+++ b/app-admin/mktwpol/metadata.xml
@@ -0,0 +1,41 @@
+<?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>
+ <upstream>
+ <maintainer status="active">
+ <email>c.cboldt@gmail.com</email>
+ <name>Chuck Seyboldt</name>
+ </maintainer>
+ <changelog>https://sourceforge.net/p/mktwpol/code/ci/master/tree/CHANGES</changelog>
+ <doc>https://sourceforge.net/p/mktwpol/code/ci/master/tree/README</doc>
+ <bugs-to>https://sourceforge.net/p/mktwpol/discussion/bugs/</bugs-to>
+ <remote-id type="sourceforge">mktwpol</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ mktwpol is a tool that aids system administrators in the
+ set-up and maintenance of tripwire (an Intrusion
+ Detection System). It contains a pair of bash scripts,
+ mktwpol.sh and twsetup.sh. mktwpol.sh generates a
+ tripwire policy file that is tailored to the packages
+ installed on any given sytem. twsetup.sh steps through
+ the initial set-up of tripwire, including the generating
+ of encryption keys and encrypting the files that are
+ necessary for tripwire to perform its function.
+ </longdescription>
+ <longdescription lang="es">
+ mktwpol es una herramienta que ayuda a los administradores
+ de sistemas en la configuración y el mantenimiento de
+ tripwire (un Sistema de Detección de Intrusos). Contiene
+ dos guiones bash: mktwpol.sh y twsetup.sh. mktwpol.sh
+ genera un fichero de directriz para tripwire ajustada
+ a los paquetes instalados en un sistema. twsetup.sh realiza
+ la configuración inicial de tripwire, incluyendo la
+ generación de las claves de cifrado y realiza el
+ cifrado de los ficheros necesitados por tripwire para
+ realizar su función.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/mktwpol/mktwpol-0.2.6.ebuild b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
new file mode 100644
index 000000000000..daa6b71b8e59
--- /dev/null
+++ b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
+HOMEPAGE="https://sourceforge.net/projects/mktwpol"
+SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/tripwire"
+
+src_prepare() {
+ default
+ sed -i -e 's|/usr/local|/usr|' Makefile || die
+}
+
+pkg_postinst() {
+ elog
+ elog "Installation and setup of tripwire ..."
+ elog " - Run: \`twsetup.sh\`"
+ elog
+ elog "Maintenance of tripwire as packages are added and/or deleted ..."
+ elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
+ elog
+ elog "Mktwpol is packaged with multiple policy-rules-generating files."
+ elog "The default \"rules file\" is installed in /etc/tripwire"
+ elog "Alternatives are installed in /usr/share/doc/${P}"
+ elog "To use an alternative \"rules file\" ..."
+ elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
+ elog
+ elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
+ elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
+ elog
+ elog "mktwpol.sh uses the rules file with the most recent date."
+ elog "Use \`touch\` to choose between multiple rules files."
+ elog
+}
diff --git a/app-admin/mktwpol/mktwpol-1.0.0.ebuild b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
new file mode 100644
index 000000000000..daa6b71b8e59
--- /dev/null
+++ b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
+HOMEPAGE="https://sourceforge.net/projects/mktwpol"
+SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/tripwire"
+
+src_prepare() {
+ default
+ sed -i -e 's|/usr/local|/usr|' Makefile || die
+}
+
+pkg_postinst() {
+ elog
+ elog "Installation and setup of tripwire ..."
+ elog " - Run: \`twsetup.sh\`"
+ elog
+ elog "Maintenance of tripwire as packages are added and/or deleted ..."
+ elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
+ elog
+ elog "Mktwpol is packaged with multiple policy-rules-generating files."
+ elog "The default \"rules file\" is installed in /etc/tripwire"
+ elog "Alternatives are installed in /usr/share/doc/${P}"
+ elog "To use an alternative \"rules file\" ..."
+ elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
+ elog
+ elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
+ elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
+ elog
+ elog "mktwpol.sh uses the rules file with the most recent date."
+ elog "Use \`touch\` to choose between multiple rules files."
+ elog
+}
diff --git a/app-admin/mms-agent/Manifest b/app-admin/mms-agent/Manifest
new file mode 100644
index 000000000000..5fcde676b18d
--- /dev/null
+++ b/app-admin/mms-agent/Manifest
@@ -0,0 +1,9 @@
+AUX mms-monitoring-agent.initd 577 SHA256 015d406a198a508fa64334d56b478b17a514f05e5a88fe5f875c22cff807dc61 SHA512 5d03ae75fcd08fe3d7cb40ba940b0a5e3d72a48e8adb010349d0c93153409cc7e02cb5eeb9134742e8d62fbdfaad61cdbab76c0e7395cd4ba6ec19c541a1d12f WHIRLPOOL 36d47066eb910a6d839d95b6909f03145463a06899c91dc9b3295df507358c12d241b6e93ca076784638fdbca0542dd21d8258c62ba41d6343986f507a0d951c
+DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz 2554037 SHA256 94e6c826c3bd63205dbf42dca9830d5ed706cd0cfe8c0ea16df014e01fa7a0aa SHA512 532d1c2dee00ee2b64654f43ded1cd8b40da8401ea0edb24c81cee80a46289ebde47697c43cb3ffbf6ce3ef88e8d6b78c6ba1e0a615a7488efe1c42f1d827897 WHIRLPOOL b8a7d77a6194134cec74ac164b178cd8896bc9774ba999bed2ce71e152926fcde8ed59c1d14c369a43d6b8c5fc1e09dfb2b725f080df2401fc159141ebe949fb
+DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz 2643320 SHA256 cad543f43e1e803d2af691e634369922f721430f4355027df49d39fe276b8781 SHA512 c4c0d10bca91485680760d25b0cd9dde2081af60fe7bd5528fea13b12676cb10bb069dab5acfac645cf56001a4579df32d34b268b99f449a59d314c6e3ffaa21 WHIRLPOOL 03fd70c99fd7f97a968261fe0ce4ea473b33988dd15253422fa3c9b6e536e024c3bd36d822406d86750c2ab4a4a39dfb329754bc604add664e6e0c4b185d4cda
+DIST mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz 3618281 SHA256 5474e633c5b65817482da6c303f119c89c5beb74caabf1f82adc8690c7645ad1 SHA512 79366c8ec0aaa3209d7e54942a375185312c491ffc825d9bf70d1fca36b93ab819dccf12e8f1a54c8dbd24ff501a3e3547a5a453e80308d6d638e7c3cf866f9c WHIRLPOOL f2f7baf22890a69c36ab4275c3f923b2fee4661e324bd72ea618ddce580d887c54b70db3eb3aae1d0fe74259e0365588a122b9211f09de71a801890a7a6fd654
+EBUILD mms-agent-3.7.0.212_p1.ebuild 1505 SHA256 4ff97bef297216e58d441dd2fb98694a6bbf086f31e3c511052fa0cc48ea2bc2 SHA512 04098333aa796f7c7de91ba4f9707bb00bf54c902562dde7dfcea34b3d0534c93cc2c314aa08fea8b346c3db899511f708ff3dcb0bca82731e477a9e559767b1 WHIRLPOOL f1cd8a9878a11067379c2b162fade4a0c996ea8760036e72b89d142e2e41cfece2f4f1dbc860b5cdf3094de0877cfeb07f654240eb153727630bd01a7572c7b5
+EBUILD mms-agent-6.0.0.381_p1.ebuild 1282 SHA256 a0ef2002f4e18571e5b15bd509e8b33a52ce03bf0fa06250d3b22fbc1cc422a5 SHA512 90cfeb0f2f965a2a2814a28024cd4ccd91d0172dce9679335f195584259dd052b24e83feda90193b4d6237e2fb2be73e15d1fa5199dc2fbc359fd907433fddc8 WHIRLPOOL d6290f3c4363f6339ad595121e5b84a42ace83a3354ba3b1684f886d27455e0f138cc7d5004cf71820788766e62cd2b860efd4f0f14f73d54a55d2d78b385d24
+MISC ChangeLog 3539 SHA256 1294c969ee4240122677f232a5621783b93c118093ffce92ab4e015b648cfe60 SHA512 5fd98416ec632f80045176ab78c4d86caa3a5efd41a6db0cabbb7f9df7ac55cde305a01c10f751dddde8fc8412911570d978c69ec126a3e7e88f9e6698f5cabc WHIRLPOOL cc895540e5073b17e17ba7c819566f6b8843f69b17d60fbb9051a3a83755d6a79e44b736c0d01540d95a693ef4d9beb6903ccaa3aa76945d319e5d1863b4834a
+MISC ChangeLog-2015 1300 SHA256 9aa3518cc5e198accecbd5b67ae1e26e061d984dce7022c386f0a409d8ab0bd4 SHA512 f2e21dcb71b69b9b9737cdbfd2044917bce09a3bc735d70e4e6aebb5aa5224342b5e9a051959215fafe2884ea62d6798daea4d985af9bbda9698be74dd10a8fc WHIRLPOOL 17e66411394f517f97ef53e517451eeb8ff5a461468116b48b5cebf12a074eaea360be2ed2c4ab87edaf69d96e0f80924633d97cf5bc455b978ddac6c6d59cc1
+MISC metadata.xml 405 SHA256 6ee99ed63a87826fa76206714596c540fed299f1dabd52a4bfd658a2b3d38ad6 SHA512 1f2c0cf7a01e344fb2cf327b9a6619ca6e9d67e6a6e7e1a191b86a788f11826e72e0f2b96333e1270c91e2692d0733ad0fb64671d8d778b236f9c1b00d7a55b2 WHIRLPOOL 9dd1c7901b316b54b2f906981792f0eaa6ae0081655c137f0968648ea34ac4b0700cc9eeb73df495e8e8eb62666cf70581e0831353d19bd9b1c93b05a7d9f8d3
diff --git a/app-admin/mms-agent/files/mms-monitoring-agent.initd b/app-admin/mms-agent/files/mms-monitoring-agent.initd
new file mode 100644
index 000000000000..df0a6b54badd
--- /dev/null
+++ b/app-admin/mms-agent/files/mms-monitoring-agent.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+logfile=/var/log/mongodb/mms-monitoring-agent.log
+run_dir=${run_dir:-/run/mongodb}
+
+command="./mongodb-mms-monitoring-agent &>${logfile}"
+command_background="true"
+
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+start_stop_daemon_args="--user ${user} --group ${group}"
+
+depend() {
+ need net
+ use syslog
+}
+
+start_pre() {
+ checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+ cd /opt/mms-monitoring-agent
+}
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
new file mode 100644
index 000000000000..153f98e5eac6
--- /dev/null
+++ b/app-admin/mms-agent/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>ultrabug@gentoo.org</email>
+ <name>Alexys Jacob</name>
+ </maintainer>
+ <longdescription lang="en">
+ MongoDB MMS agents collection.
+ </longdescription>
+ <use>
+ <flag name="monitoring">Install the monitoring agent</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
new file mode 100644
index 000000000000..af3f9b652cfb
--- /dev/null
+++ b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.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 user
+
+MY_PV=${PV/_p/-}
+
+DESCRIPTION="MongoDB MMS agents"
+HOMEPAGE="http://mms.mongodb.com"
+SRC_URI="
+ monitoring? (
+ amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz )
+ x86? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_i386.tar.gz )
+ )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+monitoring"
+
+REQUIRED_USE="|| ( monitoring )"
+
+RDEPEND="!<dev-db/mongodb-3.0.0[mms-agent]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_install() {
+ if use amd64; then
+ local arch="x86_64"
+ else
+ local arch="i386"
+ fi
+
+ if use monitoring; then
+ local MY_PN="mms-monitoring-agent"
+ local MY_D="/opt/${MY_PN}"
+
+ pushd "${S}/mongodb-mms-monitoring-agent-${MY_PV}.linux_${arch}"
+
+ insinto ${MY_D}
+ doins mongodb-mms-monitoring-agent
+ fperms +x "${MY_D}"/mongodb-mms-monitoring-agent
+
+ insinto /etc
+ doins monitoring-agent.config
+ rm monitoring-agent.config
+ dosym ../../etc/monitoring-agent.config ${MY_D}/monitoring-agent.config
+
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if use monitoring; then
+ elog "MMS Monitoring Agent configuration file :"
+ elog " /etc/monitoring-agent.config"
+ fi
+}
diff --git a/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
new file mode 100644
index 000000000000..e597d7f41fee
--- /dev/null
+++ b/app-admin/mms-agent/mms-agent-6.0.0.381_p1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+MY_PV=${PV/_p/-}
+
+DESCRIPTION="MongoDB MMS agents"
+HOMEPAGE="http://cloud.mongodb.com"
+SRC_URI="
+ monitoring? (
+ https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64.tar.gz
+ )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+monitoring"
+
+REQUIRED_USE="|| ( monitoring )"
+
+RDEPEND="!<dev-db/mongodb-3.0.0[mms-agent]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/mongodb-mms-monitoring-agent-${MY_PV}.linux_x86_64"
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_install() {
+ if use monitoring; then
+ local MY_PN="mms-monitoring-agent"
+ local MY_D="/opt/${MY_PN}"
+
+ insinto ${MY_D}
+ doins mongodb-mms-monitoring-agent
+ fperms +x "${MY_D}"/mongodb-mms-monitoring-agent
+
+ insinto /etc
+ doins monitoring-agent.config
+ rm monitoring-agent.config
+ dosym ../../etc/monitoring-agent.config ${MY_D}/monitoring-agent.config
+
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+ fi
+}
+
+pkg_postinst() {
+ if use monitoring; then
+ elog "MMS Monitoring Agent configuration file :"
+ elog " /etc/monitoring-agent.config"
+ fi
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
new file mode 100644
index 000000000000..f78ec8e3d749
--- /dev/null
+++ b/app-admin/mongo-tools/Manifest
@@ -0,0 +1,25 @@
+AUX mongo-tools-3.0.0-build.patch 528 SHA256 99ee6a119b3dd4145a088a9c581763f856f53c579f477b4e4eaaa8e7dd2c0f02 SHA512 9bf9e247f49a4fbc251ce878b82d457136b3ede890458afbd92b27a9f283e44e02bab92b2817cd1c3160a807ce8a7e6296e813f3573c2b733f2701fdb07323fe WHIRLPOOL 03d7330cb179111ed608929b15d2901258e8d1434ed9b28a1069a235498b32fb4ba165fb193635be1925236a83181659efd53514ef9a5c640bdfc6d5e4da05f3
+AUX mongo-tools-3.0.12-build.patch 626 SHA256 49cbafaf42c32ba91b08875f79afb27ec2f880ad01d34b28f32797393503071e SHA512 bd1374dc2e1ec0b0ef18fe47015519c1981b12decee47ff85544b6be7f721080e91ecbafc1c07eee4a43d733a2310ac1a001bb051e8981c11e9ede652c7bbc8a WHIRLPOOL e22101283f6d25f37c57f76e0bb4775b539aec48a2615e2e369fee813a3dabc3381f2882ee8101763ff33ee49e65cde598e1a28252efdbe1cec04fa94a1934f3
+AUX mongo-tools-3.2.10-pie.patch 551 SHA256 7bc79ceadc99075f0d9212e44d204f68819be5f822691cd74648c9f12040aae1 SHA512 9a309e8d4d3776fef5209bdaedf416f3a43d51ffacff8fa602dacc288b1413dfb7eeca2cbd88a976a1648161bd671321e8f333a6843ee0477ea41cfcad040d1b WHIRLPOOL 3ec4766eddfcea0df4eabe435ca3f3a1b9ca4a14f496bb5d2158a30ea8a61f2bdfb1c24cdb935b2fb8b3d43086d5ec1e73d6d6b2ec961e7b1eac07a6a405b881
+AUX mongo-tools-3.2.5-build.patch 609 SHA256 bfa434a2cd2cd9ccfccc80b8ae27ade024e1ab9409aec617aaec570e0c8fcfce SHA512 f2eb353a0981fca03eab0d44ed6adf7bcb4d6446ceaaf96499e254170679582981ad2f81c7dfe6ff10d783745d90c1b55bb7eb0efe1ddcf1c4ccb52b920efc99 WHIRLPOOL 9ca85953a94400dfb7665cddb9f18c75eba372831d76889b28494ef2c4a7add417814133c4a56f2fd47ee853cb62b07081de7a8261fac5ce906dac32763c374a
+DIST mongo-tools-3.0.14.tar.gz 2413148 SHA256 5a3f706827a9567fc98e2b64a33a2071c68c89090c6f135a508cb4e615051db1 SHA512 0e77417b2c36080515a2ff611427cb18f6d6c2432159c2a09af8d6ff14ae7f25ecbfe0a6631eeb7de084fdfe517a09364d731f5b63923404b6319fc1ca44b840 WHIRLPOOL 615153e87ea0b3cfd837066f850f92e7ea9c533e09bf6e3f4231ff489ac21a5a52a4afe06c827304e9340f9e8172714dae969c65cdd7215939a35c7026d60d98
+DIST mongo-tools-3.0.15.tar.gz 2413131 SHA256 9e1a936b42eff999a83afc3885faee0c64592ff43d3620d1b9d69d44b7d84d38 SHA512 b5baeea89f5287e055c43c58cfc31e4618df2b7b7fffd7d77248131daf503522b1d041253df8d3ad2ffa22efff344334dc05e3a3462cf7c646d4e83040bd95dc WHIRLPOOL 46c992dcc90fabe8f698e89a93232cc2e450a7dd560fb64a5f954b7937a98e298af8d4fa4bf626ccbcf96bef80743b6bbbb9d7e6fcb9b012dd8da68a1c382276
+DIST mongo-tools-3.2.12.tar.gz 2712079 SHA256 cda5e869b9233d591e91cac0b4c709a2e71dcabd9ac6bcc8b33d906ce3b13afd SHA512 66f7beb85a83ad6a217e65bba97ace6ad0bf84688f40e598e5fb1cf4bbe481b4069e1247d6829f8d06c8230d33c3e0c8bd8465a975576cad584065c361b6fb72 WHIRLPOOL 46123dc3c97fdf20ff94ac373e774932bd30aca677047fe3366653aaab269bf6d7e59cb420cf1e5716558fa959cb3649ee359cc27932bac276e6d24d2eea43b1
+DIST mongo-tools-3.2.13.tar.gz 2712076 SHA256 a855eb0141445e34ff3b01807b016467519c390fce79f3566000b5aaecb65d72 SHA512 caa0ba0f1452a16921c187cb407258326324b7222af91b1cd1b870ee2c9e6909d4fa94087a6da148a807f75b40f0bb97808a85804134d53cdab7970d8adf59f8 WHIRLPOOL e2fb38cc8a35ab7c9461f680a2bf0647b5cb5d1225978b7321e6c4227b02ae3cae93e5f2a105f188f3329b0f0f8741e9a0c5439f37196ca875b049d3a91836d3
+DIST mongo-tools-3.2.16.tar.gz 2720003 SHA256 1cd699f0e45b0b3afb0cfc7014258fb69e93c98e254ef9ef1605cd2de0b56d4c SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724 WHIRLPOOL 2d2855f578f15e9afd133f6b24b23bd5d6a20516c96f665581223ca1c9a472ead6634749db46b55a1351a8b63923531046ab83a262ec54f439ccf008cb854f9e
+DIST mongo-tools-3.4.3.tar.gz 4700637 SHA256 70348800ca4cc04a319ca414291d5359e7dc86c888bc8264045fbc4de00adab2 SHA512 ec754e8b19c517d9603e0eb89cc315e0af53886b74a905c0742faf5369af8b87b84cedf57aaa25f93068cd21370fa8a274a97dc3c58bbb4a50db6c2e4f0109d9 WHIRLPOOL 0b85fcdb52d5f08624bbcedb96d66c8a519e6415b9aefe68e7957627f3f1e220ca1174ea0a037f53ef2de0e594793ab42d6ec7db9cb42aa09b1892500dac5dd5
+DIST mongo-tools-3.4.4.tar.gz 4700326 SHA256 d14f4ce153aec373459c802e5a159661ccfde4e5df39d8d750586bae54896cdd SHA512 d49243e41bf3144264add3766a6f7016a07509a583a7368a639d85d2305500dd5afcfbc4449f3dcc8bec6e88bfb76ce021c813fe14169e3bd2476ed0db7c2d5d WHIRLPOOL 33cb527ce7df19e92871219aef9b38f16ae292a4d1cbdd7bb3a1c6ccc752687469b9e4309cc4fd540a65e623740e1ebe20f4bdf8629b50aab25d4ea84c2988cc
+DIST mongo-tools-3.4.6.tar.gz 4715189 SHA256 0b41ee2cb0a3d656f50ad950cc3853b41d5eb77a67ea0eb288f5ac80711ffc1d SHA512 ad1d3acee1969934e8f679d6407b3b55aba85fb99ea806463b7418494fac491ff68033f3e59b55e17276a4d28932c6b74398fffc89ab7c229cf69e5a4714c4a2 WHIRLPOOL 993be475af7b71a189f2b9f7c98e3f49d7ae8d05f99928b242efbd3dd504415394c7c812c4debed192ca0a856f16f9839dc771be8efb1db48b3359e48ea48280
+DIST mongo-tools-3.4.7.tar.gz 4719398 SHA256 8ff8c790108d3b858bb188f4cd45aedf3a1a9eddf3bd3f69627ecb35a0de2fb4 SHA512 974062e934ff2004c2ec1b55398a04dce542542c122577326e6120154e4887dcc772fa90b0ea5e7bc57124526bbb76b8935efa75080fed78da6c252e3e599f3f WHIRLPOOL 67a8e1ece75b1371df8da60780eb71db1f039912baa2f66d7cf0c79e863f5ce74a27131f1978578cebf47c3de66a5c9ef8227ce19d3a23effa40da05136ad3e4
+EBUILD mongo-tools-3.0.14.ebuild 1096 SHA256 a9dbbf69ad5ac87abf08f6a9a8e924f84d231e7d778cbdff77bca3d013fa1cf3 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f WHIRLPOOL bd3c3fd8b04f4287f7e13c4d601e8acd7e45516f19249637091bb51e9f753b4244c5950f6c97187a74d2198bd92bb48473ea7c99d86bea9f5598c18569cb9ba1
+EBUILD mongo-tools-3.0.15.ebuild 1098 SHA256 8a416f74a4b1e6052de2e61bb5dc9d2da7ed08234185f1ad68fd4c31a3f9f446 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d WHIRLPOOL ba72c9bdfa63283917b3b3f4d679d1f8963a774f6e0c6a8882bbfd7fb8ddaf4dc40da5a1705b3c6b885fafb8aeb5c65b35947b3dba145d795fbdeea1a38e4fe4
+EBUILD mongo-tools-3.2.12.ebuild 1198 SHA256 6b9e8e0845c66fe1133cb692f4fa94ac8c525826d17d112775fe268622555f0d SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15 WHIRLPOOL 15ecab23d754b3e87e5244df2c26cb0d9bb0f34542559e2ec887a7d5e50e412cb4bc52f4e7d2352a18efadd0e0e5b0301676a8cc70ea1fc59f03f61c8eb9796b
+EBUILD mongo-tools-3.2.13.ebuild 1198 SHA256 6b9e8e0845c66fe1133cb692f4fa94ac8c525826d17d112775fe268622555f0d SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15 WHIRLPOOL 15ecab23d754b3e87e5244df2c26cb0d9bb0f34542559e2ec887a7d5e50e412cb4bc52f4e7d2352a18efadd0e0e5b0301676a8cc70ea1fc59f03f61c8eb9796b
+EBUILD mongo-tools-3.2.16.ebuild 1198 SHA256 6b9e8e0845c66fe1133cb692f4fa94ac8c525826d17d112775fe268622555f0d SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15 WHIRLPOOL 15ecab23d754b3e87e5244df2c26cb0d9bb0f34542559e2ec887a7d5e50e412cb4bc52f4e7d2352a18efadd0e0e5b0301676a8cc70ea1fc59f03f61c8eb9796b
+EBUILD mongo-tools-3.4.3.ebuild 1265 SHA256 4e4c5c020e783ef48e93f439876060b2837a1a195155fc26af1e45829f6db9a8 SHA512 f3ce567bb5ba747c5e606b1b684b377525c47548d3742f158f715bd56a9f80e6424deeef77eae321dae2b529150a7251b71cc317b6cc3e1c1087e7c03da1aeb8 WHIRLPOOL 28c7e929b0d8b6fd40a51cd629767cbc5c2a859f1403648ab9bf2acde7ddb9d388131f85d0167c810c68b92a973f393802a0720d5d843823392581f5d0705b4f
+EBUILD mongo-tools-3.4.4.ebuild 1265 SHA256 4e4c5c020e783ef48e93f439876060b2837a1a195155fc26af1e45829f6db9a8 SHA512 f3ce567bb5ba747c5e606b1b684b377525c47548d3742f158f715bd56a9f80e6424deeef77eae321dae2b529150a7251b71cc317b6cc3e1c1087e7c03da1aeb8 WHIRLPOOL 28c7e929b0d8b6fd40a51cd629767cbc5c2a859f1403648ab9bf2acde7ddb9d388131f85d0167c810c68b92a973f393802a0720d5d843823392581f5d0705b4f
+EBUILD mongo-tools-3.4.6.ebuild 1265 SHA256 4e4c5c020e783ef48e93f439876060b2837a1a195155fc26af1e45829f6db9a8 SHA512 f3ce567bb5ba747c5e606b1b684b377525c47548d3742f158f715bd56a9f80e6424deeef77eae321dae2b529150a7251b71cc317b6cc3e1c1087e7c03da1aeb8 WHIRLPOOL 28c7e929b0d8b6fd40a51cd629767cbc5c2a859f1403648ab9bf2acde7ddb9d388131f85d0167c810c68b92a973f393802a0720d5d843823392581f5d0705b4f
+EBUILD mongo-tools-3.4.7.ebuild 1355 SHA256 95e12d4129508ba946e63aeabf891b91d56b1f1c6cc510a9608038bc777d8ac8 SHA512 1f3ff81d0b881f8a263c9123e423ce046e29a534c3f7c1c2b692fae94431b4f0577d3207713c85c96a5957a42b4a06f03790cbf06ee45e6722df7150e9d42f11 WHIRLPOOL 510680ce5664206519995f899d43b057f759ffa1f51caaae5fdb6a36c94fa91a0e168542b31b61081de180506e4068218ffa3050f6b7380ea78515e1e385ed8a
+MISC ChangeLog 6778 SHA256 67419d019092f17c196d88b08ce540dfbfcbc2c283104575160aa27f43e8a81b SHA512 32d9f723be0ecbdd273e4a02d3abe50ecae559d87a75cefc8e388fbf800e57f8a6febf24f1c89a6ad967f297b26536486c88debcb78e49f68f7db974d98cbfea WHIRLPOOL 4724a22b4094fd6e2d9359e216dbbcff2ae4cb58e635d2e4e944742c320729d86b723bf05171c1582fc57d3e8bdc0090a6fc4043dbd6cdefd94fe12ab222c896
+MISC ChangeLog-2015 1538 SHA256 0ae49eb6de51798bbcff51c815edae32e0d6a2d2ad46a628be66b8d37e99d589 SHA512 e25f1eac0e7b9ddd261bac753c524000f60dde396a49e4fc42b80694393dd40637db18a383dfdb70c865266ba4f2acaf663c5030fd934d0b0b93f756a59b19a2 WHIRLPOOL 29569a91b43b6cdd5168f3e3653922d03f0259eed281e2ac8700ae5b48793a8b9ae43a769ef7cec4273cbc5704b638861ad77cb78a40d32c838491d489d585c9
+MISC metadata.xml 463 SHA256 f87756607a753d0c92d913540dc84a81a660d71381fb3649db229eed96438172 SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc WHIRLPOOL a11c4bb4f310edefb2fec8bf3376a6c4ab58680aa6a8c275e7d7ec2b6d9a63752d771626e948b2aa7c2e9bc518a079b1fd201d98c36609f2e8b1e87d611ef57f
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch
new file mode 100644
index 000000000000..f7fd93b04a51
--- /dev/null
+++ b/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch
@@ -0,0 +1,10 @@
+--- build.sh.orig 2015-02-17 16:55:47.000000000 +0000
++++ build.sh 2015-02-18 09:22:30.671123198 +0000
+@@ -19,5 +19,5 @@
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+ echo "Building ${i}..."
+ # Build the tool, using -ldflags to link in the current gitspec
+- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD`" -tags "$tags" "$i/main/$i.go"
++ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
+ done
+
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch
new file mode 100644
index 000000000000..f3d881948679
--- /dev/null
+++ b/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch
@@ -0,0 +1,9 @@
+--- a/build.sh 2016-04-29 20:14:54.000000000 +0200
++++ b/build.sh 2016-05-17 17:22:50.830113156 +0200
+@@ -19,5 +19,5 @@
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+ echo "Building ${i}..."
+ # Build the tool, using -ldflags to link in the current gitspec
+- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec=`git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr=$(git describe)" -tags "$tags" "$i/main/$i.go"
++ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go" || exit 1
+ done
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch b/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch
new file mode 100644
index 000000000000..6a80d75b2cb9
--- /dev/null
+++ b/app-admin/mongo-tools/files/mongo-tools-3.2.10-pie.patch
@@ -0,0 +1,12 @@
+diff -uNr mongo-tools-r3.2.10.ORIG/build.sh mongo-tools-r3.2.10/build.sh
+--- mongo-tools-r3.2.10.ORIG/build.sh 2016-11-15 16:15:09.487441283 +0000
++++ mongo-tools-r3.2.10/build.sh 2016-11-15 16:15:23.127235064 +0000
+@@ -22,7 +22,7 @@
+
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+ echo "Building ${i}..."
+- go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
++ go build -buildmode=pie -o "bin/$i" -tags "$tags" "$i/main/$i.go"
+ ./bin/$i --version
+ done
+
diff --git a/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch
new file mode 100644
index 000000000000..31d94dd65cad
--- /dev/null
+++ b/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch
@@ -0,0 +1,9 @@
+--- a/build.sh 2016-04-21 17:31:22.156178084 +0200
++++ b/build.sh 2016-04-21 17:32:07.723421116 +0200
+@@ -19,5 +19,5 @@
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+ echo "Building ${i}..."
+ # Build the tool, using -ldflags to link in the current gitspec
+- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr $(git describe)" -tags "$tags" "$i/main/$i.go"
++ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"
+ done
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
new file mode 100644
index 000000000000..7a01cd8f7c90
--- /dev/null
+++ b/app-admin/mongo-tools/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>ultrabug@gentoo.org</email>
+ <name>Alexys Jacob</name>
+ </maintainer>
+ <longdescription lang="en">
+ MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
+ </longdescription>
+ <upstream>
+ <remote-id type="github">mongodb/mongo-tools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
new file mode 100644
index 000000000000..bca9db8974e9
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ # see #608292
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild
new file mode 100644
index 000000000000..221680a90f84
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ # see #608292
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
new file mode 100644
index 000000000000..1978809739ac
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.13.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.13.ebuild
new file mode 100644
index 000000000000..1978809739ac
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.13.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild
new file mode 100644
index 000000000000..1978809739ac
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.3.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.3.ebuild
new file mode 100644
index 000000000000..c631cc6fb835
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl libressl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.4.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.4.ebuild
new file mode 100644
index 000000000000..c631cc6fb835
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl libressl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.6.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.6.ebuild
new file mode 100644
index 000000000000..c631cc6fb835
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl libressl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e 's|go build .*|go build -o "bin/$i" -tags "$tags" "$i/main/$i.go"|g' -i build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -e 's@/bin/sh@/bin/bash@g' -i build.sh || die
+
+ epatch "${FILESDIR}/${PN}-3.2.10-pie.patch"
+}
+
+src_compile() {
+ local myconf
+
+ if use sasl; then
+ myconf="${myconf} sasl"
+ fi
+
+ if use ssl; then
+ myconf="${myconf} ssl"
+ fi
+
+ ./build.sh ${myconf} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.7.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.7.ebuild
new file mode 100644
index 000000000000..eb6528eb5fb8
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl libressl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+ dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # do not substitute version because it uses git
+ sed -i '/^sed/,+3d' build.sh || die
+ sed -i '/^mv/d' build.sh || die
+
+ # build pie to avoid text relocations wrt #582854
+ sed -i 's/go build/go build -buildmode=pie/g' build.sh || die
+
+ # ensure we use bash wrt #582906
+ sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+
+ default
+}
+
+src_compile() {
+ declare -a myconf
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ ./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
new file mode 100644
index 000000000000..354307902548
--- /dev/null
+++ b/app-admin/monit/Manifest
@@ -0,0 +1,12 @@
+AUX monit.initd-5.0-r1 798 SHA256 daa8159c5b0b7ef5a4e3b9ce7f86c7579d391becd11be92268c74f3062f9efe0 SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554 WHIRLPOOL 8d46a2fab56093c098e275a92dfe59cdf5e8daf9a4d7e9593816dfded735a657c886ed819f2a73073aceb94b47125b03df2225a5c6ebee083818d56f948ec4c6
+AUX monit.pamd 120 SHA256 02dabf0dd08f535538fcd307dc25cef22ccc60d16ada41e6b2d631c72150fb5c SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c WHIRLPOOL 677e654fc01dccdcb6541683efd37f2b0f17f24f1b79ea10a0882f23b605d15e9cd485e8a3fafa679555c6b21ad30c26f8eaf51f5c76309bc76512723f01b8e2
+AUX monit.service 226 SHA256 c7071a98916a1533c1ffb32dd7508bcd8f60a0458b83c7f1b672f65a7be00526 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88 WHIRLPOOL 053218a34c71a55a8fa732c72cba17e4100158ef6e931c9d4ede5185e470c51dbb93e68c47db2371e7ab29be55082b31054fc40512cda411683e694d22a84436
+DIST monit-5.20.0.tar.gz 1267991 SHA256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d SHA512 653cba9d63fad42acf8c27ee9c050d047fc78e0b7e8cdb0f3d0a533d5b5e01ccf1b82d443cb6518d286547087a021e37a59cbffedbb3daf49ff8f95e8c64b884 WHIRLPOOL 28f9fcfa86c346fb390654e4730cc52ce30b794b2dc1e02a484079b55a8bcb50d78a71e2e856f1ce1e161dc99bcd6913b4db92ed0deab64e969c5c6a464c584d
+DIST monit-5.23.0.tar.gz 1298472 SHA256 dd39fe3a379c02402ba9c44c201b3ba925ebdc8f04225918820607b6c5d56713 SHA512 6ca3de51c7fdb8a677feafb684dc459f4064539fe5501dfa53a2027bb7b1e6f6121b7fa593c9e373f009d2fd0eeca2b9dd659c337f056dfe769908a3aa7ec5b8 WHIRLPOOL 1d02ec6ca5152c9df3131e851354ae5af58f8526f7934184c5d4f423bbba9a620c70a6d2731336aa8862d4e33cf4bebdc9b7ef1d3950bea1b49caa2dd660ca88
+DIST monit-5.24.0.tar.gz 1352660 SHA256 754d1f0e165e5a26d4639a6a83f44ccf839e381f2622e0946d5302fa1f2d2414 SHA512 5260a1b543495c650e2e91ad38129c65253ce6649150e0e51d11b2902723cb7dd8e1a874c473bec3ba5b51721f2b61fdec92cf445f11cc217c1a6fcc0fab1a1e WHIRLPOOL 2d12934af302f084d4657e7a57f5dc19e76ac17c7aced46181806af12c1f214f2c1f37a7cb54c47e003f78a5d94f91d590bee69cd9669edd9501d977fe5305e7
+EBUILD monit-5.20.0.ebuild 1101 SHA256 b5d555b46808d7c7297d06562d67a8d38f10fc8e80bf9aaec65c54863117df51 SHA512 c49e39d635cff50eb1708ed61741b6200ae22646889af29a29a01d90bb51ba19e9bc81bf0b731e100369e8201def512753ee35dd352137991a1c6eb2032a9ef3 WHIRLPOOL 4919ef080bb5ab3cec2c5302a4742ad90d19fb2c7ae674fc2b8428bcc0e63412de76a22d41b2294d9a75f873512cce7fc17568b410e2d7d7c69827d8fb8380f2
+EBUILD monit-5.23.0.ebuild 1103 SHA256 2edec7d234574835261e91adc0ff6cd9d094043162c53ae7b2fd18eb877d7e5a SHA512 7eb7ae4428f7e82318cca3b2bcdf0b2760cd8f44f295b1025b8a29b1d1d725f294ce1e46af6403d016ab1ec4b8069e9b1007267e75efc9c4aed8e74a704c0d6b WHIRLPOOL 160bfd3bb2d49fc2a6efef932cb004c2f7bde00092480053985f1ba9332984424e650aa062f598203f1d5759c4e44a3295a0816bbfcb0c980ccbd7a61889012e
+EBUILD monit-5.24.0.ebuild 1104 SHA256 5445b58583a18dab8521e514f7c3140368c6ad9105bff84f2ea1d8f22d5ceee8 SHA512 bc900aa0e228505601343c5679bfdda306119a5790812bc10c88a5e4852be827b9d041fe1a390be1b82f64fac955e87e77929005450abb2351a5d937d575e8a6 WHIRLPOOL e833b558c9b9da1095ce88475945acc924b45777cc973226a6a0aaa1d6b5c3335683d869195ad2533bf204bc2da9ef6d7b2f42b3951566e12cd28fb54749f7a2
+MISC ChangeLog 7872 SHA256 fd6800eb1f8532e22be3688d0ae3cba634c6cbc7fca5cb3c8e01cc322a619746 SHA512 228af8eef0270ba2522f5301e4adefaa0a8db19dfef2d106b0bc30893406a24c55243efb92d243d56f509a332b765c7154e873fb95a9bcc1f036b8e12912dea8 WHIRLPOOL e4bf69051f556232e18ca8cc7d985cbc69f0dd75388babb2231e395b3ba3cbd20d5f5b64a77bd9683deaa42c91b8e768c1bcaf746726b965d3f5c0191be76d1f
+MISC ChangeLog-2015 13003 SHA256 39ea4bdb74b39b5ed02a9955bb31f5c0b9ba446899c4b34f8cb9fd7b8311de11 SHA512 8e7909dc91a1d19e67d11ad4739fce45105099d7d51fa96c9ec52628df21af5fe1e58ffeaf566036819aca32c89073147dbd3ad09eb9395694a5c001ecad3e44 WHIRLPOOL 053b5e858e4d2f1d08cba9cf298c43b8e8d56e0ecb82f351e5827f94f21f318feeb25ca755b0c02f7a4dd97f2e9e6ce963316db90387ee1f7986fd7d07bf4499
+MISC metadata.xml 275 SHA256 6b0d4319c37297822629bbf8f4a20097c86c8453fbeef458cd91cd10e2d0021e SHA512 1419507ecefa34dc331abc068e481d00ea0c6d9f90f767f281f679b00d4844d6a479c3969421c61583cf81d8e20da46745a9039d31a423fe416a33536737f40b WHIRLPOOL 51cdfebe45cbb4e5196a05bc0019816eb7d29ad06e94cf2c344b1ffc62d3b5ad040b56dd64492c1b67fddc198efd285df08ce4202e2ecc1a64a853139a565c2a
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
new file mode 100644
index 000000000000..4589cf41bfef
--- /dev/null
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+command="/usr/bin/monit"
+
+depend() {
+ use net
+}
+
+configtest() {
+ ${command} -t 1>/dev/null 2>&1
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ eerror "${SVCNAME} has detected an error in your setup:"
+ ${command} -t
+ fi
+ return $ret
+}
+
+start() {
+ ebegin "Starting monit"
+ start-stop-daemon --start --quiet --exec ${command} >/dev/null 2>&1
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping monit"
+ start-stop-daemon --stop --quiet --exec ${command}
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading monit"
+ ${command} -c /etc/monitrc reload >/dev/null 2>&1
+ eend $?
+}
diff --git a/app-admin/monit/files/monit.pamd b/app-admin/monit/files/monit.pamd
new file mode 100644
index 000000000000..6322e259c745
--- /dev/null
+++ b/app-admin/monit/files/monit.pamd
@@ -0,0 +1,4 @@
+auth sufficient pam_securityserver.so
+auth sufficient pam_unix.so
+auth required pam_deny.so
+auth required pam_permit.so
diff --git a/app-admin/monit/files/monit.service b/app-admin/monit/files/monit.service
new file mode 100644
index 000000000000..268825285d05
--- /dev/null
+++ b/app-admin/monit/files/monit.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Pro-active monitoring utility for unix systems
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/monit -I
+ExecStop=/usr/bin/monit quit
+ExecReload=/usr/bin/monit reload
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/monit/metadata.xml b/app-admin/monit/metadata.xml
new file mode 100644
index 000000000000..582e37e24b75
--- /dev/null
+++ b/app-admin/monit/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>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/monit/monit-5.20.0.ebuild b/app-admin/monit/monit-5.20.0.ebuild
new file mode 100644
index 000000000000..b3fe1c1e4950
--- /dev/null
+++ b/app-admin/monit/monit-5.20.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+ pam? ( virtual/pam )"
+
+src_prepare() {
+ default
+
+ sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+ econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+ default
+
+ dodoc README
+
+ insinto /etc; insopts -m600; doins monitrc
+ newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+ elog "Sample configurations are available at:"
+ elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.23.0.ebuild b/app-admin/monit/monit-5.23.0.ebuild
new file mode 100644
index 000000000000..17d2826d6bc8
--- /dev/null
+++ b/app-admin/monit/monit-5.23.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+ pam? ( virtual/pam )"
+
+src_prepare() {
+ default
+
+ sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+ econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+ default
+
+ dodoc README
+
+ insinto /etc; insopts -m600; doins monitrc
+ newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+ elog "Sample configurations are available at:"
+ elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.24.0.ebuild b/app-admin/monit/monit-5.24.0.ebuild
new file mode 100644
index 000000000000..0cbe43595233
--- /dev/null
+++ b/app-admin/monit/monit-5.24.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+ pam? ( virtual/pam )"
+
+src_prepare() {
+ default
+
+ sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+ econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+ default
+
+ dodoc README
+
+ insinto /etc; insopts -m600; doins monitrc
+ newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+ elog "Sample configurations are available at:"
+ elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/mtail/Manifest b/app-admin/mtail/Manifest
new file mode 100644
index 000000000000..b4d1f35c4b63
--- /dev/null
+++ b/app-admin/mtail/Manifest
@@ -0,0 +1,20 @@
+DIST afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz 40613 SHA256 180f45eb539726a14f04d9ce7d8ceebd782d20ff92d722df565bc4bc2bd92716 SHA512 eb97a0983ba2c8c063ce0f1e8f907095b10b5c2a06730acfe54a9835f8eacba2e5e1db3a1a9438d907c67b507c5a66056a6de22d86405d6b294c51b2543ba355 WHIRLPOOL f46931900bd3631c218e638e8512a249c0ae29f89bfd9637677de6afd8bcd95366c02e64865f4046f2238cc2663d1d2e35282f1845de14d6f460cb9a09b28414
+DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 SHA256 782e83c5384cb2e233b947ffba27c8d067f23fadf38b86f6df779c144425cc36 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab WHIRLPOOL e6cadc7272518d2ecd03e9b208b12500fe6b5bea6c490a22133b8021bd2befc77cce104d29c2ceb01f0b18e0f2eef44321fe61427c2834bc09ced956526c6f36
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 SHA256 ef225f77e38c3f071656a5bc529d7a66585e2ebc2b6149fa2bd4de1fb1ddacd6 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5 WHIRLPOOL a37d452661d3bcb35ceda79c1361a61a57ffa009a710f178f3ca1e57f99bd6255af70807a110f5a51cb50aced14519d1ca158fbfef92e582ffae2dfaab2e0e54
+DIST github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz 769752 SHA256 850ba7127a4beef90e5507f2391c2632907ad1ad2416691e5d95171d0d8b360f SHA512 91c2db2cb798fe0b185602e135b6acea6eaee1c5345581b14439197287ec2d7e9b9a57b951a6e033ff8c40ed8f8f4f8a8c5a68f29f25b048922001fa8290df42 WHIRLPOOL 612b9bf594f308f0b9f3b165270720ea4726d515956523c01531cb1c5cdad3d95d0acb261df74d63a80975c9f9e724efeb6bf59657598342690e4b284969955e
+DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 SHA256 4a125a94d8cf95b12783cc29b13fbb821d9e06a5fce2122b1920e81d4ca63bda SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45 WHIRLPOOL f2f3c0498056de625a0e3d33e6cee84723b2934ae788512ef43e119be22bfc437fa590eea2ea3dbb5d14bdb3769adad59910c320f900d8763a8a1cf5b4078f41
+DIST github.com-golang-tools-68e087e2a5786de2c035ed544b1c5a42e31f1933.tar.gz 2246337 SHA256 b4ce39dada9728eb174f86b79eedc47543b08baaa336734741519ab5028642cc SHA512 58b95d6f3ecb8f22355d8a29da50c13de1e9dc41be1e4e8fd01b3e5510df12c3837daa76390f7e223c45ccafe56f84c5fff606e46124f99159c902f334b530ac WHIRLPOOL a8bf9bd22113e37b8d45a776470793fae8df5b8963bbf51357027b26a9487e7a03b80380b3ef5fcedfad282a19effbd351fc4c696a003457af7e53e0fc6485ed
+DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481 SHA256 52b9de79cbe62f1776944b9d9fafb2a04a1d418544da5314499249ac49e8c7a0 SHA512 6e8ce6cc7f3e3065fdb3f53da9be99771e7d3981fc091bad6e6f436c44f7891838a879fc6267bc5349fc73a8c896aa1eaf7cb1b17fafb5d7dee39962b6269c6a WHIRLPOOL 64e97eab327bb50396619a5f4854ba6751f0f038456e369028a59c2181441b780bd6aee060348c8b2c4811d481346130794ac84f7319da4d55a138316e99e673
+DIST github.com-spf13-afero-ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b.tar.gz 42570 SHA256 42397f261fe74e713a81f02ef18dbe9944f59583e32befd3cb0d4604cdf10221 SHA512 f39c841114b3d9fb68ced40c9fb7ed86e8a6cc22f2cd7e151ae6d9ed13886536966f3ba325dc4a0a985ffacf47b8eee063db9b07116c190baccbc9e42dd62830 WHIRLPOOL 2186f0e969eca7c8ba863b28e6df118fff75f1b269bdc98b448c248b42a9c6c9a9dc044da41f614f838da5935315156408647e28e72615bae47b56d4d4a98224
+DIST go-fsnotify-1.4.2.tar.gz 29552 SHA256 4a1fd9beeb0496b9cf6084ac83654ece19188e9b2ffa041652d1071d4b225415 SHA512 fe76ac5f0fac2075a5436a726628ed9abf9a8668482c3b599977cf6167fc1334af738a907ce5bd627fa6b5ff4c4f4ac7dd7515b5f2892e74f32869b2a6c79944 WHIRLPOOL 99f79328c495702d3695a807aa59205eecc821f9f87d4fd2749c138aed9edcaec51f3d6178db0e731c9185b8b4d88796b3f049d6faebadacccc66ddbfe1577d1
+DIST go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 SHA256 ef225f77e38c3f071656a5bc529d7a66585e2ebc2b6149fa2bd4de1fb1ddacd6 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5 WHIRLPOOL a37d452661d3bcb35ceda79c1361a61a57ffa009a710f178f3ca1e57f99bd6255af70807a110f5a51cb50aced14519d1ca158fbfef92e582ffae2dfaab2e0e54
+DIST go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz 623731 SHA256 ad7d8aada5ae87a3cfbadb53aa61a1f02ad38d4bf4c3b85c6d68bee7570baab3 SHA512 a2cc30c19e05fa16e800679da933d842cc49e770e642ae8e49939a660fefe795069b5136a4d2b5fd4c094fd660e90f73a98d17c86503218c4f2f5c76fddf6722 WHIRLPOOL 057927a62e9c2bd7f859d78e9b586721927b17e224a22e36a725e6d32b497df3c4c1fa66f6094dbd6b46e2f19ca08117cd8bc6fdda6a0570204acc8a08645810
+DIST go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz 4521690 SHA256 7fe75acc63adb4ed62d8282ea0330efdece30630ecc1b9db14835c69bbf23136 SHA512 ac03833a836a4443a0f27a3bdb8701ca97bfed9a158b7f0a8fd78cf99325a10155cef0426c7a722abd739768a1a15e7e82f96690469aeb887743b5fcf37c3854 WHIRLPOOL f1edd92ab5be57dafa8c25b512863144f3b1c1014fa5a388e537e2f60f0abc467072524943ac2f37dffd3cd0f8f09ed484a089c08b172357e3a1e577a008887c
+DIST go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz 2195990 SHA256 9dbf9a4ea96b6d1c998bf2c3f088edf58b52aae19fda703c7da97454f1e29540 SHA512 397fcf06e4cedaa16de5009ba6b4a29cf2eeaacf3490e04fad265610ddf2159310e8cfd0661b3d75fc34ad1252c165cf490e61164de5dfd9ecd3cdd4e058f40a WHIRLPOOL 864fb2897681f89f4850ac4ae08528fbea0ac8fa00c2dc1402bb72937a855304e530bb8206aca3588317b156df7900abaaeae1e064bbaa41a9ef1a43067586e3
+DIST godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz 14683 SHA256 9945619cab949985701146582a58c929cb83dc4bf4de1192546f4f571b45f343 SHA512 8eb131c6aecf7d5691b2d35c53acd08b842735b029b6115bccc0e96a7a7441328603d618f810d1fe740254c71a1f01fcd3e7b2e85fbbb2c3eb9ec3ec9177bb1d WHIRLPOOL 8e87d36428eacdc89cce4f250c21e0ccd5df8b0d13e75b24386ea0b566501a83d82682d29894e73affee95bebe794a7781b0d1bb8c8545f63e02b4571943cd1d
+DIST mtail-0_pre20161108.tar.gz 382393 SHA256 ad2af0b87ec94be80c4d2291efa95c992f9464afb26dc759943ee494f0d7f47b SHA512 5eb60f57bf267730ec01a07d8bac1abb4b9454610ce52c8ab2acc59a04e36442cc4b570778f9a0eb249d3a85f21cacdc70cce203b28e57f84ab2ef533a5bc2df WHIRLPOOL 87f6bff48916ea9e289a144967ba8daff75a29fa8a1290b564df7d58c30735bdb9f7588fdcb22ad3fc3ab32b8129625270734dcb77876569119185c68daf5636
+DIST mtail-3.0.0_rc2.tar.gz 410528 SHA256 e2802250ad37e2fa4302aa28d479213233aa6bc2e522100140d594db788510d4 SHA512 95a1c88d0769f35ce9e9476aacb15f36a82f8a6a0e251e6f39ba97f11936f4d3b471be73d643d88afb51ef0b0f8d6b10555da9011f17381e00e397fe3911f3bd WHIRLPOOL a0bbe71d9e9d45ada1f593539d6f29da7e8f760c780ee4f47c5ea8cadc0e9380029782354450fa5795c9ef90b8aa2949d876317980a5cb025a6f08e7fb00af63
+EBUILD mtail-0_pre20161108.ebuild 2833 SHA256 de3fa06d9757bd3244e707da90b7b6f0f8d76965f1390c944e63d9c27ee424a2 SHA512 f7de1d84941632ef13ad82ce503727994ee8700231c1678d7c155e170e166fc69bb2b7d6e3c2f46300a359ba1618c70936264aeffde613bc4894a076eec69765 WHIRLPOOL a0ab01983333c8dc30f3f2d336d5bafb339d6413bc55332233b7b5b6cfd963242ddc88dc98db7b3bffcdbf5bfad959fdf6744aa07911ac634f87571bfe5db787
+EBUILD mtail-3.0.0_rc2.ebuild 1537 SHA256 6a6b6b9932067498e58bb7b92b5f04a1c4f2d9619366583e96ef2ce3b3a91010 SHA512 1913aa925455304cebfe6017a78a856df49035b86821f160f3f8c4fcd36ce5e127cc95e5b980c9ee98db60a9fba173313698b6366e19cbd80805282729fbb3e9 WHIRLPOOL 9dbe8de3f116b9c18bef9aea052e55ec925c820df50647d26c4d529da903d860baef0e2e2a3e026f6a2ffdcda57c5ae6e5646d336d948999898c06c5729773a8
+MISC ChangeLog 459 SHA256 1cca3b91bba8026d5a26dda341bcbbfa009c92c6f5d22399c00845cd78ab8c7c SHA512 23004aff4f6647731175b9bb745e6a6efeaa871f21f266a4232bbebefb41dc85568baf05c2064314366e1e7f79693e238686b0fe3e829f0b5c1f9bfbbcdc3ce2 WHIRLPOOL 15957e9c3e16c0bf08df66ebc760426264558073030d55a72bd589f00634e22598856df4b63aa0e72b017949374d9b0fa9d6f15b095beea9e60d0bdecefa3287
+MISC metadata.xml 295 SHA256 aa76681018b2b3292081d1f7369606f2cfab4eca416798687f66fe6a5aa743dc SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95 WHIRLPOOL 7d6f45ae9828265e3ff92226ba777a16b49ebd08b4756b79af4e1a8e32abf39afe79bd31b12c7f8e9b6bd49ab3a74ddafaefb4a050872db800229337f9ad20a6
diff --git a/app-admin/mtail/metadata.xml b/app-admin/mtail/metadata.xml
new file mode 100644
index 000000000000..4b625a3a0493
--- /dev/null
+++ b/app-admin/mtail/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">google/mtail</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/mtail/mtail-0_pre20161108.ebuild b/app-admin/mtail/mtail-0_pre20161108.ebuild
new file mode 100644
index 000000000000..175b8d7c05f1
--- /dev/null
+++ b/app-admin/mtail/mtail-0_pre20161108.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64"
+EGO_PN=github.com/google/mtail
+EGIT_COMMIT=a780a6342bd70a8fb8ffe187ef988d5417d43a96
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/spf13/afero/archive/06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz -> afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz
+ https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz
+ https://github.com/fsnotify/fsnotify/archive/v1.4.2.tar.gz -> go-fsnotify-1.4.2.tar.gz
+ https://github.com/golang/tools/archive/76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz -> go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz
+ https://github.com/golang/sys/archive/30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz -> go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz
+ https://github.com/golang/text/archive/b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz -> go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz
+ test? (
+ https://github.com/kylelemons/godebug/archive/d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz -> godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz
+ )"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://${EGO_PN}/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+DEPEND=">=dev-lang/go-1.6:="
+RDEPEND="!app-misc/mtail"
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ uri=${uri%/archive/*}
+ case ${uri} in
+ github.com/fsnotify/fsnotify)
+ echo "gopkg.in/fsnotify.v1|fsnotify-*"
+ ;;
+ github.com/golang/glog)
+ echo "${uri}|${uri##*/}-*"
+ ;;
+ github.com/golang/*)
+ echo "golang.org/x/${uri##*/}|${uri##*/}-*"
+ ;;
+ *)
+ echo "${uri}|${uri##*/}-*"
+ ;;
+ esac
+}
+
+unpack_go_packages() {
+ local go_package x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ if [[ ${x} == *.tar.gz ]]; then
+ go_package=$(get_archive_go_package ${x})
+ x=${go_package#*|}
+ go_package=${go_package%|*}
+ mkdir -p src/${go_package%/*}
+ mv ${x} src/${go_package} || die
+ fi
+ done
+}
+
+src_unpack() {
+ mkdir "${S}" || die
+ cd "${S}" || die
+ unpack_go_packages
+}
+
+src_prepare() {
+ default
+ sed '/^[[:space:]]*go get .*/d' -i "${S}/src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+ go install -v -work -x ${EGO_BUILD_FLAGS} "golang.org/x/tools/cmd/goyacc" || die
+ PATH=${S}/bin:${PATH} emake -C "${S}/src/${EGO_PN}"
+}
+
+src_test() {
+ cd "${S}/src/${EGO_PN}" || die
+ default
+}
+
+src_install() {
+ dobin bin/mtail
+ dodoc "${S}/src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/mtail/mtail-3.0.0_rc2.ebuild b/app-admin/mtail/mtail-3.0.0_rc2.ebuild
new file mode 100644
index 000000000000..266072615802
--- /dev/null
+++ b/app-admin/mtail/mtail-3.0.0_rc2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "golang.org/x/tools 68e087e2a5786de2c035ed544b1c5a42e31f1933 github.com/golang/tools"
+ "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+ "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+ "github.com/pkg/errors 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"
+ "github.com/spf13/afero ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b"
+ "golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 github.com/golang/sys"
+ "golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text" )
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGIT_COMMIT="5e6d38908091a8648c0f26c44ebd708e241f3814"
+EGO_PN="github.com/google/mtail"
+SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://github.com/google/mtail"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RDEPEND="!app-misc/mtail"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e '/^[[:space:]]*go get .*/d'\
+ -e "s/git describe --tags/echo ${PV}/"\
+ -e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
+ "src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
+ emake -C "src/${EGO_PN}"
+}
+
+src_install() {
+ dobin bin/mtail
+ dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/multilog-watch/Manifest b/app-admin/multilog-watch/Manifest
new file mode 100644
index 000000000000..d59b1aea7f02
--- /dev/null
+++ b/app-admin/multilog-watch/Manifest
@@ -0,0 +1,6 @@
+DIST multilog-watch 12291 SHA256 595b5783eeefc1b9bae0b674f5ad5c7e6c926b97733b072450d36b4f36a71c98 SHA512 e28933b005243261a9f92c2a3a19e15ac4da2c3a505422e3521f2f1888a6cf5cdac2ee1161449334d27f4a7669b1f266d6760f12641ecf066629e26c98fcd041 WHIRLPOOL c0cd6c1f233d75a14c4ea3ab97d50e0d7dc5924e838b7d5046ef41ce9036dd43462e73d4876e4de56eb3beeabb5ca366a6cc0e6b4ac9bb11032ebcdac240af6d
+DIST sample.filter 1041 SHA256 98a0a948c21dd19292117819dd0ac6ba0150e78210f3dbbabd6eb3a6e574a8ef SHA512 5164461010629f22c9c19d3341251d3723f5dbc02719e19f7f94c5c4154c0e246b365d9d555f88c9589c95b0fbeabb1408137d4782b1c360325460a008192ed5 WHIRLPOOL 89004a184a10599242b8f82352209a5a1df8db7bb89d0aec82f8b4014e4548f2200e3934713444f1dc1b1be0adb3bc455f326afed1920643295795cb406d5b86
+EBUILD multilog-watch-1.12-r1.ebuild 991 SHA256 214bd812bce55f90ba2f2c7bd58787baf4071ad241e0ba8d452ceddd9e90cdc2 SHA512 9eedc4f57f714517f4a04602214c87f64347e23ec0a73e6a9b74c98dedaa0be0a7470c5c28b16ea97417b20c336f62008b51a4456a63f39710c844452374074a WHIRLPOOL f433497fc3d8b32b86d12d44d3f4b2d69caa27d5c8e13d209659b19e81e56c2662863601e091a81306cce9c803acc3685a66ab9973a7c1edb87e881fb1efc242
+MISC ChangeLog 2542 SHA256 848dd03fdf7feb7f1c33c3d22490522a99f8a5305be1206a66e6b42c48981f85 SHA512 fccb5d6ba529f1c3f44117d23faa9067fda1c99baaef68ee6944e45655dfe983851c26eb460a31cc2171bde7a288d67d0d5355a019ef43856e607de9dd3014bf WHIRLPOOL ab0390f80f20ab04b9df6ef817def9ffc419b5cfd6844d0de1ca86362b773c29111c5547b9eef59956a1467536647258897f49d7b2e6ab130f5f78d180f5d865
+MISC ChangeLog-2015 979 SHA256 59f708b4449ef5f0a15005cf2ea630fc7b1a5293017f9eb934d6565132eec79e SHA512 c5ee47db6e27dd521e4a4c285ca80840ce7fc837caed3f2975ac571d283d3fd732da165bbfda3e9c32af71e79c3b5056ac93e266be47786b90acc8d7066b15dd WHIRLPOOL efd5c19f8e44cc02b1f44129341a3e34e50e1b0b1b73916b33103b8ffdd646a17fa064e28e993d6a039e155e950709c543a7c988f96961d7281a24040371d799
+MISC metadata.xml 613 SHA256 d68332cd9c75e7236b509af20f3a45e46b90604fb6f8b815427b71365230df9f SHA512 819de14285bb2c8bef1ba833e8e49ad7ed65034caecdf2becdfc2bfd5c9caa33ed8dc1c026d9c9a8ddffc125be8cc1f7537b9c1279415ced2f36777582099005 WHIRLPOOL 22f1b07226b555580d5cbdf47e53687c14ddd77892677084d13578d9e18f642e071a13a15aa52c80130f43ac8f04d32e4a06ba465c6836fe7ad011c5ce825051
diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
new file mode 100644
index 000000000000..e514910935bc
--- /dev/null
+++ b/app-admin/multilog-watch/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">This program reads logs written by multilog (part of the
+daemontools package by Dan Bernstein), discards any lines matching regular
+expressions in its configuration file, and mails the rest to a configured e-mail
+address. The e-mail is sent using qmail-remote directly, which requires qmail be
+installed on the system but which allows multilog-watch to send mail even if the
+local mail system is down.</longdescription>
+</pkgmetadata>
diff --git a/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
new file mode 100644
index 000000000000..a8298e04e6c0
--- /dev/null
+++ b/app-admin/multilog-watch/multilog-watch-1.12-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Watches a multilog file for irregularities"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/multilog-watch/"
+SRC_URI="https://archives.eyrie.org/software/system/multilog-watch
+https://www.eyrie.org/%7Eeagle/software/multilog-watch/sample.filter"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ virtual/qmail"
+
+src_unpack() {
+ mkdir "${S}" || die
+ cp "${DISTDIR}"/multilog-watch "${S}" || die
+ cp "${DISTDIR}"/sample.filter "${S}" || die
+}
+
+src_compile() {
+ mv multilog-watch multilog-watch.orig || die
+ sed -e 's/\/etc\/leland/\/etc\/multilog-watch/' multilog-watch.orig > multilog-watch || die
+ /usr/bin/pod2man -s 1 multilog-watch multilog-watch.1 || die
+}
+
+src_install() {
+ dodir /etc/multilog-watch
+ insinto /etc/multilog-watch
+ doins sample.filter
+
+ dobin multilog-watch
+ doman multilog-watch.1
+}
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
new file mode 100644
index 000000000000..3c63933828d3
--- /dev/null
+++ b/app-admin/needrestart/Manifest
@@ -0,0 +1,12 @@
+AUX needrestart-parallelmake.patch 416 SHA256 febf97d111bcafd51b6e4075038ea79fa92fcd82f963fc33a610b94f96184c7d SHA512 e00a0a8c5d01a5ff9f813e253090f094b89a278dfed68b0edfa3bc20fe71965f870ad5eba6259abda7c1ba1a7a411e4d3481959b503ed647670cf3d5ef0be89d WHIRLPOOL ab9aa9ae2297ea37ef75ff6a780f32bdca43ad0675129452a6e9d46a1618f3fac781247540da04c557ddff5a188b940ddabd1c22887e4055811a6b698294535f
+DIST needrestart-2.10.tar.gz 50602 SHA256 e2a9eff45d47d2c5e7c33102d204059bd493a4b950df15e01b37af7a2c084ebb SHA512 94cc4b898b3fadd4f5936133e8ce008fd79ce3e399c3343ab61308da59264f8e8301c3d1701fc0fa44478a94a6f518d73c09de708149a63fc3feb9dcd0f87a31 WHIRLPOOL 7b7eeecd92bddd326ced1671a04b50511279dacd04bcf33ccd0ceac1fd6f5eedbef388f70459789ee9dbb91299d3cbe4c2311e15a72d030be10aa546255d79b8
+DIST needrestart-2.11.tar.gz 52156 SHA256 5c7c322e551ae5de9442ac4915d6c9bc47303a22bc8fb234b953d4a158e65777 SHA512 e987ebafe77aba6920645088fa12e609b52f55edfd545ede1c0a93ee1d6b91ed3ea84cb8db69cd067aaabe8ba973b366da61301b5527ec176a29e3ba30605311 WHIRLPOOL a936b180037de8b804ed15ae44620aadc0dfc42d238207547832f42e7f8dea3784017ec1e517b7b22a0273396a26cb16d333358a80923dc2219c747c4129ebf5
+DIST needrestart-2.8.tar.gz 46420 SHA256 33b4f734335987557c68a8c57ea070ac4d23a249fa8675260f0bc28769056cc8 SHA512 2a6e5616a412039e9057a655208a7c55ed611d0deee5ba4c1d25563bb2610bcbf2b6d2534b906fd729db2eee5b3891fdb3fd3bc647f4d6aa06e2a87173b69be7 WHIRLPOOL 4f9daf45ca1a034d6476cf0b387174665d6bf15a4f36cb86e565d6b3715227bf8f7e27f6af422b1ef53c4b07a76d7b36eea0852e2db2a9032679ecc0b04bfc15
+DIST needrestart-2.9.tar.gz 49774 SHA256 812c9594a5a262524f354f2290d8f9cd623004b30222aaeb37faa8cc911bd89f SHA512 f3ed8c0312ec6ee40b7f74fb6a69eaec939c6af5d3a09fd62e59e426ac3fabd416db145eb3946e51f7fe53470c24aa8ccd3ad6aa1e5988195085456204153c81 WHIRLPOOL 577735033ad12178e6d1eafaa71a2e9f7d09eece84aa7970e19619767a823da9a6e872bd7e57fd2b0db5c6421f2690105e805c0450a3386ea92bc8b8625dc3d5
+EBUILD needrestart-2.10.ebuild 825 SHA256 774e8d45606dab4c79e62f3998e2ce051b14f90b7c17437ce6ab2eaf4abed474 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d WHIRLPOOL 5def6b4eb51fc95806ac60fef45819d3c102358a621ebdabbaff2d82ab0466ece4752e9758dfaeab0edff4d55dc7903ec7659db3be54f6256a4b5512c22bff3a
+EBUILD needrestart-2.11.ebuild 825 SHA256 774e8d45606dab4c79e62f3998e2ce051b14f90b7c17437ce6ab2eaf4abed474 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d WHIRLPOOL 5def6b4eb51fc95806ac60fef45819d3c102358a621ebdabbaff2d82ab0466ece4752e9758dfaeab0edff4d55dc7903ec7659db3be54f6256a4b5512c22bff3a
+EBUILD needrestart-2.8-r1.ebuild 910 SHA256 9346e34e17508dda736b03e8ae3876adbfdf505a07f9084076d358fe78a8f4b6 SHA512 ac53e9bb683a37355309bcc63544e887a38ee638d8d038d8412d6935a42196eebbc11b1572636c9312438a3b7f00a75a8f0f9543a38c70a48f16f5bcea09d695 WHIRLPOOL 0827050bc50284c10a1d2fa9ebad7095e5981b24bda22a46ec94567f02b39fbcf3dd7ed859d4fb0ca15253890fb4d3d41bb86dae4b9ab00567fb223ab3151e6f
+EBUILD needrestart-2.9-r1.ebuild 825 SHA256 774e8d45606dab4c79e62f3998e2ce051b14f90b7c17437ce6ab2eaf4abed474 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d WHIRLPOOL 5def6b4eb51fc95806ac60fef45819d3c102358a621ebdabbaff2d82ab0466ece4752e9758dfaeab0edff4d55dc7903ec7659db3be54f6256a4b5512c22bff3a
+EBUILD needrestart-9999.ebuild 825 SHA256 774e8d45606dab4c79e62f3998e2ce051b14f90b7c17437ce6ab2eaf4abed474 SHA512 feeeaf8e9f7644db79f63735677d21c14e9c047ee392b1ab342c7174fd701ad098d4c5d9e903a9f5a1d0575537261e5526970c3fe287320b5985c1b8aacd714d WHIRLPOOL 5def6b4eb51fc95806ac60fef45819d3c102358a621ebdabbaff2d82ab0466ece4752e9758dfaeab0edff4d55dc7903ec7659db3be54f6256a4b5512c22bff3a
+MISC ChangeLog 3462 SHA256 669ec22f62dccce1a1341e1467d4037c1f4434512ef76cdf6b8aad5d97c87da8 SHA512 62312154eeb86716234c300f9a01bac63c0685e661fec67117c46022a70c8c64a6b0f1ac50436b799d9745fd005a408bf167642c087f4951127bdd79db11d927 WHIRLPOOL 9257fec2e43097b305c54ee0bf308619de53eca36cd654f59a9a196da89744b4dd95211c99178cca008f40cdbdd5cf1c832e2b3214a0c4ece794e88e65e67187
+MISC metadata.xml 461 SHA256 55ac3904f4bb199eaf6531b39b3b6b21cc5fdf360d048fbb87086517fa4e7c4f SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4 WHIRLPOOL bed7b4f7693781cbe50982b926041059d1e4f04a24de7f9f3ef4edf311b5d885ea97a6cdd53d74ff72f2066916a7b63da6d1c7f6e66bb7136e6daafe579670f7
diff --git a/app-admin/needrestart/files/needrestart-parallelmake.patch b/app-admin/needrestart/files/needrestart-parallelmake.patch
new file mode 100644
index 000000000000..0a80de2deaf4
--- /dev/null
+++ b/app-admin/needrestart/files/needrestart-parallelmake.patch
@@ -0,0 +1,17 @@
+https://github.com/liske/needrestart/pull/34
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c432772..8cc2fe0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -64,5 +64,5 @@ po/needrestart-notify/messages.pot: ex/notify.d/*-*
+
+
+ mo-files:
+- make -C po/needrestart
+- make -C po/needrestart-notify
++ $(MAKE) -C po/needrestart
++ $(MAKE) -C po/needrestart-notify
diff --git a/app-admin/needrestart/metadata.xml b/app-admin/needrestart/metadata.xml
new file mode 100644
index 000000000000..c7f0a8e203d9
--- /dev/null
+++ b/app-admin/needrestart/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>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <longdescription lang="en">
+ Restart daemons after library updates
+ </longdescription>
+ <upstream>
+ <remote-id type="github">liske/needrestart</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/needrestart/needrestart-2.10.ebuild b/app-admin/needrestart/needrestart-2.10.ebuild
new file mode 100644
index 000000000000..c0f3cada3106
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.10.ebuild
@@ -0,0 +1,40 @@
+# 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="https://github.com/liske/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+ >=sys-apps/sed-4.2.2
+ dev-lang/perl:=
+ dev-perl/libintl-perl
+ dev-perl/Module-Find
+ dev-perl/Module-ScanDeps
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_install() {
+ default
+ doman man/*.1
+ dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-2.11.ebuild b/app-admin/needrestart/needrestart-2.11.ebuild
new file mode 100644
index 000000000000..c0f3cada3106
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.11.ebuild
@@ -0,0 +1,40 @@
+# 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="https://github.com/liske/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+ >=sys-apps/sed-4.2.2
+ dev-lang/perl:=
+ dev-perl/libintl-perl
+ dev-perl/Module-Find
+ dev-perl/Module-ScanDeps
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_install() {
+ default
+ doman man/*.1
+ dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-2.8-r1.ebuild b/app-admin/needrestart/needrestart-2.8-r1.ebuild
new file mode 100644
index 000000000000..b2fba417b368
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.8-r1.ebuild
@@ -0,0 +1,43 @@
+# 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="https://github.com/liske/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+ >=sys-apps/sed-4.2.2
+ dev-perl/libintl-perl
+ dev-perl/Module-Find
+ dev-perl/Module-ScanDeps
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-parallelmake.patch # https://bugs.gentoo.org/show_bug.cgi?id=588216
+)
+
+src_install() {
+ default
+ doman man/*.1
+ dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-2.9-r1.ebuild b/app-admin/needrestart/needrestart-2.9-r1.ebuild
new file mode 100644
index 000000000000..c0f3cada3106
--- /dev/null
+++ b/app-admin/needrestart/needrestart-2.9-r1.ebuild
@@ -0,0 +1,40 @@
+# 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="https://github.com/liske/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+ >=sys-apps/sed-4.2.2
+ dev-lang/perl:=
+ dev-perl/libintl-perl
+ dev-perl/Module-Find
+ dev-perl/Module-ScanDeps
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_install() {
+ default
+ doman man/*.1
+ dodoc -r ex
+}
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
new file mode 100644
index 000000000000..c0f3cada3106
--- /dev/null
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -0,0 +1,40 @@
+# 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="https://github.com/liske/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/liske/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Restart daemons after library updates"
+HOMEPAGE="https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart"
+
+SLOT="0"
+LICENSE="GPL-2+"
+
+RDEPEND="
+ >=sys-apps/sed-4.2.2
+ dev-lang/perl:=
+ dev-perl/libintl-perl
+ dev-perl/Module-Find
+ dev-perl/Module-ScanDeps
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/TermReadKey
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+src_install() {
+ default
+ doman man/*.1
+ dodoc -r ex
+}
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
new file mode 100644
index 000000000000..dbcb574dfbc2
--- /dev/null
+++ b/app-admin/newsyslog/Manifest
@@ -0,0 +1,6 @@
+AUX newsyslog-html.patch 589 SHA256 5f6a1da31ab1bc99d33e06953ba9d9f187f8b4437e406bd16e112d55fd2b85b3 SHA512 361a95cd0c8bf3b833546cf0c11168744ae0a611704f67619127073249452844cbe02d38acb04a9fd73ec178bef54d290eae69d2097d3d1083817f4d28b0a89f WHIRLPOOL 6eeb2ad2d8ca2d9b42c992644302a18eeb532f81c3dac91b4c3a99605746d3462d83d70cdd82d246b71663173ebba3406e741b8b58d5f45af6a908dfb269bc60
+DIST newsyslog-1.1.tar.gz 156371 SHA256 99804e21041d5dca7898773df25c1ce0ff030e9654f32e06b86bdabbdeeab3f2 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1 WHIRLPOOL a84554d9a06aad7ce93239db119e417557d115c3043c5ca320c086e8f0e1f33511a1b8db95cba29489045ae1ba27318c7df7f0a4960e4c5d6ebc793a39b9c296
+EBUILD newsyslog-1.1-r1.ebuild 938 SHA256 30d3a23f993c8ae6db96bb5e65ca784a851663f4360e8be88144a0dafff28635 SHA512 0be03e1757e7acc5c1ec779f2585b5ac827ea648a5be8424f3fe353fad5dd49b168b63d1d36772ce074541e1e6064d2c7b5bd32142558c403a21ee25718d9dde WHIRLPOOL 941aa55f28b52beeb9bdb7b88985842cb3bda940edea69aa558b96b6b7cf692d64759e7efb1fc6503c421b62f9ea307b0f8f18f7bedfdba5dcd2c02b9d07e23d
+MISC ChangeLog 2554 SHA256 dc2c030fd58ce1e9ac53d1a47d00a4dac7587dec7ff0962ad37b88c4a7f52e6f SHA512 930116a1db62504a605ae925f1e61db53cfe8c674bc81cc3bef4273b18b449e621ae03d41ae63650ff1868da287a5761fbbdde8f9e0a84d7d96f664605642e25 WHIRLPOOL baa1c54bd861113dfb7c7cbfedf1f1abcfc6f78e2bbc40ccd7eb44a6dc9695eb5e2c2fd0dd8e2148cba116cd4f6281d3b52ec371d8f57d05ca5c295aa5379062
+MISC ChangeLog-2015 2637 SHA256 87e53c48120ccc4c49d33ef60a3e5d0a6982921f6b87ea864024d9c9e2837dc9 SHA512 d94ce8cf7d91ec18eb593a7d433c3bf6a293a74e03dfd2364e2eee32c4633241cf7ba2cf7679554c24aeb6a619a58745ee35bd5bc0e831ebb99b8f524de0b18f WHIRLPOOL 3f29503b6070b71922084b02c2bf0c0de2f4396529ffb08c0a2827684bdd495b7eb0a7b32f046c60eb581a08e15c62ee92c90763a9804f8f1946df6c4b99ee73
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/newsyslog/files/newsyslog-html.patch b/app-admin/newsyslog/files/newsyslog-html.patch
new file mode 100644
index 000000000000..da04fcd5afbf
--- /dev/null
+++ b/app-admin/newsyslog/files/newsyslog-html.patch
@@ -0,0 +1,21 @@
+diff -ur newsyslog-1.0.103.orig/Makefile.in newsyslog-1.0.103/Makefile.in
+--- newsyslog-1.0.103.orig/Makefile.in Tue May 21 14:08:11 2002
++++ newsyslog-1.0.103/Makefile.in Sun Aug 18 22:06:23 2002
+@@ -591,7 +591,7 @@
+
+ .8.8.html:
+ @rm -f $@
+- ($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++ ($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+
+ .5.5.ps:
+ @rm -f $@
+@@ -599,7 +599,7 @@
+
+ .5.5.html:
+ @rm -f $@
+- ($(TBL) $< | $(NROFF) -mdoc2html > $@) || (rm -f $@; exit 1)
++ ($(TBL) $< | $(NROFF) -mhtml > $@) || (rm -f $@; exit 1)
+
+ .cat5.cat5-dist:
+ @rm -f $@
diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/newsyslog/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-admin/newsyslog/newsyslog-1.1-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1-r1.ebuild
new file mode 100644
index 000000000000..fcfc293004cc
--- /dev/null
+++ b/app-admin/newsyslog/newsyslog-1.1-r1.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 highly configurable program for managing and archiving log files"
+HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
+SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha ~amd64 hppa ~mips ppc ppc64 ~sparc x86"
+
+DEPEND="sys-apps/groff"
+
+RDEPEND="
+ virtual/cron
+ app-arch/gzip"
+
+PATCHES=( "${FILESDIR}"/newsyslog-html.patch )
+
+DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
+
+src_configure() {
+ local myconf="--with-syslogd_pid=/var/run/syslog.pid"
+
+ has_version 'app-admin/syslog-ng' \
+ && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
+
+ econf \
+ --with-gzip \
+ --with-newsyslog_conf=/etc/newsyslog.conf \
+ ${myconf}
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ catmandir="${T}"/dont-install \
+ install
+ einstalldocs
+}
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
new file mode 100644
index 000000000000..bbcc5beef261
--- /dev/null
+++ b/app-admin/ngxtop/Manifest
@@ -0,0 +1,8 @@
+AUX ngxtop-0.0.2-py3.patch 1816 SHA256 f243c9ee394aa2eb27ee96b2273fe6b23540d2f22e05e2663f3b38f78ecbd664 SHA512 47127c5ba26d0d6319ca74f21370bf01ce3a74676066bf7476f862de8165c2d62d90e5cad1cb2369e5743db4fa51090e8bdf59da04f9dcfafec62edc44122f8f WHIRLPOOL dcb7c3793adce9bf0f88079b6b2b4619191c71c70054570e278b0780beed48f6c769b392b75c810341b4e7ea400b5c326492c3e2f0610096660f2dc13dbe9001
+DIST ngxtop-0.0.2.tar.gz 9668 SHA256 3f98dc160a6b7ac1dd0b34bcbfb1a2f4ddef9a89337b2f6f75f173cafe1959d5 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43 WHIRLPOOL 3d844acfb7e47db2e45f57175b7020127e179be108c1fa1020675daec8ad7da514a9f919f6937f34e1787b172b0b203fc10e83b10cd4b18c4b99fc424e64a4b1
+DIST ngxtop-0.0.3_pre141201.tar.xz 9012 SHA256 b1df55b8874011fe009f58039c9dee1bb13092ba98609b292bb007d5482cc634 SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde WHIRLPOOL 4c2c3fd7d0db9ddd177f5895604cedc7c1ba8799db2e64d58484ae0b935d574bf51c7ddeac12f46e56de062a471619fc1ce96ac4f3d4b13b0a2b33060898e730
+EBUILD ngxtop-0.0.2-r1.ebuild 651 SHA256 33e6767e3fc2760b074173e4f891548dea1d75695c27dd4e8019831f002ca640 SHA512 77bad90097cb535f8e610a2498ec23e6c665adb943d7df7dfc1a20be8b938aa43fea0e295f97fb3219716c2652c9bddb33059f4df2c4dd6b4b2f50b33c7f2d99 WHIRLPOOL ed79c7f62d029f4033ad61667fe817bb4063ffc69ae4c6f403963caf7d1c66e21f91e18744c87da447ddd221a3ed155511235a9a7eaeff472363bec5cf5525ef
+EBUILD ngxtop-0.0.3_pre141201.ebuild 728 SHA256 eb3513680d5c5ed1ac6d2943c947bc9eea29a0fc21e3afb2a99c7f128b81e56b SHA512 b857066578c5c46f2bcbe0413f11e0996e0e4a9fdd932d3c2ebf9e4e24a9e003f54237b884d8b9588fd8d37ae21485476c4d7053c3c4bfcdb380e3f69809887c WHIRLPOOL e5b83892585e2cc99a54ea7df32e8ad8e4b5620c98e0fcec3476ff8cb13cf1dbdb1ecfef3434cd565abb1d7e85785410faf49ae8f19642310074a3406345e84a
+MISC ChangeLog 2737 SHA256 c8068277a4aec1d75895b405392cea342453598faca147103ace9dede4660491 SHA512 7fb355c6f76161a3dd5f87a8e32a405ec363c85b5fba91007d4830fc9eef4796c3dc063a2c7bade33172acc5b8c73885d72630e235fac033e11de989a25736a0 WHIRLPOOL 9086b6903581cff8d396e87929835ac0ce8563d865f073bd7ff8dabed42761784e2d1b9bbf9bcc44b867133bf3090e4ed58b9ddca7e501d77f9231bc23deaae4
+MISC ChangeLog-2015 1200 SHA256 7b2c0d0a1c50dd300d2ec4d2e504f500114a2c172056481aefbb531e8ec7891b SHA512 b68f60bf8d45a496fad79bcb5ccad099ea7bac1f239d0440f59d49f61719a36122931df143ee1fff68c439ac80486034129d31e7fe5b9afa527ab826865e5028 WHIRLPOOL 5d90c446e862a305466f15077604806dda0f5c1c97097a65cd3beb885dc0da9d1e360f7b30a89bb107bca14c6f24267905f08093363ca8302837f34dec46f703
+MISC metadata.xml 250 SHA256 8f9da03ca96e19696ab30c9af17c5f3152ce7e920a5bab7182f4f451a2060558 SHA512 3b834414c779d9155f38a0bddf7949a53b43da55fdffc52b32e1dcd1a666d3262187571cad366b89fc5985471e8ecccc7e241c497cf6104a31e83d4b0d555d11 WHIRLPOOL 4122f3ccf5ee7fb4843c86f64e9f9077d17fbcdb5ef12ddac57ae935ada7fa5d23cd2331612162b22bd74393452fd794270b29d8effe5d9ce361ddfebc5172ed
diff --git a/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
new file mode 100644
index 000000000000..b86361584798
--- /dev/null
+++ b/app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch
@@ -0,0 +1,45 @@
+diff --git a/ngxtop/config_parser.py b/ngxtop/config_parser.py
+index f6999cf..7c0d79a 100644
+--- a/ngxtop/config_parser.py
++++ b/ngxtop/config_parser.py
+@@ -106,7 +106,7 @@ def detect_log_config(arguments):
+
+ log_formats = dict(get_log_formats(config_str))
+ if len(access_logs) == 1:
+- log_path, format_name = access_logs.items()[0]
++ log_path, format_name = list(access_logs.items())[0]
+ if format_name == 'combined':
+ return log_path, LOG_FORMAT_COMBINED
+ if format_name not in log_formats:
+@@ -115,7 +115,7 @@ def detect_log_config(arguments):
+
+ # multiple access logs configured, offer to select one
+ print('Multiple access logs detected in configuration:')
+- log_path = choose_one(access_logs.keys(), 'Select access log file to process: ')
++ log_path = choose_one(list(access_logs.keys()), 'Select access log file to process: ')
+ format_name = access_logs[log_path]
+ if format_name not in log_formats:
+ error_exit('Incorrect format name set in config for access log file "%s"' % log_path)
+diff --git a/ngxtop/ngxtop.py b/ngxtop/ngxtop.py
+old mode 100755
+new mode 100644
+diff --git a/ngxtop/utils.py b/ngxtop/utils.py
+index ef61072..7bd9a2a 100644
+--- a/ngxtop/utils.py
++++ b/ngxtop/utils.py
+@@ -5,6 +5,8 @@ def choose_one(choices, prompt):
+ for idx, choice in enumerate(choices):
+ print('%d. %s' % (idx + 1, choice))
+ selected = None
++ if sys.version[0] == '3':
++ raw_input = input
+ while not selected or selected <= 0 or selected > len(choices):
+ selected = raw_input(prompt)
+ try:
+@@ -16,4 +18,4 @@ def choose_one(choices, prompt):
+
+ def error_exit(msg, status=1):
+ sys.stderr.write('Error: %s\n' % msg)
+- sys.exit(status)
+\ No newline at end of file
++ sys.exit(status)
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
new file mode 100644
index 000000000000..6352c64cfc66
--- /dev/null
+++ b/app-admin/ngxtop/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">lebinh/ngxtop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..e187ef559f43
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${P}-py3.patch )
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
new file mode 100644
index 000000000000..6bf6aa1b02f1
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
@@ -0,0 +1,28 @@
+# 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+#SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch )
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
new file mode 100644
index 000000000000..d3b4aae4cd5f
--- /dev/null
+++ b/app-admin/openrc-settingsd/Manifest
@@ -0,0 +1,5 @@
+DIST openrc-settingsd-1.0.1.tar.xz 243552 SHA256 2047267982c716cbc113d76d826f9b694706dbf737273eaaab239f6839d9ade2 SHA512 1f04a4b078a5fb659573daec0962f819af7eaff17a6213c4881726833cf32becd71dd820cd63767e2933465df26b3e4a3475d94f23e203a6977298965c709b21 WHIRLPOOL 5db609b67f1bdc8d1e5ccb4a3efb2b3f2aba18695ed824a667e95887a7a3977db145266926dd953cae7f3f961cb0bd30fcd89885ced5618d21af6386f927b83f
+EBUILD openrc-settingsd-1.0.1.ebuild 1318 SHA256 2140994902d44f7906942e89c8de398f6766893c2fb18f9b6d5b1e849fb8cedb SHA512 8bd54bc1ff1f1adc6020224d58c72833c2f804f4d1f1d43f38664b52bc3e08fbf37c8c65517aea089f3acb4a5f1afa895aa60e61a8d6da26c19330e0f562b7b6 WHIRLPOOL 57ab280dd6e92c649c0cd2b856ba0acf5fade102663f7e873e77d1e0034925f353a7049dc9abeed00286a323e715735abb86d707cfd461298205063d0ed0995c
+MISC ChangeLog 2724 SHA256 5dc526d7c5e6da8a6fb1d3ca54482fe1c603ec22cbef09e2910143d5b96f1e41 SHA512 411160c3cfd66a8e044e4ac8dcee1f3d5769d1514568ccba34f1d948acc8d3132c53bf20dbc4411ef6462359b52dcc4f8b27ecc9df137b7df892ce83c97e088f WHIRLPOOL 1039e1bceb78a44aa104fe3054b924b036fd05bd125bcb5ec2035468ce88e51a10229dc3710c33e52dade0e064cd1b2dd97e19e658c88a604551f84eaa69c1b4
+MISC ChangeLog-2015 1774 SHA256 5903f88344874344500ea54a2896d8740cf3eaba98b7f33e0dfab3d2f9936db7 SHA512 db5033cda341b9b76703dc47fe525d09d5a25570ca2374978a5fab70ca5ba46cd2aa1e4c52f39a53040ce0e5598a875be0c06a0f6d430899ff9d1fc3d674bd27 WHIRLPOOL 3d9e6a9d7ef43bc155ae242c4970fc262360db0005b28aefd0f854ae220a81dd6cc2d5234ec176d5fa1616e7a4cd41fb53c52432879a5e56b38902aeadbb25dc
+MISC metadata.xml 488 SHA256 0d431458e100f0e69362d7bca16b6ddfee01be2e4a2df11737d1518fd68ddd0c SHA512 0e73f3f4231bebdf2c317d2737782e35e66cd08aead5b8192211857842d9c5d8ff62f6d0654940daccd444dc6884ecdcb2c4ffb0aa51bf999c09cacb3af1be15 WHIRLPOOL b06f50a7f21010aaa8ed2edb5a56de6b037dd840f981d7af5f7633133ff66b67e2318632c66b22ee3db227ba1a108064861c4fb827938eca2011a22c7481ead8
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
new file mode 100644
index 000000000000..fae0fa87a25c
--- /dev/null
+++ b/app-admin/openrc-settingsd/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>tetromino@gentoo.org</email>
+ <name>Alexandre Rostovtsev</name>
+</maintainer>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+ <flag name="systemd">Use the versions of dbus and polkit files provided by
+ <pkg>sys-apps/systemd</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
new file mode 100644
index 000000000000..239c59db23ab
--- /dev/null
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="https://gnome.gentoo.org/openrc-settingsd.xml"
+SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
+ dev-libs/libdaemon
+ sys-apps/dbus
+ sys-apps/openrc:=
+ sys-auth/polkit"
+RDEPEND="${COMMON_DEPEND}
+ systemd? ( >=sys-apps/systemd-197 )
+ !systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )"
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ dev-util/gdbus-codegen
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
+}
+
+src_install() {
+ default
+ if use systemd; then
+ # Avoid file collision with systemd
+ rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
+ fi
+}
+
+pkg_postinst() {
+ if use systemd; then
+ elog "You installed ${PN} with USE=systemd. In this mode,"
+ elog "${PN} will not start via simple dbus activation, so you"
+ elog "will have to manually enable it as an rc service:"
+ elog " # /etc/init.d/openrc-settingsd start"
+ elog " # rc-update add openrc-settingsd default"
+ fi
+}
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
new file mode 100644
index 000000000000..7b3d78322731
--- /dev/null
+++ b/app-admin/packagekit-base/Manifest
@@ -0,0 +1,16 @@
+AUX 0001-entropy-PackageKitEntropyClient.output-API-update.patch 980 SHA256 4fc2b5a8b57970e9ceecc93fd6ee15cfc4991ba528efb7d101e991ee15698a10 SHA512 ea801f71cbffe6dee1375663e616a0b8ce8cbbe408806a084fd5aa8366a5221147650e3e56bcf9f04e035f3e9556d5220c8c0b63de15404e427da073c5a909c0 WHIRLPOOL bac5be531218b6075a74819fdf03053226ad208604e5f47f5f6db1e246088b8ff7f5f7eca5adc780dbd372715288feb9f7b9ab7127373ca090d08ed83931d1c3
+AUX packagekit-base-0.8.15-qtdbus-annotate.patch 558 SHA256 4d8f88ab0f5e5f08c6b6d8f72b57b5de46e809ed879c3a6d25a7ce94ce167bfc SHA512 184d2d2a1d8abeb18bccd3aaa4494d5813b384b4529a2a2da270a22040fd7cdf210b86e9c2447d189e75db77c306d9c113c9ccd6497a95426dcb65af9c93df25 WHIRLPOOL 114c0509da7fa98cadbff05def2a6206839d99bb81e496c584edae45536dee7ac4286396a6fbb673bb27590e6768799f57c17882f5f99b2b9867bfc97296de7b
+AUX packagekit-base-0.8.x-npapi-sdk.patch 473 SHA256 49d0f5a223bf3b44b3d07dc2dfcf3403837b4a59d15ff2e990363bfec84f1813 SHA512 485c4d6f202ecc15d71530e4805cec18a564cb76db7b0455543949fc263f1f76bf25132f7e0443a081aef965c5579ee3f46e438a96d757ad1f6d264e8a3b01c2 WHIRLPOOL e6a39470d68242f8e2caf9775c3612d300240efc658e106c50f8eb1e19a02f2a445cf1c8e14903a6fcebc773fd6d83497187bafef50bbc45a0297619d2e3c596
+AUX packagekit-base-1.1.1-cache-qafix.patch 469 SHA256 c5fe7593cfdbb3825573a0d8fe04ab78dfa04ade59eeecac78e8b5f649f5d468 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424 WHIRLPOOL ffc5d382eb5d331f87f1d5998573a6eefacf7746be95ce5364b13770768abef4986f152d88e3f921f8bc398e6a82bdcedf17890dd9d05c60fdc62d06727e4c96
+AUX packagekit-base-elogind-support.patch 5850 SHA256 1db41507b689667dc2cbc7f022c8784169b994989cfb57f7e1b26455d2d17090 SHA512 2494c80f7d6b20a9b55f18af8f111134e06d39dd140429da70cd90c36abe73c5b1b002efe79463d0e74cffd2653623473b6bf42579bc69525bcd10c268d41b4a WHIRLPOOL ef254db7cf69148f4ec37dfb42547fd90910316d3dcf58cacfb025d360bc9ed85d65cccfeb10a5b33bb91c2af45fb1e1164ad5e990dc6855ae78f93fd4886233
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
+DIST PackageKit-1.1.1.tar.xz 1410632 SHA256 483348a54c92419d713a8a153926ec6e1ab70ba64ae4afd3f0a6d63d10b1cac4 SHA512 caf9b67f71a36479d32338c28343671e9586aade7a0f777b867772ad8da8e3206bf66a46b2fa2cba8f0f48af27db3888b68e336707db6f76c5e0dbed464e2874 WHIRLPOOL 0a09233580b50f391931760960c3fe8a644797b24c15a79d56bdbfdadde835856f81175e209ad6877c49387c946c8765418eef28fc1fd188eb5d5d5a383fd1ad
+DIST PackageKit-1.1.4.tar.xz 1424756 SHA256 0ae89f7c381b7def41960f690f7212cf80f7f6bfc9055ce8d0c84aa45f120cd9 SHA512 fc04d58c46f7e7dbb1386d26627ea246b5f21b8483862788bb734b8a137e4cb1d41de0f471b46f6d649e29337f9605acba0568a845577b27a2ac0faaf391b187 WHIRLPOOL f76a446eb64721cb718fe250d710aaf4e0d801bddb44835a7a0327ed250150928d717bb037d23c758eb6bfb752b77aea4bb5a14c8df58b964e008f2260e45736
+DIST PackageKit-1.1.5.tar.xz 1418292 SHA256 50f448ced5b460bd79ba0c97e9fe080153eaeecad909eee108284e3f5fc7b70c SHA512 ecc6a4d39caa0a7ea2047f52f95980b23e61ae200e27559326f03302b1c0d798f9cbae53fcf2d397dca3d54e52f143e2e7aa4e3f0b2df8c39e53bd2993e86154 WHIRLPOOL d21df70793d316ffd045f9c4b06f0e31015cf659e9f3679cd96dbdaf3acf22e030446030f2c5a589f87b351b8a191dda7614bb63462a9e1017bb9ae11fcfdbf8
+EBUILD packagekit-base-1.0.11.ebuild 2897 SHA256 3475a9adabb119fb6c0b8347090a31319c46db7e2cd24895982fbe4bdfc0f86a SHA512 40f13d99bec2493be551c2bae8d34789f1155c57d5a01b5f5964f18e6124894ab31d72532d481d136175d37979752e8926d91b44bdc181d47856725c19727c33 WHIRLPOOL db1e0bb090d5b16c54536b1eecd243b9a73d816ebf4783d15274ecd1485d04e092acfb37d59fde6880ff7b821c0a8198ca1a6f1c1e76b862cd052b7b0260aa56
+EBUILD packagekit-base-1.1.1.ebuild 3338 SHA256 3713268ea8daa81aa14563ef8e0ad0b436b9557c3ae39a6cf1dd2efb029294aa SHA512 95e673821d137a33e1622e1cad241bf9649ad1368ac4c27178643d40f39f3bc8408546f5f545dc325ca72be0586ee5dadc7f33af0c1d98acc7ec748eb305fc22 WHIRLPOOL 06f7765dd45607fcf76079227c5598e136e00499c61c56bd4387986088dcaf04cc1d19bbfbc2fe72969c258b99b06c3d60383498e6ae7a728e0d3666e9e1fa37
+EBUILD packagekit-base-1.1.4.ebuild 3372 SHA256 28ad7d347fc98b86d2dd0750cca8b90040fc49367a0a8afd2c0a4b932efdbb23 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046 WHIRLPOOL a513f630f1cd1227c47e30b50f9dde8f61a40cd37795f87d6d5c972c1f1b3b7d42dd8e83dae212f9bac5be8c75d96f9877cc5160912627d6a267f1c0d0358dd4
+EBUILD packagekit-base-1.1.5-r2.ebuild 3712 SHA256 44ddc410e962ae5986f1dbedaa6007af34782dd8bddf60bc1a9796ae3f502778 SHA512 8bf5c3acc0327e28686d3166aad7a7aa05d93bdfb145a32b62c7956d9a71c7bfdb662b147aadd2c2ae05684fa9e82d61a3f228c0b29b08fb7e6424f77650ca5f WHIRLPOOL 9b5a5361b20f283899d84b41fb5a2019ed52a9dc9fe8f88ffa4013ed32617efa377b50a43493d7754463c4e6ea62a7bf5fc66053d7d747500f692e718da5d0ea
+MISC ChangeLog 6657 SHA256 4039e994952442c1c10de8b12d55ade67dd3daab436d885c59b4215403e3fbfc SHA512 34cf7250482da5ed814df376d5c576334b9b4c91ba3380abde687f2c9966f51985cb4f4ae6e66a7068a774d970bd3a6910911f5e89e00109fb4b61c815733b40 WHIRLPOOL fc6f6cdb2e4a6a16cc49b83f8de193f9f9eb9e85ea3a8c611722634cfe6d175a1641cb4ef9dc698f2818a4c4f7ac3ed73d0dd69360cee36822fb3bc91726b8b1
+MISC ChangeLog-2015 6720 SHA256 f615d614532c053b35ee52e55dea48c5004e448cdea8997a488a8aec14a10fc5 SHA512 78d1e47854cd312c19c8518ceae69958d28b45c72ffb29f2ac309bb1281fc3a04a53304a6ce9652d87daa42b0aee406232884593aa89ee2f9be54c931c5b46d6 WHIRLPOOL 36d11b097ca6a3c5dbe68d784c011cddf5919aae86a85fb65cdb6dabe30efd1d8d4707e05a34cc5df39cbe9893a4eadaade1c285cfd40ef69e7f6889cee78956
+MISC metadata.xml 860 SHA256 4b4d0bd1846d773b27f309a07da4ce7a3eaca51c0252e8b7a37547e79f5af62f SHA512 db5ce7f7b361c9e742413bbb222fc3dfdd2747716e5d59a71dba5c14073a6bb18e1949d0247478a0652e6011af338e74ac790503773a2bc1d60693856b6f8650 WHIRLPOOL 5f71ab16c718b3a154cde841aa7243a13593feeaf3ea22e64ae8c1ca800ee323657d904ba2c52a0903993fe48c7a6fbd5575e353af99f8eb08aa0d49ab7916ac
diff --git a/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
new file mode 100644
index 000000000000..e24faeec9a50
--- /dev/null
+++ b/app-admin/packagekit-base/files/0001-entropy-PackageKitEntropyClient.output-API-update.patch
@@ -0,0 +1,26 @@
+From ee2dfacb275e8145c7ae1ba8da86779054adf902 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Fri, 6 Dec 2013 07:40:15 +0100
+Subject: [PATCH] entropy: PackageKitEntropyClient.output API update
+
+---
+ backends/entropy/entropyBackend.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
+index 57b6c59..bec8ef6 100755
+--- a/backends/entropy/entropyBackend.py
++++ b/backends/entropy/entropyBackend.py
+@@ -776,7 +776,8 @@ class PackageKitEntropyClient(Client):
+ def init_singleton(self):
+ Client.init_singleton(self, url_fetcher = PkUrlFetcher)
+
+- def output(self, text, header = "", footer = "", back = False,
++ @classmethod
++ def output(cls, text, header = "", footer = "", back = False,
+ importance = 0, level = "info", count = None, percent = False):
+ """
+ Reimplemented from entropy.output.TextInterface.
+--
+1.8.4.4
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch b/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch
new file mode 100644
index 000000000000..69a0fd7e5f49
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.8.15-qtdbus-annotate.patch
@@ -0,0 +1,12 @@
+Index: PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
+===================================================================
+--- PackageKit-0.8.12.orig/src/org.freedesktop.PackageKit.xml
++++ PackageKit-0.8.12/src/org.freedesktop.PackageKit.xml
+@@ -317,6 +317,7 @@
+
+ <!--*****************************************************************************************-->
+ <method name="GetPackageHistory">
++ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariant"/>
+ <doc:doc>
+ <doc:description>
+ <doc:para>
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
new file mode 100644
index 000000000000..59b3ab109648
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.8.x-npapi-sdk.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 3e8d301..7ba7f4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -361,7 +361,7 @@ AC_ARG_ENABLE(browser_plugin, AS_HELP_STRING([--enable-browser-plugin],[Build br
+ enable_browser_plugin=$enableval,enable_browser_plugin=yes)
+ if test x$enable_browser_plugin = xyes; then
+ PKG_CHECK_MODULES(PK_BROWSER_PLUGIN, \
+- mozilla-plugin >= 8.0 \
++ npapi-sdk \
+ gio-unix-2.0 \
+ nspr >= 4.8 \
+ cairo \
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
new file mode 100644
index 000000000000..d7ec4b268c84
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
@@ -0,0 +1,15 @@
+--- a/src/~Makefile.am 2016-06-29 10:59:14.178918032 +0200
++++ b/src/Makefile.am 2016-06-29 11:02:50.739929627 +0200
+@@ -175,11 +175,7 @@ pk_self_test_CFLAGS = \
+ TESTS = pk-self-test
+
+ install-data-hook:
+- if test -w $(DESTDIR)$(prefix)/; then \
+- mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
+- mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
+- mkdir -p $(DESTDIR)$(localstatedir)/log; \
+- fi
++
+
+ clean-local:
+ rm -f *~
diff --git a/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
new file mode 100644
index 000000000000..df7675761d49
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-elogind-support.patch
@@ -0,0 +1,184 @@
+--- a/config.h.in 2017-06-07 16:38:45.046910693 +0200
++++ b/config.h.in 2017-06-07 16:39:06.973911120 +0200
+@@ -78,8 +78,8 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+
+-/* Build systemd code */
+-#undef HAVE_SYSTEMD
++/* Build systemd-login code */
++#undef HAVE_SYSTEMD_SD_LOGIN_H
+
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+--- a/configure.ac 2017-06-06 09:03:57.171355965 +0200
++++ b/configure.ac 2017-06-06 09:55:11.242384458 +0200
+@@ -254,7 +254,6 @@
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [has_systemdsystemunitdir=$with_systemdsystemunitdir],
+ [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+- AC_DEFINE(HAVE_SYSTEMD,1,[Build systemd code])
+ AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
+@@ -267,6 +266,24 @@
+ AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
+
+ dnl ---------------------------------------------------------------------------
++dnl - Use elogind instead of systemd-login
++dnl ---------------------------------------------------------------------------
++AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]),
++ enable_elogind=$enableval,enable_elogind=no)
++if test x$enable_elogind = xyes; then
++ PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4], [have_elogind=yes], [have_elogind=no])
++else
++ have_elogind=no
++fi
++
++dnl ---------------------------------------------------------------------------
++dnl --- Is systemd/sd-login.h, either from systemd or elogind, available?
++dnl ---------------------------------------------------------------------------
++if test -n "$has_systemdsystemunitdir" -o "x$have_elogind" != "xno" ; then
++ AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
++fi
++
++dnl ---------------------------------------------------------------------------
+ dnl - Generate man pages ? (default enabled)
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
+@@ -629,6 +644,7 @@
+ cflags: ${CFLAGS}
+ cppflags: ${CPPFLAGS}
+ Able to run locally: ${enable_local}
++ Use elogind: ${enable_elogind}
+ Use systemd: ${enable_systemd}
+ Enable offline update: ${enable_offline_update}
+ Networking stacks: ${networking_apis}
+--- a/src/Makefile.am 2017-06-06 10:02:19.902397328 +0200
++++ b/src/Makefile.am 2017-06-06 10:04:05.013400483 +0200
+@@ -11,6 +11,7 @@
+ $(PYTHON_CFLAGS) \
+ $(NETWORK_MANAGER_CFLAGS) \
+ $(CONNMAN_CFLAGS) \
++ $(ELOGIND_CFLAGS) \
+ $(SYSTEMD_CFLAGS) \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ -DBINDIR=\"$(bindir)\" \
+@@ -104,6 +105,7 @@
+ $(POLKIT_LIBS) \
+ $(GIO_LIBS) \
+ $(ARCHIVE_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(SYSTEMD_LIBS)
+
+ packagekit_direct_LDFLAGS = \
+@@ -134,6 +136,7 @@
+ $(POLKIT_LIBS) \
+ $(GIO_LIBS) \
+ $(ARCHIVE_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(SYSTEMD_LIBS)
+
+ packagekitd_LDFLAGS = \
+@@ -161,6 +164,7 @@
+ $(POLKIT_LIBS) \
+ $(GIO_LIBS) \
+ $(ARCHIVE_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(SYSTEMD_LIBS)
+
+ pk_self_test_CPPFLAGS = \
+--- a/src/pk-engine.c 2017-06-06 09:12:23.828371176 +0200
++++ b/src/pk-engine.c 2017-06-06 09:55:47.426385545 +0200
+@@ -98,7 +98,7 @@
+ guint owner_id;
+ GDBusNodeInfo *introspection;
+ GDBusConnection *connection;
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ GDBusProxy *logind_proxy;
+ gint logind_fd;
+ #endif
+@@ -281,7 +281,7 @@
+ static void
+ pk_engine_inhibit (PkEngine *engine)
+ {
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ g_autoptr(GError) error = NULL;
+ g_autoptr(GUnixFDList) out_fd_list = NULL;
+ g_autoptr(GVariant) res = NULL;
+@@ -331,7 +331,7 @@
+ static void
+ pk_engine_uninhibit (PkEngine *engine)
+ {
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ if (engine->priv->logind_fd == 0)
+ return;
+ g_debug ("closed logind fd %i", engine->priv->logind_fd);
+@@ -1830,7 +1830,7 @@
+ }
+ }
+
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /**
+ * pk_engine_proxy_logind_cb:
+ **/
+@@ -1872,7 +1872,7 @@
+ /* save copy for emitting signals */
+ engine->priv->connection = g_object_ref (connection);
+
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /* connect to logind */
+ g_dbus_proxy_new (connection,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -2031,7 +2031,7 @@
+ if (engine->priv->connection != NULL)
+ g_object_unref (engine->priv->connection);
+
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /* uninhibit */
+ if (engine->priv->logind_fd != 0)
+ close (engine->priv->logind_fd);
+--- a/src/pk-dbus.c 2017-06-06 09:12:13.254370858 +0200
++++ b/src/pk-dbus.c 2017-06-06 10:09:17.249409857 +0200
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <gio/gio.h>
+
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ #include <systemd/sd-login.h>
+ #endif
+
+@@ -177,7 +177,7 @@
+ return cmdline;
+ }
+
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ /**
+ * pk_dbus_get_session_systemd:
+ **/
+@@ -220,7 +220,7 @@
+ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ {
+ gchar *session = NULL;
+-#ifndef HAVE_SYSTEMD
++#ifndef HAVE_SYSTEMD_SD_LOGIN_H
+ g_autoptr(GError) error = NULL;
+ #endif
+ guint pid;
+@@ -250,7 +250,7 @@
+ }
+
+ /* get session from systemd or ConsoleKit */
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ session = pk_dbus_get_session_systemd (pid);
+ #else
+ /* get session from ConsoleKit */
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
new file mode 100644
index 000000000000..37a216b6c7cf
--- /dev/null
+++ b/app-admin/packagekit-base/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="command-not-found">Enable packagekit support on shell "command not found"</flag>
+ <flag name="cron">Install cron script for auto-update</flag>
+ <flag name="elogind">Enable elogind support to get user session</flag>
+ <flag name="entropy">Enable Entropy backend</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
new file mode 100644
index 000000000000..888c3f9057e8
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 multilib nsplugins python-single-r1 systemd vala
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE="connman cron command-not-found +introspection networkmanager nsplugin entropy systemd test vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# to get current session's user.
+CDEPEND="
+ >=app-shells/bash-completion-2
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}]
+ >=sys-auth/polkit-0.98
+ >=sys-apps/dbus-1.3.0
+ ${PYTHON_DEPS}
+ connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] )
+ networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+ nsplugin? (
+ >=dev-libs/nspr-4.8
+ x11-libs/cairo
+ >=x11-libs/gtk+-2.14.0:2
+ x11-libs/pango
+ )
+ systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt[${PYTHON_USEDEP}]
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+ vala? ( $(vala_depend) )
+"
+RDEPEND="${CDEPEND}
+ >=app-portage/layman-2[${PYTHON_USEDEP}]
+ >=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+ entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+ !systemd? ( sys-auth/consolekit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ econf \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-gtk-module \
+ --disable-schemas-compile \
+ --disable-static \
+ --enable-bash-completion \
+ --enable-man-pages \
+ --enable-nls \
+ --enable-portage \
+ --localstatedir=/var \
+ $(use_enable command-not-found) \
+ $(use_enable connman) \
+ $(use_enable cron) \
+ $(use_enable entropy) \
+ $(use_enable introspection) \
+ $(use_enable networkmanager) \
+ $(use_enable nsplugin browser-plugin) \
+ $(use_enable systemd) \
+ $(use_enable test daemon-tests) \
+ $(use_enable vala) \
+ $(systemd_with_unitdir)
+ #$(use_enable test local)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files --all
+
+ dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+
+ if use nsplugin; then
+ dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+ mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \
+ "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die
+ fi
+}
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild
new file mode 100644
index 000000000000..a78d97003aa6
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 multilib python-single-r1 systemd vala
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found +introspection networkmanager entropy systemd test vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# to get current session's user.
+CDEPEND="
+ >=app-shells/bash-completion-2
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}]
+ >=sys-auth/polkit-0.98
+ >=sys-apps/dbus-1.3.0
+ ${PYTHON_DEPS}
+ connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
+ networkmanager? ( >=net-misc/networkmanager-0.6.4:= )
+ systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt[${PYTHON_USEDEP}]
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+RDEPEND="${CDEPEND}
+ >=app-portage/layman-2[${PYTHON_USEDEP}]
+ >=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+ entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+ !systemd? ( sys-auth/consolekit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fixes QA Notices: https://github.com/gentoo/gentoo/pull/1760 and https://github.com/hughsie/PackageKit/issues/143
+ eapply "${FILESDIR}/${P}-cache-qafix.patch"
+
+ # Disable unittests not working with portage backend
+ # console: requires terminal input
+ sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/task\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/console\)://\1:' \
+ -i lib/packagekit-glib2/pk-test-daemon.c || die
+ sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
+ -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+ -e 's:^\(.*/packagekit/backend\)://\1:' \
+ -i src/pk-self-test.c || die
+
+ eapply_user
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ econf \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-gtk-module \
+ --disable-schemas-compile \
+ --disable-static \
+ --enable-bash-completion \
+ --enable-man-pages \
+ --enable-nls \
+ --enable-portage \
+ --localstatedir=/var \
+ $(use_enable command-not-found) \
+ $(use_enable connman) \
+ $(use_enable cron) \
+ $(use_enable entropy) \
+ $(use_enable introspection) \
+ $(use_enable networkmanager) \
+ $(use_enable systemd) \
+ $(use_enable test daemon-tests) \
+ $(use_enable test local) \
+ $(use_enable vala) \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files --all
+
+ dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+}
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild
new file mode 100644
index 000000000000..2e070c3b583c
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 multilib python-single-r1 systemd vala xdg
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found +introspection networkmanager entropy systemd test vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# to get current session's user.
+CDEPEND="
+ >=app-shells/bash-completion-2
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}]
+ >=sys-auth/polkit-0.98
+ >=sys-apps/dbus-1.3.0
+ ${PYTHON_DEPS}
+ connman? ( net-misc/connman )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
+ networkmanager? ( >=net-misc/networkmanager-0.6.4:= )
+ systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt[${PYTHON_USEDEP}]
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+RDEPEND="${CDEPEND}
+ >=app-portage/layman-2[${PYTHON_USEDEP}]
+ >=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+ entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+ !systemd? ( sys-auth/consolekit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fixes QA Notices:
+ # - https://github.com/gentoo/gentoo/pull/1760
+ # - https://github.com/hughsie/PackageKit/issues/143
+ eapply "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+
+ # Disable unittests not working with portage backend
+ # console: requires terminal input
+ sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/task\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/console\)://\1:' \
+ -i lib/packagekit-glib2/pk-test-daemon.c || die
+ sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
+ -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+ -e 's:^\(.*/packagekit/backend\)://\1:' \
+ -i src/pk-self-test.c || die
+
+ eapply_user
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ econf \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-gtk-module \
+ --disable-schemas-compile \
+ --disable-static \
+ --enable-bash-completion \
+ --enable-man-pages \
+ --enable-nls \
+ --enable-portage \
+ --localstatedir=/var \
+ $(use_enable command-not-found) \
+ $(use_enable connman) \
+ $(use_enable cron) \
+ $(use_enable entropy) \
+ $(use_enable introspection) \
+ $(use_enable networkmanager) \
+ $(use_enable systemd) \
+ $(use_enable test daemon-tests) \
+ $(use_enable test local) \
+ $(use_enable vala) \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files --all
+
+ dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+}
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..9d6f36571e9d
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found elogind +introspection networkmanager entropy systemd test vala"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )
+ vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# or elogind to get current session's user.
+COMMON_DEPEND="
+ >=app-shells/bash-completion-2
+ dev-db/sqlite:3
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}]
+ >=sys-auth/polkit-0.98
+ >=sys-apps/dbus-1.3.0
+ ${PYTHON_DEPS}
+ connman? ( net-misc/connman )
+ elogind? ( >=sys-auth/elogind-229.4 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
+ networkmanager? ( >=net-misc/networkmanager-0.6.4:= )
+ systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-cpp/glibmm-2.4
+ dev-libs/libxslt[${PYTHON_USEDEP}]
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=app-portage/layman-2[${PYTHON_USEDEP}]
+ >=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+ entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+ !systemd? ( !elogind? ( sys-auth/consolekit ) )
+"
+
+PATCHES=(
+ # Fixes QA Notices:
+ # - https://github.com/gentoo/gentoo/pull/1760
+ # - https://github.com/hughsie/PackageKit/issues/143
+ "${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+
+ # Adds elogind support:
+ # - https://bugs.gentoo.org/show_bug.cgi?id=620948
+ "${FILESDIR}"/${PN}-elogind-support.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Disable unittests not working with portage backend
+ # console: requires terminal input
+ sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/task\)://\1:' \
+ -e 's:^\(.*/packagekit-glib2/console\)://\1:' \
+ -i lib/packagekit-glib2/pk-test-daemon.c || die
+ sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
+ -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+ -e 's:^\(.*/packagekit/backend\)://\1:' \
+ -i src/pk-self-test.c || die
+
+ eapply_user
+ use vala && vala_src_prepare
+ xdg_src_prepare
+
+ # Needed by elogind patch:
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-gtk-module \
+ --disable-schemas-compile \
+ --disable-static \
+ --enable-bash-completion \
+ --enable-man-pages \
+ --enable-nls \
+ --enable-portage \
+ --localstatedir=/var \
+ $(use_enable command-not-found) \
+ $(use_enable connman) \
+ $(use_enable cron) \
+ $(use_enable elogind) \
+ $(use_enable entropy) \
+ $(use_enable introspection) \
+ $(use_enable networkmanager) \
+ $(use_enable systemd) \
+ $(use_enable test daemon-tests) \
+ $(use_enable test local) \
+ $(use_enable vala) \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files --all
+
+ dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+}
diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest
new file mode 100644
index 000000000000..2709bf1722ac
--- /dev/null
+++ b/app-admin/packagekit-gtk/Manifest
@@ -0,0 +1,11 @@
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
+DIST PackageKit-1.1.1.tar.xz 1410632 SHA256 483348a54c92419d713a8a153926ec6e1ab70ba64ae4afd3f0a6d63d10b1cac4 SHA512 caf9b67f71a36479d32338c28343671e9586aade7a0f777b867772ad8da8e3206bf66a46b2fa2cba8f0f48af27db3888b68e336707db6f76c5e0dbed464e2874 WHIRLPOOL 0a09233580b50f391931760960c3fe8a644797b24c15a79d56bdbfdadde835856f81175e209ad6877c49387c946c8765418eef28fc1fd188eb5d5d5a383fd1ad
+DIST PackageKit-1.1.4.tar.xz 1424756 SHA256 0ae89f7c381b7def41960f690f7212cf80f7f6bfc9055ce8d0c84aa45f120cd9 SHA512 fc04d58c46f7e7dbb1386d26627ea246b5f21b8483862788bb734b8a137e4cb1d41de0f471b46f6d649e29337f9605acba0568a845577b27a2ac0faaf391b187 WHIRLPOOL f76a446eb64721cb718fe250d710aaf4e0d801bddb44835a7a0327ed250150928d717bb037d23c758eb6bfb752b77aea4bb5a14c8df58b964e008f2260e45736
+DIST PackageKit-1.1.5.tar.xz 1418292 SHA256 50f448ced5b460bd79ba0c97e9fe080153eaeecad909eee108284e3f5fc7b70c SHA512 ecc6a4d39caa0a7ea2047f52f95980b23e61ae200e27559326f03302b1c0d798f9cbae53fcf2d397dca3d54e52f143e2e7aa4e3f0b2df8c39e53bd2993e86154 WHIRLPOOL d21df70793d316ffd045f9c4b06f0e31015cf659e9f3679cd96dbdaf3acf22e030446030f2c5a589f87b351b8a191dda7614bb63462a9e1017bb9ae11fcfdbf8
+EBUILD packagekit-gtk-1.0.11.ebuild 1182 SHA256 e57b8526870f6f433baf229043390f44d7a602a4aa36a4ed456e90ac4d606211 SHA512 953fe32f20083a257460db3c47a4f180b6826d6dd1f8fdc2c88fb5873a1d0fad6cdb24b20b4cd07b87989f587bb86cb375b3530ec5ec186e3efa4c162f934e1e WHIRLPOOL b4f9daba4464e290751bf16013b52753a122638ec203a63b303a0700a528aaf2f3d113221454eef734db8ec3ebd2085618e1fc35414ee767f3158dbdea7287eb
+EBUILD packagekit-gtk-1.1.1.ebuild 1153 SHA256 2cc8f07d39e6319e33117dac2b59c95572ab4e5671cf6c87f62a80fcde295347 SHA512 f67c55709ca009f1b07c1c3687a42e8af0cf5617deccccfc107e3b125aa602557396fb3c0992f6d4dc662f737f6e9068b7cebd6a91cb2264f35eaff4419dbd30 WHIRLPOOL 9df08215f8e6859d44997414449fa130ddf0a6bb3d4f7825cfee60e83d6bff1182864f7ac30df1ee9cbd258065a73951867b4ba76cb59b6ff5903ef14df9da39
+EBUILD packagekit-gtk-1.1.4.ebuild 1153 SHA256 2cc8f07d39e6319e33117dac2b59c95572ab4e5671cf6c87f62a80fcde295347 SHA512 f67c55709ca009f1b07c1c3687a42e8af0cf5617deccccfc107e3b125aa602557396fb3c0992f6d4dc662f737f6e9068b7cebd6a91cb2264f35eaff4419dbd30 WHIRLPOOL 9df08215f8e6859d44997414449fa130ddf0a6bb3d4f7825cfee60e83d6bff1182864f7ac30df1ee9cbd258065a73951867b4ba76cb59b6ff5903ef14df9da39
+EBUILD packagekit-gtk-1.1.5.ebuild 1153 SHA256 b5d8c8765ca1d09a8bf98b57b668dacaebe0fdb6d23543e338a97f5db1272999 SHA512 b47785b2ebb3e939f48562a8c0e335fb033476b9692e75f51f2823439ba49f6cd435571381a512c8dcbbe74c654162a97261e29d14df91f9aedeef66a5814573 WHIRLPOOL 9f02ab48f035ca25f42fa5b87a177156374acf0f57e7a43defd4b4c6a338957a27966c2bbd71116567ba6ae782a454a7776d5e208861c286c12132c36c853d8d
+MISC ChangeLog 4257 SHA256 fe7fdda2810ff432dcd2bcb3896166c9c47a9bc5d48754067ea2f08b60a18f76 SHA512 ff8dcc6e650f8c09ba4f63c9a6fd0a5f06d0e53d8a6c93d2f529c5c8ab096a88a88e190513b6b721abc0d37a28fb457362083ea053dd4e68f702d8ab74d9ba33 WHIRLPOOL fc9f8a64634f4002bfdba375ac46b1336e71ff970baddf7dfbe90296e79dd395292b5def28c1866718cf9265d3d6b1efee5661704d89d61aca1da9bfff3174bb
+MISC ChangeLog-2015 2745 SHA256 53f8e36fbc8681673a353d0edc5bb12c3fccb6c45163bf68c999baeaf7212a54 SHA512 e8706f3f60e82900ab08301b2a2922645e67cd2c190bd540b52c451606a092ab30b1c0aef60a8e95af25c1a9dac45cbafb9cfbf6d0f20fc40a4061e6ebadfb1a WHIRLPOOL 2bfb28d4490b7fe5c36d19c371e306312118cb53873c5372eeebee43f208b0d135d51ace19f2ea0e0ca83136886ac038080ef9a545861b7f356e0ab9936f9193
+MISC metadata.xml 561 SHA256 56d3550b95497695e964efd7c1f7f8f90da36d7fd6bd8e1a41639622e20896e1 SHA512 d752bb40ae653b317914397f0ac53441811eba239be2e24f3c077076c389e84de94f43ee822eab20c56070ba6f6bff937e0eabb17edc1f0cead98e5dfd65e1d3 WHIRLPOOL 558544106c6485f3a874a4f0f64a46eeaf4adfd5d2123591062a802bbae2dcc1cded571589a96f2aba489518be9d7ad7d02520fc6fa8f3d2d12da49efb6f1704
diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml
new file mode 100644
index 000000000000..cefdae53fab3
--- /dev/null
+++ b/app-admin/packagekit-gtk/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>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
new file mode 100644
index 000000000000..ae300d45a647
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/pango
+ ~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --disable-bash-completion \
+ --disable-browser-plugin \
+ --disable-command-not-found \
+ --disable-cron \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-local \
+ --disable-man-pages \
+ --disable-networkmanager \
+ --disable-static \
+ --disable-systemd \
+ --disable-vala \
+ --enable-dummy \
+ --enable-gtk-module \
+ --enable-introspection=yes \
+ --localstatedir=/var
+}
+
+src_compile() {
+ emake -C contrib/gtk-module
+}
+
+src_install() {
+ emake -C contrib/gtk-module DESTDIR="${D}" install
+ prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild
new file mode 100644
index 000000000000..2ff6d6c1f1ba
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.46:2
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/pango
+ ~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --disable-bash-completion \
+ --disable-command-not-found \
+ --disable-cron \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-local \
+ --disable-man-pages \
+ --disable-networkmanager \
+ --disable-static \
+ --disable-systemd \
+ --disable-vala \
+ --enable-dummy \
+ --enable-gtk-module \
+ --enable-introspection=yes \
+ --localstatedir=/var
+}
+
+src_compile() {
+ emake -C contrib/gtk-module
+}
+
+src_install() {
+ emake -C contrib/gtk-module DESTDIR="${D}" install
+ prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild
new file mode 100644
index 000000000000..2ff6d6c1f1ba
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.46:2
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/pango
+ ~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --disable-bash-completion \
+ --disable-command-not-found \
+ --disable-cron \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-local \
+ --disable-man-pages \
+ --disable-networkmanager \
+ --disable-static \
+ --disable-systemd \
+ --disable-vala \
+ --enable-dummy \
+ --enable-gtk-module \
+ --enable-introspection=yes \
+ --localstatedir=/var
+}
+
+src_compile() {
+ emake -C contrib/gtk-module
+}
+
+src_install() {
+ emake -C contrib/gtk-module DESTDIR="${D}" install
+ prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild
new file mode 100644
index 000000000000..0999fdab9cc9
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.46:2
+ media-libs/fontconfig
+ >=x11-libs/gtk+-2:2
+ >=x11-libs/gtk+-3:3
+ x11-libs/pango
+ ~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ econf \
+ --disable-bash-completion \
+ --disable-command-not-found \
+ --disable-cron \
+ --disable-gstreamer-plugin \
+ --disable-gtk-doc \
+ --disable-local \
+ --disable-man-pages \
+ --disable-networkmanager \
+ --disable-static \
+ --disable-systemd \
+ --disable-vala \
+ --enable-dummy \
+ --enable-gtk-module \
+ --enable-introspection=yes \
+ --localstatedir=/var
+}
+
+src_compile() {
+ emake -C contrib/gtk-module
+}
+
+src_install() {
+ emake -C contrib/gtk-module DESTDIR="${D}" install
+ prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
new file mode 100644
index 000000000000..33cef983d00c
--- /dev/null
+++ b/app-admin/packagekit-qt/Manifest
@@ -0,0 +1,4 @@
+DIST PackageKit-Qt-0.9.6.tar.xz 43288 SHA256 0f4f504b2053472f9299c7ca42e33bcc85b8a8754223d2dc1912b533ec1ca680 SHA512 67d025e4e5b9860ec188518c11b3941b9a26cf9dce65665ea56307731721dac57dbb4e8726eb253f9fb39022aa3d0b0c7b9765532fa12b014fe9357028ece8aa WHIRLPOOL e4c78a6c1da49d9f0f3369fb821fbe475770e066f5f373c9f529d438ff8003f094a5499c8057cc87ec8f1f81b089503ae4d74fcd4b1bb963377e6c446660830e
+EBUILD packagekit-qt-0.9.6.ebuild 600 SHA256 f41b94b295bf07543f681a4e45759d8d879c1523623dbf59a75631633d6604f2 SHA512 314156c2fea244321fe3e4dec1e3d4e85654562865ebea6932b8ce559a7e31c485ef6a1719faae0dfc4651dd9cc6998151c936bc2e36f447f79a38f4b96f747f WHIRLPOOL 09438d9ac1bb0a3456363f294d62a8dfa6c60a5b7d2feeb25a26f3332d6a06e05a1f4ed2dedd552001c1511864e8787bc48d28a662cad8358bb77c957fae9003
+MISC ChangeLog 2675 SHA256 f79df0dcbaa5c01d24569709a2512ac3287c279a10bb8a0627597f0c0ca2b08e SHA512 f1a9546809cce7b031f910e36cb70b3e77360c933c168e2fbc855146c2df8861d2756ab4b0c5c6fa066a6954829f4fcb608b64f839b6600c6602ac5767a12589 WHIRLPOOL b9d98c91c6e2ad6d7d374059d2c2fa8da4944f555331307fcf96d1b92f5843223ae8bca6a37afa3c523926916d5ab3f18bc0e19a3711bd196b7dd9eb4a02a676
+MISC metadata.xml 553 SHA256 127e43b1080a6247cf02f05343396b5af7350f47874f0027b6600c202718b0df SHA512 e015748fdf05964d1aec529b5be35ecd8c24f495bb334b3b8fbe8ea5119e327e430769ab71972db1c6958706d2021663af18d95d701af6cf5f114b95edf6f487 WHIRLPOOL 2901b4f2447775eeaf3c2f032e2a49485131052d0cea300a83b181ccc111ecb2b3b9f2617af8d3d9b4c06d410ccc1a1f410b8429286355c9bd14a761b5b27b51
diff --git a/app-admin/packagekit-qt/metadata.xml b/app-admin/packagekit-qt/metadata.xml
new file mode 100644
index 000000000000..42bda2de62d9
--- /dev/null
+++ b/app-admin/packagekit-qt/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>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
new file mode 100644
index 000000000000..a10b5392407d
--- /dev/null
+++ b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Qt PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="https://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+ >=app-admin/packagekit-base-0.9
+ >=dev-qt/qtcore-5.6:5
+ >=dev-qt/qtdbus-5.6:5
+ >=dev-qt/qtsql-5.6:5
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest
new file mode 100644
index 000000000000..629554076279
--- /dev/null
+++ b/app-admin/packagekit/Manifest
@@ -0,0 +1,7 @@
+EBUILD packagekit-1.0.11-r1.ebuild 421 SHA256 e5400db764d72e1b29ae7cd22512c156bb9fb913425e93d78b3101e8188d3769 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 WHIRLPOOL 7c87f45eee6d8997bb8501b2d988b352077429599e23d91365b10816d782ece28d9943d8aef9d63c6acc257dcd1d6e52ed7ca292ec79ee848ec6f4ab069a764e
+EBUILD packagekit-1.1.1.ebuild 421 SHA256 e5400db764d72e1b29ae7cd22512c156bb9fb913425e93d78b3101e8188d3769 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 WHIRLPOOL 7c87f45eee6d8997bb8501b2d988b352077429599e23d91365b10816d782ece28d9943d8aef9d63c6acc257dcd1d6e52ed7ca292ec79ee848ec6f4ab069a764e
+EBUILD packagekit-1.1.4.ebuild 421 SHA256 e5400db764d72e1b29ae7cd22512c156bb9fb913425e93d78b3101e8188d3769 SHA512 f8a38a3fd1fee29c4472f79d4d40259c68a7aa8b7a6c1da460f05411dbc454cbeb02ac5fae85ae7ab41d2e7a238ed293e4467a783580de0ba354c18a768a3a26 WHIRLPOOL 7c87f45eee6d8997bb8501b2d988b352077429599e23d91365b10816d782ece28d9943d8aef9d63c6acc257dcd1d6e52ed7ca292ec79ee848ec6f4ab069a764e
+EBUILD packagekit-1.1.5.ebuild 421 SHA256 96138b6866e341ea591688a8758cc4f8b9546abbef55bd397b01042efb64a7e4 SHA512 7da902195434263cb7bc9cc22326b819299055c82f8910d358463969709b17b27a9478ce9a8833a29b9f4108102fdf2704387de8396907f19b727d655a1e438f WHIRLPOOL a28945db7fd64e218095c74b98aab0129caf4c732a3aef56cec853195fdc0b7809f73acdc2baf02572563548ac21f91b929171c04fc86d33fe9e101b79c3d268
+MISC ChangeLog 4683 SHA256 c784de46559fcfe76a0e7e71badfab6dd231c7b6a21895fc160f7b07519be56e SHA512 29741cf39f902ff1e9c86fd354a2618930612baa2e0016d1636688ea2d2c0754d8eeb95e875f1b53c46c3c18238a92bd18bb4036d7dd2c629c817f35d0a24484 WHIRLPOOL fffb831f921b7c13d185ba344cbe9639b2326a9b430d949b83ebc3a218efc963def5a5259b802a33319e0840e3f8281c44f503d81ff4d9aaa98296f5750ee70e
+MISC ChangeLog-2015 1909 SHA256 0c4612fc6b895ea4734065a6883a8a1e4fe66ef728b81a6f516b3bf9aef46da6 SHA512 598d53fea01645217018bbf8c0f9ac96e2ba5730374fa275c5e9a29e50e0ab31f78f3b2e010a2b8868a6b5c0991ce33081279baee007f847723d962d7f8a1b8e WHIRLPOOL c2322ddb78e0872c01c8bd61c235e769126f15310066e954ccc15963ad99c05bd9bf048e0061fa1454312db10c5b5557d780ae8fadcb8d7aa85914c4017e7a4a
+MISC metadata.xml 561 SHA256 56d3550b95497695e964efd7c1f7f8f90da36d7fd6bd8e1a41639622e20896e1 SHA512 d752bb40ae653b317914397f0ac53441811eba239be2e24f3c077076c389e84de94f43ee822eab20c56070ba6f6bff937e0eabb17edc1f0cead98e5dfd65e1d3 WHIRLPOOL 558544106c6485f3a874a4f0f64a46eeaf4adfd5d2123591062a802bbae2dcc1cded571589a96f2aba489518be9d7ad7d02520fc6fa8f3d2d12da49efb6f1704
diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
new file mode 100644
index 000000000000..cefdae53fab3
--- /dev/null
+++ b/app-admin/packagekit/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>mudler@gentoo.org</email>
+ <name>Ettore Di Giacinto</name>
+ <description>Assign bugs to him</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>CC on bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/packagekit/packagekit-1.0.11-r1.ebuild b/app-admin/packagekit/packagekit-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..e0cba926c351
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.0.11-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt5"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+ qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/packagekit/packagekit-1.1.1.ebuild b/app-admin/packagekit/packagekit-1.1.1.ebuild
new file mode 100644
index 000000000000..e0cba926c351
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt5"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+ qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/packagekit/packagekit-1.1.4.ebuild b/app-admin/packagekit/packagekit-1.1.4.ebuild
new file mode 100644
index 000000000000..e0cba926c351
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt5"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+ qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/packagekit/packagekit-1.1.5.ebuild b/app-admin/packagekit/packagekit-1.1.5.ebuild
new file mode 100644
index 000000000000..8d79dcc1d57c
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt5"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+ qt5? ( >=app-admin/packagekit-qt-0.9.6 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
new file mode 100644
index 000000000000..dafec283f9a3
--- /dev/null
+++ b/app-admin/pass/Manifest
@@ -0,0 +1,7 @@
+AUX 50pass-gentoo.el 491 SHA256 1420eb48a178553d6032ee312359fc498b1469d433537c4812dca2f835e5f9e7 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659 WHIRLPOOL 2030f49e6aaab66dbb507e3b49de371723de334b44afe568392f8fef7d0e0dd43238f636bf462d863de07ec5ff8eb84fd92d3479fe6243d487c2235aa3c5c699
+DIST password-store-1.7.1.tar.xz 62340 SHA256 f6d2199593398aaefeaa55e21daddfb7f1073e9e096af6d887126141e99d9869 SHA512 2ba2ebc80c90454bbab1da3c43c2cfc87135f838f381e2616eef7c36b0c1de01e491cf587a666bb052d6dfd475fa429bc8fd82b0269325bd2b70afbb897b923e WHIRLPOOL 34bcf6aecf7287313a47721b403664667001f4997be2f2f37114708cd64ea67af682176b6991c828802d71de306383f122a3668d388b8d9a68c1563dbb68bc46
+EBUILD pass-1.7.1.ebuild 2037 SHA256 a330c148fa30d66267476eaacd1152ba233e5cc4126bc93f834716bcc29cb992 SHA512 f336adb1a1d51a739a81ef4fcc1a497e4e661101c8ae7568040822ab549d6136f8bac910c936bde804bd502930d00af5301521b5af202bcdaed905e5ec660ff3 WHIRLPOOL 9c58a9d67b9b6535e3f112656741f328b8f75d271e8bf1dcca516072c2e724917e1092bdf37712522670982dbb812d6961e2c95cbf9cbcdcebb846c52db8ab0c
+EBUILD pass-9999.ebuild 1992 SHA256 c63ca8b59da414d12789c31ea22c124be1a92b25d0b3e997f5c9ca577d7a49b1 SHA512 3a7e0655b9756e29cba3fb0c9cd88b43ce9e91056ea381d092321591f22e99857c34f484ff7c335be93d62b641bb59b4e09ff142a51b6ed671155483306600d2 WHIRLPOOL 87212371202b00c1d516eb32a2ef3872fd18e475f2469c35e7aa37d26d208dc833010ba335331708496e71aa9613d51672dd4c3a1bfbfa3f5568dd900a5300d8
+MISC ChangeLog 2237 SHA256 9c66d7db22cd20ddccb4bbe6c82d7eaa0018d3f3046d5f46ff95a62cf17bf5a4 SHA512 774af67b0bed6e21af39ebf4828576f944000caa558e9143cf94df19d4c3004eea6cc8be7817adde5b82b87943224d42ab2392cdee6408004419c303810b8ce1 WHIRLPOOL 1f4f39e76f68cc95b4d0155a5efb6210cdc61ac30b4734f07b5b47cae3e19a49faffdac287fb1f96c739a3e3e97ddb0e5b2286d0091f4653e6bb5942267a877e
+MISC ChangeLog-2015 4364 SHA256 67be0593368d65ba5663c670a8a96077889b242c7057d853d945f75870c1f18d SHA512 adbb82cbcf8f5fee938636ccf29c176ec06d774cfe6cb6994f2f1a83c7c1a28b2dd6500b0b9fc168982674cf370e541eccebf59c72124ffcd4dc8adb7e3f7ffe WHIRLPOOL 84911d1257cfa48216a9a7106e64d04876fbb58cafa6272aa70df7ff9b38b058c8e9e6fc46ec5d1870c84fc9a553eb10364165ef99bcbc3de11109c220138070
+MISC metadata.xml 881 SHA256 b56d6c5ce3beeb6621187587a34e11f3078dc1fc14e9be468e621eb53368e126 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323 WHIRLPOOL 683607b411e55362c321172eb6de81aa0423d3a43c918170ffb43bd6e7835f0454c385b2dbef29a96dc7ee530342a836e55a3b65d5f825b6c84e72db422776ba
diff --git a/app-admin/pass/files/50pass-gentoo.el b/app-admin/pass/files/50pass-gentoo.el
new file mode 100644
index 000000000000..122d813af1e7
--- /dev/null
+++ b/app-admin/pass/files/50pass-gentoo.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'password-store-edit "password-store" nil t)
+(autoload 'password-store-copy "password-store" nil t)
+(autoload 'password-store-init "password-store" nil t)
+(autoload 'password-store-insert "password-store" nil t)
+(autoload 'password-store-generate "password-store" nil t)
+(autoload 'password-store-remove "password-store" nil t)
+(autoload 'password-store-rename "password-store" nil t)
+(autoload 'password-store-version "password-store" nil t)
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
new file mode 100644
index 000000000000..97bcbb1882f7
--- /dev/null
+++ b/app-admin/pass/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>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <longdescription>
+ Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git.
+ </longdescription>
+ <use>
+ <flag name="X">
+ Use <pkg>x11-misc/xclip</pkg> to copy passwords to the clipboard.
+ </flag>
+ <flag name="git">
+ Use <pkg>dev-vcs/git</pkg> for password revisions.
+ </flag>
+ <flag name="fish-completion">
+ Enable fish completion support.
+ </flag>
+ <flag name="dmenu">
+ Add support for x11-misc/dmenu with the 'passmenu' program.
+ </flag>
+ <flag name="importers">
+ Allow importing passwords from other password managers using various contributed scripts.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/pass/pass-1.7.1.ebuild b/app-admin/pass/pass-1.7.1.ebuild
new file mode 100644
index 000000000000..627d9ebd3bbf
--- /dev/null
+++ b/app-admin/pass/pass-1.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86 ~x86-macos"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+ app-crypt/gnupg
+ media-gfx/qrencode
+ >=app-text/tree-1.7.0
+ git? ( dev-vcs/git )
+ X? ( x11-misc/xclip )
+ elibc_Darwin? ( app-misc/getopt )
+ zsh-completion? ( app-shells/gentoo-zsh-completions )
+ fish-completion? ( app-shells/fish )
+ dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+ emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+ use elibc_Darwin || return
+ # use coreutils'
+ sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+ # host getopt isn't cool, and we aren't brew (rip out brew reference)
+ sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+ # make sure we can find "mount"
+ sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ emake install \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ BASHCOMPDIR="$(get_bashcompdir)" \
+ WITH_BASHCOMP=yes \
+ WITH_ZSHCOMP=$(usex zsh-completion) \
+ WITH_FISHCOMP=$(usex fish-completion)
+ use dmenu && dobin contrib/dmenu/passmenu
+ if use emacs; then
+ elisp-install ${PN} contrib/emacs/*.el
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ fi
+ if use importers; then
+ exeinto /usr/share/${PN}/importers
+ doexe contrib/importers/*
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if use importers; then
+ einfo "To import passwords from other password managers, you may use the"
+ einfo "various importer scripts found in:"
+ einfo " ${ROOT}usr/share/${PN}/importers/"
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
new file mode 100644
index 000000000000..a476bc8e22b6
--- /dev/null
+++ b/app-admin/pass/pass-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1 git-2 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+EGIT_REPO_URI="https://git.zx2c4.com/password-store"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+ app-crypt/gnupg
+ media-gfx/qrencode
+ >=app-text/tree-1.7.0
+ git? ( dev-vcs/git )
+ X? ( x11-misc/xclip )
+ elibc_Darwin? ( app-misc/getopt )
+ zsh-completion? ( app-shells/gentoo-zsh-completions )
+ fish-completion? ( app-shells/fish )
+ dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+ emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+ use elibc_Darwin || return
+ # use coreutils'
+ sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+ # host getopt isn't cool, and we aren't brew (rip out brew reference)
+ sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+ # make sure we can find "mount"
+ sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ emake install \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ BASHCOMPDIR="$(get_bashcompdir)" \
+ WITH_BASHCOMP=yes \
+ WITH_ZSHCOMP=$(usex zsh-completion) \
+ WITH_FISHCOMP=$(usex fish-completion)
+ use dmenu && dobin contrib/dmenu/passmenu
+ if use emacs; then
+ elisp-install ${PN} contrib/emacs/*.el
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ fi
+ if use importers; then
+ exeinto /usr/share/${PN}/importers
+ doexe contrib/importers/*
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if use importers; then
+ einfo "To import passwords from other password managers, you may use the"
+ einfo "various importer scripts found in:"
+ einfo " ${ROOT}usr/share/${PN}/importers/"
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
new file mode 100644
index 000000000000..9975b635570f
--- /dev/null
+++ b/app-admin/passook/Manifest
@@ -0,0 +1,6 @@
+AUX passook.patch 778 SHA256 3bce594e0621e1e21342e9717834cceda3093735db46983566e12361d86f89ac SHA512 cbba3e7b7353acb43056db909ec868eaa741dc81eba3596c4c51e88f7b0922f7637d0a3a862377eba0f20eef52ca43314e3964cb011bd3fc7e3436724d9289d6 WHIRLPOOL a81620a97faa01a5d82ac2fec3abf813d2434de40c564e85d2d3122df1ee1cde3d80638debd06bd1c268e9b71c87e3d482f8c6794625aec9d3036d87fa8416e0
+DIST passook-20121001.tar.gz 13992 SHA256 73937a2f768d4ff8433c5bed48fb436f5bf532626ea9410fe4a04b8e0634214e SHA512 8c3c72f3001fc3c88060f77685b4f238d42dd65d599522604cf3f3fede2c3b94f4a12622e006d10a4f026283b885f90e4f2e2fa9282a48e181480bec4e2d13cb WHIRLPOOL a4a1fdb71aa63e653ace98508548531a3d84f4c49f8804f789fe31257ca944d0f9e22cf4bae92ab49e0750bbf05cef69cfe662b7fefab627639588b23f3de4be
+EBUILD passook-20121001.ebuild 669 SHA256 10a21f6b57a401de331b84675a1e4f0c76b40febaeeb3d92bcae72fdb5627750 SHA512 f1f9b5b48155eef9999e6d5f0fe54f4bb6a178879b5000d3b047763a200f63f1b063778b2be038a21a47ba29d2e84c860a80e25c03c51b985482a375244ebb59 WHIRLPOOL 8201c30b0e410db720de81f1173e9f8dbea96aa7466c6d32eb52d24aaabf4eb8cfc65a0134202b5ee2cdd55d105b88f17051ab98676a00d9d0666fa8a351d971
+MISC ChangeLog 2737 SHA256 901ebd7e0b38486f8072c03661b99aab52366f754a3d0685d4e0e1d3034c0d66 SHA512 40a4c56067c4f7bda889c16b985e4272e197e0ae0881679c80e5ed4b31fa66cfe13405c66e03a32430900e7c61aac01568851b446962b2b9f11b23a374de9818 WHIRLPOOL 8aa65627f32087a9e4690bcf90aaffe10ff4aa17385393fcb0657caa613ae5268fbab816a956f3f56821c4fada2524bf27c4a1c345c02d6b491ac7bb1a8163ec
+MISC ChangeLog-2015 2294 SHA256 08c4c4ec6537078832d160fb87f5fbddf71aa22dff526d598c5e216a36302a7a SHA512 3176a0aa37a3504a6a0694266224dba0c5946cbf006bf4eb487ee7596b9e06fa43c2a12523494b7298f766a1c2dc82b64f907295c2dd7a53bd41774ffc0aa168 WHIRLPOOL 67fa050883eda51444ae1bd7dcc1757832efaeb918419fc75f9e4a5898a9549b794f0d2504aad36233afcf515bda14c8a135c02381fd5ec3828a8276e0b97d76
+MISC metadata.xml 393 SHA256 28a711c9b62a22c656d5ee546688a308ad8f4fbe298d890e9c5960c830c3c14b SHA512 f08f94a5ae03e1b89f218db3b462bd595905ac95336be3cf1eb43b3e018101c5b2dfb5d526f285c1a51388214463d6676d770ae805be21b2bc1463069c93467f WHIRLPOOL 0a68ac49063e6ad0731bd2a3bb16c67751b5d9f2c619936be498d72ed3f7f7a8c6e242fe18a298f7aa6a05a805010240719227c5c1ff03eb0ce004a79f36d190
diff --git a/app-admin/passook/files/passook.patch b/app-admin/passook/files/passook.patch
new file mode 100644
index 000000000000..db14e6ec817c
--- /dev/null
+++ b/app-admin/passook/files/passook.patch
@@ -0,0 +1,26 @@
+--- passook.orig
++++ passook
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+
+ srand;
+ $p = 3; #default pronouce level
+@@ -38,7 +38,7 @@
+ }
+
+ sub fourletterword {
+- my $grepstring = 'egrep "^....$" /usr/dict/words';
++ my $grepstring = 'egrep "^....$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
+ my @fourletters = split(/\n/,`$grepstring`);
+ my $word = $fourletters[rand(@fourletters)];
+ $word = &tangle($word) if ($p<5);
+@@ -46,7 +46,7 @@
+ }
+
+ sub threeletterword {
+- my $grepstring = 'egrep "^...$" /usr/dict/words';
++ my $grepstring = 'egrep "^...$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
+ my @threeletters = split(/\n/,`$grepstring`);
+ my $word = $threeletters[rand(@threeletters)];
+ $word = &tangle($word) if ($p<5);
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
new file mode 100644
index 000000000000..f7a29ccaa787
--- /dev/null
+++ b/app-admin/passook/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>Passook is a perl script that generates passwords. You can
+ customize the security of the password generated.</longdescription>
+ <upstream>
+ <remote-id type="github">mackers/passook</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
new file mode 100644
index 000000000000..4cbd2bae4926
--- /dev/null
+++ b/app-admin/passook/passook-20121001.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils prefix
+
+DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords"
+HOMEPAGE="https://github.com/mackers/passook"
+# snapshot of https://github.com/mackers/passook.git
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="dev-lang/perl
+ sys-apps/miscfiles"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/passook.patch
+ eprefixify passook
+}
+
+src_install() {
+ dobin passook
+ dodoc README passook.cgi
+}
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
new file mode 100644
index 000000000000..953ada597894
--- /dev/null
+++ b/app-admin/passwordsafe/Manifest
@@ -0,0 +1,4 @@
+DIST passwordsafe-1.02.1_beta.tar.gz 14068085 SHA256 cd376032947c705fbbdbecb763eea760cc7ce2e1eb539df04bda3fad34ad9e27 SHA512 c83a0c757f9f74906ffaebf650fd3f422a29f838c7f5430b3d3e32852b35dd92dc413a1c920320af9812d7960f0648e8df8a9d145828f8669e824e9972038067 WHIRLPOOL b082cdc26167be832302df4a07d695bba8a581a588b7ee66f6549ab2642b35b85d5921a8381b5f21726b5d0f93fc88d6dc713ff6356f9e0f5d524aeb0d92390a
+EBUILD passwordsafe-1.02.1_beta.ebuild 2259 SHA256 93497d842c1c09d49597b6281fd7cc875cb38a73d41533e2859f5cf05b3ccea6 SHA512 3dddfb2e794843a294688e9ed4941bc6f2de7593d8c35fe37b5d516a0663218d6811a0b8bdbc5da141d4b4492f95be7c2893f5c4a2204a48996cc116cb7a1993 WHIRLPOOL f2d687146cb7590484d9aa030418892986f9ded4c819368b51cbe6c26115ff7bf6f565fe91d83b7e91ca50ecaad65357a83083859d0dead5d0347bb4eda2dcf9
+MISC ChangeLog 1136 SHA256 441395b5eef494177f40eb30a313ced8006e83ead0d124c94041035532a2aa8f SHA512 6869bb03e319a1eb6cd3ca972f7c5fd2d6f0973b7b23957c12e7d0eda8b4c688b8c1274849622ff34353ac73f00c8312310210d58f043e0d41c825706c6a9f0e WHIRLPOOL c53311b0ddf7c45f883bbf5f89b3b81d8d6425355224587b466722c5819c4953997762b8172ccca06441b9a519e4fb1b573a37b6154d8da3ca512692d0d1c99a
+MISC metadata.xml 664 SHA256 38497e48ffaab531e3dcc42a70a36152a25834f2c9db3bf5c476e9c6e36c5ad2 SHA512 af244a427e45d97e9e6ab5484e6827afb0f9346d69fed5660925e5d3aa4fb2d2cff4383b8bd92cefc8d0a544d288bdea402b4de9311d647d86e7844b91d67b43 WHIRLPOOL f98c7ca48a24fd2ce3bfca28a02c462a85fa62caf7949452b658f8830db2062c49e1c5f182658ad76d8573ea3c31b8bdf703971d09cc70885e8551a174f01c54
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
new file mode 100644
index 000000000000..36988d4359d5
--- /dev/null
+++ b/app-admin/passwordsafe/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>hendrik@consetetur.de</email>
+ <name>Hendrik v. Raven (lorem_ipsum)</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
+ <flag name="yubikey">Enable support for Yubikey</flag>
+ <flag name="xml">Enable XML import support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">pwsafe/pwsafe</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
new file mode 100644
index 000000000000..e9379a687089
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+inherit eutils flag-o-matic wxwidgets cmake-utils
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal test yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+ sys-apps/util-linux
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ !minimal? ( !!app-misc/pwsafe )
+ yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ sys-devel/gettext
+ test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/pwsafe-${MY_PV}
+
+pkg_pretend() {
+ einfo "Checking for -std=c++11 support in compiler"
+ test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+ default
+ # binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
+ # instead. Perform required changes in linking files
+ sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
+ sed -i docs/pwsafe.1 \
+ -e 's/PWSAFE/PASSWORDSAFE/' \
+ -e "s/^.B pwsafe/.B ${PN}/" || die
+ use test || sed -i -e '/find_package(GTest REQUIRED)/s/^/#/' \
+ -e '/add_subdirectory (src\/test)/s/^/#/' CMakeLists.txt || die
+}
+
+src_configure() {
+ need-wxwidgets unicode
+
+ local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON')
+ $(usex xml '' '-DNO_XML=ON') )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ pushd "${BUILD_DIR}" || die
+ if use minimal; then
+ newbin pwsafe ${PN}
+ else
+ dobin pwsafe
+ dosym pwsafe /usr/bin/${PN}
+ fi
+ insinto /usr/share/locale
+ doins -r src/ui/wxWidgets/I18N/mos/*
+
+ # The upstream Makefile builds this .zip file from html source material for
+ # use by the package's internal help system. Must prevent
+ # Portage from applying additional compression.
+ docompress -x /usr/share/doc/${PN}/help
+ insinto /usr/share/doc/${PN}/help
+ doins help/*.zip
+
+ popd || die
+
+ newman docs/pwsafe.1 ${PN}.1
+
+ dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt}
+
+ insinto /usr/share/pwsafe/xml
+ doins xml/*
+
+ newicon install/graphics/pwsafe.png ${PN}.png
+ newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
new file mode 100644
index 000000000000..4c449f9485da
--- /dev/null
+++ b/app-admin/paxtest/Manifest
@@ -0,0 +1,6 @@
+AUX paxtest-0.9.13-Makefile.patch 675 SHA256 5e9513c9a621616d34156ef76217845ded571838867ce7573d5f718cdd267d52 SHA512 91447e797fcb320abade16bd8c0bd9ec53a112fe157165407790eddac15f02338e59244fb56715b5ada1d1ed526093bba600ec8b7c2a0f330315b7a821c7c276 WHIRLPOOL 9b80a1e0c04df449d9eb2c1cf34101abe93a3ec38f323cf930138a8bfcaf0363baa07be38914d5e8b4f75cfeb6bcc5e40b7511a59dc37b7c152ac9dd7b29df02
+DIST paxtest-0.9.15.tar.gz 37929 SHA256 d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487 WHIRLPOOL db58265b8140209bb253f05de912bcd4017c06bd99e6b8247f052b93081f98b88b04030b4539993a9f180969722e9d4958f929bd8a0395a027ff4e7a25b48f26
+EBUILD paxtest-0.9.15-r1.ebuild 956 SHA256 c8456d982785c80e337dae2869743d4f08d070b71b8450e797c6654140e2a72b SHA512 5777b5c648ab9826c2cbbf7c0bf907a5fb663cf36f2516ab5ab5ccedf3805e0d2ffe121cf09cb33fcdf17bc4290df07540c5222a268ea8daccda28a3b061efaa WHIRLPOOL cf5efc0f7a009cdcf10bf960b3747fdd511da4d91f26587e46ac36af40890d5c717c60541a7e0953d1578e7e4545d58256dbd679aaf6c488048614f342fa7427
+MISC ChangeLog 3226 SHA256 73acb9a5252f2d6c15064356b5889f9500b7bfa59704d56b19e054ba528471eb SHA512 0d437ed53775975f35fec5ffb07fe2de00b5119bd8a3dbfca0a3da828412f3fa735e3e81fc156298cbe79e2775f7ea403756d78616c398fa475ef0f5d50589fb WHIRLPOOL 17bd9a2a7e0c403c3d6dfd99ba05710adb7ec64334bad467676e892f4385fd210c5289c0521379372c710eab2ade5d3846a7a64b88f00fc99e76b0214b7112d4
+MISC ChangeLog-2015 6761 SHA256 aa058bdfd7e0d7ea866e13003b29e7b777dbbb7b8bf5117dc0540fdff76045da SHA512 f8d5d7380d332fc73b9a64b4372dfd92038389e799e3467dcd1b5dd81a7fc7aab9fb3dcfb2ad5df644c5facdcf4fed1fa199290affe0d29f1a0abff556920ae1 WHIRLPOOL 1128d4d55afa382e2f0e18595dbea11c8b82b204b259949925e1021fb02adebfa203960b0204fb08d6d765406ffaa760bf9422e2bd76f28b1ea98fd6802d629b
+MISC metadata.xml 1188 SHA256 5a618d2afe8317f97425f3650b2addaf61b78a85a0c4bd5ab9b3c046cec21a16 SHA512 5224b34a3ee3e84ec703588292cb379d24091ec4a1b5a3b1f433b8b41c1212c82f467f14573834898c869f0321cc70344b882d4f4a64b244e64529f6daaec5f8 WHIRLPOOL 4edc620611ec67e5d623038045502c84fa4d2fc5b9e08681e8c26346e1b7feca6f415a3d510686d4261e368b661d5fe1b97fa43afc10a5efa69a4e19b3c2989f
diff --git a/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
new file mode 100644
index 000000000000..1f8a99a689b2
--- /dev/null
+++ b/app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch
@@ -0,0 +1,21 @@
+diff -Naur paxtest-0.9.13.orig/Makefile paxtest-0.9.13/Makefile
+--- paxtest-0.9.13.orig/Makefile 2014-12-09 19:53:48.000000000 -0500
++++ paxtest-0.9.13/Makefile 2014-12-12 13:07:55.715099100 -0500
+@@ -52,12 +52,14 @@
+ endif
+
+ # for some reason the .c files need it, else GNU_STACK=RWE
+-OPT_FLAGS := -O2 $(ASFLAGS)
++# Gentoo's CFLAGS should be honored
++OPT_FLAGS := $(CFLAGS) $(ASFLAGS)
+ PTHREAD := -lpthread
+ # define stripping of binaries/libs here, or set these on make's commandline,
+ # else you'll loose the chpax flags!
+-LDFLAGS :=
+-SHLDFLAGS :=
++# Gentoo's LDFLAGS should be honored
++LDFLAGS := $(LDFLAGS)
++SHLDFLAGS := $(LDFLAGS)
+ ifndef RUNDIR
+ RUNDIR := .
+ endif
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
new file mode 100644
index 000000000000..a6679d4e410e
--- /dev/null
+++ b/app-admin/paxtest/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>blueness@gentoo.org</email>
+ <description>Primary Maintainer</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
+ <longdescription>Test suite for the PaX kernel patch
+ PaX is a Linux kernel patch which adds much stricter control on how memory
+ is being used by applications. A normal Linux kernel leaves the control to the
+ application and does not implement any enforcement. Especially buffer overflow
+ attacks benefit from the absense of kernel enforced memory control. PaX tries
+ to do its best to enforce this control of memory used by applications, thereby
+ making it harder to succesfully exploit buffer overflows.
+
+ Furthermore, it adds several randomisations, which also make it harder for
+ buffer overflows to succeed.
+
+ The test programs test all this functionality, but not all PaX functionality
+ is covered.
+
+ For more information about PaX, see http://pageexec.virtualave.net/.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
new file mode 100644
index 000000000000..f90f07439b8e
--- /dev/null
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="PaX regression test suite"
+HOMEPAGE="http://pax.grsecurity.net"
+SRC_URI="http://grsecurity.net/~spender/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ sys-apps/paxctl"
+
+# EI_PAX flags are not strip safe.
+RESTRICT="strip"
+
+src_prepare() {
+ mv Makefile.psm Makefile
+ epatch "${FILESDIR}/${PN}-0.9.13-Makefile.patch"
+ sed -i "s/^CC := gcc/CC := $(tc-getCC)/" Makefile
+ sed -i "s/^LD := ld/LD := $(tc-getLD)/" Makefile
+ eapply_user
+}
+
+src_compile() {
+ emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+
+ newman debian/manpage.1.ex paxtest.1 || die
+ dodoc ChangeLog README || die
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
new file mode 100644
index 000000000000..aa7f646de67d
--- /dev/null
+++ b/app-admin/perl-cleaner/Manifest
@@ -0,0 +1,15 @@
+AUX perl-cleaner-2.20-prefix.patch 4874 SHA256 fb814277eba1dee0084e6b395183ae7acc22b60283daa10bfa45dea283e4b038 SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f WHIRLPOOL 65b1f78e3691a49e67e8603064b7e5f871761328474a7384c80b4bbdd9a8ebe2a765684e449666604c8939b57ea4f6d05110cd59a36e46bf3cb05f9f6d9c408f
+DIST perl-cleaner-2.20.tar.bz2 6704 SHA256 ecc3b160d01466a5c9a070e12f3e11719bedb45a92a2ea0227d745be6b77cf64 SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1 WHIRLPOOL 2ea9ca19738e8dd3bed076051efbccd1cced25b768ee8e95843c885b9057e1c6960247dd8f867b8ef7ab11ffffaddbedbcc01f20023203f4d3cbe7f09fd01e51
+DIST perl-cleaner-2.23.tar.bz2 6495 SHA256 b7d25021997bd9a98f5df930d16cbaec84d19674e7b0a6eb7727c11725e0f91b SHA512 e0879f75737746479cd1032acfed50f20aad183d834e1e0e9b847edeb14577b32ac8fd4b0f5ff54c03937f181d8f5702c3bd009587a5930d40eee59a13fe6624 WHIRLPOOL 5645da862594cb8b65828ab740f433cb279cb4cac84a3005f8adcced1586b54ff766cfd3bba48fe4eab8b978f4155e29de6701d62c5164bce77cea3f730bd01e
+DIST perl-cleaner-2.24.tar.bz2 7161 SHA256 870e09b492e4f725771335512694e7f8fd11ea23cba36d86a89a0ca0075fd1f7 SHA512 c6e32aa3123064e9e2fb02823a8b228e3c77720f5c471e9be51f2a4b2765a6c83dcc2ac24fbffae077f4882c70054eb0a3ca0243677a5ac970cb7a64e8b9c265 WHIRLPOOL 5b8dadc4baf6bee9822f9a062a2e79130366b6f8e10534463d1f30fe6e50a6673ba4fdbbcf7f50c6e97458876728f211b768834ef0017cbfec6647dfe3b5eeea
+DIST perl-cleaner-2.25.tar.bz2 7435 SHA256 e2e73243f5292824e9a506ae2037955a9901de498b1f88a9e74bc3ebe80a70a5 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9 WHIRLPOOL dd1545321dea22dfd465b7925f20b914b58d05464c83d10eeed96cdc270a0774c8dc81614446a36de7efbf908996c8dfd8c18912adac8bf92c0a4c975791446f
+DIST perl-cleaner-2.26.tar.bz2 7462 SHA256 018e6c83f2c6d6d67a1bf7dbcece2f961d6c498091f319b99aaab1ced93f24ab SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821 WHIRLPOOL 77a199962de0ec2bbbc4035ba1ff0633174ee17c33a30d6c804946a0bbce8d35468f1bc42f027dc6a407bbefa101f6cc7f4e7cfd632c03477956958f1bd02abd
+EBUILD perl-cleaner-2.20.ebuild 1217 SHA256 95c5544a18ca7f9d987b4e0826b9495d912d6d68c2d84af2bc6ca02f5ec63b10 SHA512 c7498e07c74a7a42a3c9eebb7c6820bb6f5fb6e776aee4d81305f9f0a3df0c12da829061b61fe76119db9236480ca8e91bdfa0b4a15a9042bee4366dd0728935 WHIRLPOOL 43ede55a959d91041a1f87f1bb5d398a9a91b0066d3b9c4ddbccd130d2bdca4d51d837ce275fb1472bd1ab5539101d86e19bfab56560d50357d3558d07a09be8
+EBUILD perl-cleaner-2.23.ebuild 1077 SHA256 86662a6f47cbfcf43c92380ed814addb09a49de6d0a3d5012d4782c4d3010c23 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232 WHIRLPOOL 6defe499e72570f030a77fc9aa297c7def5b24ed243ea76be9592b9f30c5c7883523aed493aab27cad5ae4a6b6c6adb2514bb8859148c82a52917eb1f9f35d52
+EBUILD perl-cleaner-2.24.ebuild 1077 SHA256 86662a6f47cbfcf43c92380ed814addb09a49de6d0a3d5012d4782c4d3010c23 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232 WHIRLPOOL 6defe499e72570f030a77fc9aa297c7def5b24ed243ea76be9592b9f30c5c7883523aed493aab27cad5ae4a6b6c6adb2514bb8859148c82a52917eb1f9f35d52
+EBUILD perl-cleaner-2.25.ebuild 1067 SHA256 85167547e595f6c36c4c626bdd202d0771ca3964e2f15d188373d5c2118ad67e SHA512 ed8195a90ab46c0747886b8bd9c3b663267268b1f0485f3b5f0fdcf992a48e07a27d6754f1a51ff1ea952cf741cf6013624366555ed0a134ca0606285331b204 WHIRLPOOL 21d21911d3b29a617ae41b423cf8c808b05659d4cdc5244bcb7c72a96e7143fec7db48a097add096e847f33bc95eaed2148734f3d071d1869d6756b25c0a0563
+EBUILD perl-cleaner-2.26.ebuild 1077 SHA256 86662a6f47cbfcf43c92380ed814addb09a49de6d0a3d5012d4782c4d3010c23 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232 WHIRLPOOL 6defe499e72570f030a77fc9aa297c7def5b24ed243ea76be9592b9f30c5c7883523aed493aab27cad5ae4a6b6c6adb2514bb8859148c82a52917eb1f9f35d52
+EBUILD perl-cleaner-9999.ebuild 1077 SHA256 86662a6f47cbfcf43c92380ed814addb09a49de6d0a3d5012d4782c4d3010c23 SHA512 dd23a22ddf176226923425e0de18102f06cca2274f431104a8c22a854af329368c9692c080106dd9c6769f313a40971cf2dafc36d4625fbe3be4650c3ec8f232 WHIRLPOOL 6defe499e72570f030a77fc9aa297c7def5b24ed243ea76be9592b9f30c5c7883523aed493aab27cad5ae4a6b6c6adb2514bb8859148c82a52917eb1f9f35d52
+MISC ChangeLog 4791 SHA256 1f20e1dfe4fdec7791ce89a19c9dbb36349e0a0efe0cb722c71d8514c5967f68 SHA512 5d4bd6321aa1c97bc7384865cd31fc626afaac449b859e2766a4460f04c7fcaaf2f15c836ad36c4a70b67f4c125c4908cbf89f615ea43f17d5730197f3e65562 WHIRLPOOL eba674ffc7a9a6bc8a0dedac486583c220c87d22d3ea684b464ca67c23b62e869749ec2d5e4df8aab3c725234bb60d8cf0e189cc9f9c460b4c76e56aaff3b1b5
+MISC ChangeLog-2015 16130 SHA256 e1176e1195bbb7b7b5b47c129f614dcc7e593ce2ec520e8d45b6e11bf704cf97 SHA512 20853af561ba3e1e8b956676bcafde29c9855298f57de9b0204b20861e49a80fce9f8e15f5896ee1768c8a7c60fd63bfdcf3e1d7da251f41da029e08dbce0fff WHIRLPOOL 819680af6d310e3ad5d1c3a5d608da29c013a68170a7c61f2f6cd5884252ec6fd6bd49c3cd85091605346e4ab84a094f5316a34ecd4a983e19b75b178ec0ff23
+MISC metadata.xml 399 SHA256 1a04e49859d9ffc862b017038e62f90767b5b7d456baf7400254988b98a50009 SHA512 14f0bc2bedc501060c0f30537b742d485ee883bb18929366a7400f69b759f48dc630cb379a68405bb66fdb5002beb3551b37d5fa24f6c67bea5795dbaafa6d32 WHIRLPOOL 164080e0d07a882c0e26dc479de0a17083277e7c9069200ce0df7c7c951b13916fc04cf9ee94ff1b26b980a49f496c88720528827f50b93c6bb34a90d8832031
diff --git a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
new file mode 100644
index 000000000000..27d5b1dd73dd
--- /dev/null
+++ b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
@@ -0,0 +1,111 @@
+add Prefix and Darwin support
+
+--- perl-cleaner
++++ perl-cleaner
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+ # vim: set et sw=4 sts=4 tw=80:
+ # Copyright 2005-2014 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+@@ -22,13 +22,13 @@
+ PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs"
+ PKGS_MANUAL=""
+
+-PKG_DBDIR=/var/db/pkg
++PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
+
+ # See bug 504116 for details
+-if [ -e /lib/gentoo/functions.sh ]; then
+- . /lib/gentoo/functions.sh
+-elif [ -e /etc/init.d/functions.sh ]; then
+- . /etc/init.d/functions.sh
++if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then
++ . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh"
++elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then
++ . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
+ else
+ echo "$0: Unable to find functions.sh"
+ exit 1
+@@ -157,7 +157,7 @@
+
+ veinfo 1 "Locating ph files for removal"
+ eindent ""
+- for i in /usr/lib{,64,x32}/perl5 ; do
++ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do
+ [[ ! -d ${i} ]] && continue
+ veinfo 4 "...in ${i}"
+ while IFS= read -r -d $'\0' file ; do
+@@ -183,13 +183,13 @@
+ veinfo 1 "Pretend. Nothing to do."
+ return
+ fi
+- pushd /usr/include > /dev/null
++ pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null
+ if [[ ${version} =~ ^5.(8|10) ]] ; then
+ eindent
+- veinfo 2 "...in /usr/include"
++ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include"
+ h2ph ${option} * 2>/dev/null
+ for dir in sys arpa netinet bits security asm gnu linux ; do
+- veinfo 2 "...in /usr/include/$dir/"
++ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/"
+ h2ph ${option} -r $dir/*
+ done
+ eoutdent
+@@ -220,13 +220,16 @@
+ veinfo 1 "Locating ebuilds linked against libperl"
+ fi
+
++ local scanelf=scanelf
++ [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \
++ && scanelf=scanmacho
+ if ${LIBPERL} ; then
+- if ! type -P scanelf >/dev/null 2>&1; then
+- ewarn "scanelf not found! Install app-misc/pax-utils."
++ if ! type -P ${scanelf} >/dev/null 2>&1; then
++ ewarn "${scanelf} not found! Install app-misc/pax-utils."
+ ewarn "--libperl is disbled."
+ LIBPERL=false
+ else
+- SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')"
++ SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')"
+ veinfo 4 SONAME="${SONAME}"
+ fi
+ fi
+@@ -268,7 +271,7 @@
+ while read -r type file ; do
+ shopt -s extglob
+ [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue
+- [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
++ [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
+ file=${file% +(!([[:space:]])) +([[:digit:]])}
+ shopt -u extglob
+ if ${FORCE} || outdated_path "${file}" ; then
+@@ -302,7 +305,7 @@
+
+ if ${LIBPERL} ; then
+ # We assume the broken libs have all bin or lib in their path
+- broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )"
++ broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )"
+ if [[ -n "${broken_libs}" ]] ; then
+ if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then
+ PKGS_TO_REMERGE+=" ${CATPKGVER}"
+@@ -327,7 +330,7 @@
+ exit $?
+ fi
+
+- if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then
++ if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then
+ # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS
+ emerge_default_opts=""
+ for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do
+@@ -383,7 +386,7 @@
+ veinfo 1 "or edited. This script cannot deal with them."
+ vecho 1
+
+- for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do
++ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do
+ [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )"
+ done
+ [[ ${#perlpath[*]} == 0 ]] && return
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
new file mode 100644
index 000000000000..1d2f125d7530
--- /dev/null
+++ b/app-admin/perl-cleaner/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>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+</maintainer>
+<maintainer type="person">
+ <email>fuzzyray@gentoo.org</email>
+ <description>Please CC me in the bugs and assign to project</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
new file mode 100644
index 000000000000..dd4dcd26b039
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ if use prefix ; then
+ # I don't dare to throw non Prefix users for the bus, but this
+ # patch should be safe for them
+ epatch "${FILESDIR}"/${P}-prefix.patch
+ eprefixify ${PN}
+ fi
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
new file mode 100644
index 000000000000..46945c3d0b0f
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ default
+ eprefixify ${PN}
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
new file mode 100644
index 000000000000..46945c3d0b0f
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ default
+ eprefixify ${PN}
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
new file mode 100644
index 000000000000..f1529ec38a5a
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ default
+ eprefixify ${PN}
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild
new file mode 100644
index 000000000000..46945c3d0b0f
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.26.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ default
+ eprefixify ${PN}
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
new file mode 100644
index 000000000000..46945c3d0b0f
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ dev-lang/perl
+ || (
+ ( sys-apps/portage app-portage/portage-utils )
+ sys-apps/pkgcore
+ sys-apps/paludis
+ )
+"
+
+src_prepare() {
+ default
+ eprefixify ${PN}
+}
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
new file mode 100644
index 000000000000..cdf92a83bc78
--- /dev/null
+++ b/app-admin/petrovich/Manifest
@@ -0,0 +1,8 @@
+AUX petrovich-1.0.0-gentoo.diff 1135 SHA256 aac6a52e39d3b725a453176565f7f28cf6f5cb176f41fdafca513c3b13be1c38 SHA512 cccefe0f88bdc0c4665e38c7e9760e273c5a40dfbbff086839128f2f3556e1e9c1094c2d7380045899d02e5c56aa84280c578a91cef86776e06841a40581b3df WHIRLPOOL 33c7400da4729787caf66f47ea9eac5e3fa492cddf9607c7030c47de49ccee3979bd4a2c378a7de6855b93a18395f19fc9bd216ba6b1def1534d3c1f22e7ff99
+AUX petrovich.conf 135 SHA256 db22ff4971cb158ced622578809ae6a33b102ffc409fa61d9d2ab8f6e30e6e12 SHA512 eaede98ec4921e5b9dae0c79f685d71c1001eed313529ff5c20a55f956d4eb2682880aebb56717f40c090feb92eeba6060aa96ecf45b94fb764cf76993febce1 WHIRLPOOL a62fa89eb8663f67c57b79fa0a2d90e6793a003269402ef590dfd456225bcf71c834e6ec2a73475081088da0bcf914b533e94355a3d7b8bb3587ee8b9611b993
+DIST petrovich-1.0.0.tar.gz 17844 SHA256 f6d1536844bda3897c7a7ee1beafa6a618fa8544f48798df61fb93e8e5a76663 SHA512 5f30cffffba670ee6c6b53b93427f380c389ba60ee5717cb6ac632aacbd81fba514c0843db4d8e093e164fd8cf275f280a9da5a184b27c077789f2e359b05b5d WHIRLPOOL cf74125699d1f559301e1c243fe9338464dabe997e4b1a29ef6d4a99b3fd43e0118e098aac76955ba6986a617505158cbe032beaaea7732e28e8dee11dce5a2b
+EBUILD petrovich-1.0.0-r1.ebuild 625 SHA256 ccd4e0c3603a69fab5623f76ac2afd51ddc020e1b29f51dc4e892c35c63fa14d SHA512 4a155e00631434dda8a2d0eac096505ae019082053333530e23f2fa0081b494069995f0529484e8ec6ed1d52e1c2385231572b6cfa3decd170f3b3e15834913e WHIRLPOOL faa85409e46a9853819403320911ed07c9d79825dc1804dee1781c65cbdaa20f41c281c48049b44e49651ae4a8ee01b49ff72037749891223bfdf5ec1554758e
+EBUILD petrovich-1.0.0.ebuild 659 SHA256 cc00a0337d3ecd980984a100f578e0102b19e5c9cf18866cf167b156faceeed3 SHA512 c1dd3338cc0f691172093c94b6733c4c4f99cfbc51e393fc5c37ce7965f400dadc5b67546d5ab7de36bac36d9bee512349c24bd533a9edc89995c1177c37dd28 WHIRLPOOL 0467fb4e6b54fa1f97932c741909a2359ca027943e1abed1b2e53fa2d9d056ea9b3177f4414cb68a1ad8893d85fdb2aa4dec46dc9ce85057ad0939bad5174f79
+MISC ChangeLog 2704 SHA256 01bba7780b2faccaea24fdf29d60b9f973ba29dd1b6cbba605f6dd0ad961da8b SHA512 19d4c2086bccee5c3eac4c91a3f241c46d11a786596272150cf8060fe74473d4a3b2339162c65167c782a3c4409733bf2a72a770b739f6d43d01ba51439d0459 WHIRLPOOL 56c848f618d740c0ef89881980c1dc1274962143a9001c60a6489637e35ec89be6f2fc033cbeca7d0b56e9e83006056e47f0e29ca4e9fce8dee51eac88b86dc7
+MISC ChangeLog-2015 1647 SHA256 b178af438ce56bc1e15f926f22e4e3deba274711bcab5af12bf5fc789c9bbc5b SHA512 645968fedf10a4baeeb421341a208fbf7cd2d75e015b516d3e84994bcfc7ec59b149a9d2494a7e78cdf357dedc23df104ff4cd11c39d3c89a1816a9953d124ad WHIRLPOOL 40a0952df441a102fa7b2df9342fa7fe007caa2ac26fea053364ae280d2c0892c10d640cb4c65ada54157a3b3995a2943c426fe3081cc98b115dccb7fa55fdf8
+MISC metadata.xml 246 SHA256 df90d7e74c6202a0f8814fe66b9e8ee653b01499f89035b0ee28ec6c12313d5f SHA512 4d51d21df3e15db124014390bae632822966de5d93b522bb12d23471b3f27b8e097a0c5b32d742c8a15ff0d98609a76da416698b09d625eef6edaa4e3b965f60 WHIRLPOOL 6fbacaf227411034a2005d722a27c8ea8ff05e898bd740a64a6c23b56ed128bfb9757b48b6fcc96b1fe41580bd7988f3e4e08a3b79bca4d044faaf3ffe61dd2c
diff --git a/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff b/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff
new file mode 100644
index 000000000000..9dd32968b249
--- /dev/null
+++ b/app-admin/petrovich/files/petrovich-1.0.0-gentoo.diff
@@ -0,0 +1,32 @@
+diff -r -C2 petrovich.orig/petrovich.pl petrovich/petrovich.pl
+*** a/petrovich.pl Mon Jul 16 12:34:55 2001
+--- b/petrovich.pl Sun Aug 5 22:22:54 2001
+***************
+*** 278,285 ****
+
+ # undef $db_hash_verifier; # for now cuz it's not working
+! $config_file = "petrovich.conf" unless defined($config_file);
+ $hash_type = "md5" unless defined($hash_type);
+ @stuff = ("filename", "mode","uid","gid","size","mtime","ctime","$hash_type");
+! $db_file = "petrovich.db" unless defined($db_file);
+
+ # if running under windows lowercase everything
+--- 278,285 ----
+
+ # undef $db_hash_verifier; # for now cuz it's not working
+! $config_file = "/etc/petrovich.conf" unless defined($config_file);
+ $hash_type = "md5" unless defined($hash_type);
+ @stuff = ("filename", "mode","uid","gid","size","mtime","ctime","$hash_type");
+! $db_file = "/var/db/petrovich/petrovich.db" unless defined($db_file);
+
+ # if running under windows lowercase everything
+***************
+*** 324,326 ****
+ }
+
+! }
+\ No newline at end of file
+--- 324,326 ----
+ }
+
+! }
diff --git a/app-admin/petrovich/files/petrovich.conf b/app-admin/petrovich/files/petrovich.conf
new file mode 100644
index 000000000000..03da7c1535fa
--- /dev/null
+++ b/app-admin/petrovich/files/petrovich.conf
@@ -0,0 +1,6 @@
+# petrovich.conf
+# to include directories to be checked include a line like the following:
+# +/sbin
+#
+# to exclude directories
+# -/var
diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
new file mode 100644
index 000000000000..d57dcbd89db6
--- /dev/null
+++ b/app-admin/petrovich/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">petrovich</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..f5bdd23dcd86
--- /dev/null
+++ b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Filesystem Integrity Checker"
+SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/petrovich"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+
+RDEPEND="virtual/perl-Digest-MD5"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
+HTML_DOCS=( CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML )
+
+src_install() {
+ dosbin "${PN}.pl"
+
+ insinto /etc
+ doins "${FILESDIR}/${PN}.conf"
+
+ dodir "/var/db/${PN}"
+
+ einstalldocs
+}
diff --git a/app-admin/petrovich/petrovich-1.0.0.ebuild b/app-admin/petrovich/petrovich-1.0.0.ebuild
new file mode 100644
index 000000000000..ffe3db4f1cd0
--- /dev/null
+++ b/app-admin/petrovich/petrovich-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Filesystem Integrity Checker"
+SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/petrovich"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc"
+
+DEPEND="virtual/perl-Digest-MD5"
+
+src_unpack () {
+ unpack ${A}
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/${PF}-gentoo.diff
+}
+
+src_install() {
+ dosbin petrovich.pl
+
+ insinto /etc
+ doins "${FILESDIR}"/petrovich.conf
+
+ dodir /var/db/petrovich
+
+ dohtml CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML
+}
diff --git a/app-admin/pprocm/Manifest b/app-admin/pprocm/Manifest
new file mode 100644
index 000000000000..e1a4c6261d9a
--- /dev/null
+++ b/app-admin/pprocm/Manifest
@@ -0,0 +1,5 @@
+DIST PProcM-1.0.tar.gz 29007 SHA256 610089283986fb81a1f936f92eb9f64406060e8602cc1ed268e16c6f4704d6cb SHA512 d592455719babb9dd55c0d63ea097fb110747eb481e81b237779543f7bc90c8fcc0a4e7ecb94e3287afe9ac9f707e1e90c28ab634dd8d0e2bd7708aee8e79277 WHIRLPOOL c30b3401a15f7eaec50540cbf617e350eec3a9a539d812254aa9de8fd1e221820f80e6ae99cfffc93272b60c100b671a5bf9cf50cc58fbe6a597696d4fe36800
+EBUILD pprocm-1.0-r2.ebuild 618 SHA256 e438abe89ce25a5b19b1d066a398d4706530c7d73b91c38f1b8fe38a210a97d8 SHA512 c384fcbfa1870d8eb54269431168462d743da0a0c35ae0f40f8784208132b2e0dc64562863623ba02518469434df4de42a81e79fffd694b35e864dda3df7c6c9 WHIRLPOOL 38fcecab382aa1f0dd430c564ce1ca816f153817dc59c20d128b60a30a4637255cbb405a146357a1b1ff2f62b3f3fc4ded52611f35ac8475a233136f658bcba0
+MISC ChangeLog 2522 SHA256 60034f648051a709f084524c899bd14b6ec4e6d0cbce3fe53f16bcbefb944aec SHA512 919fb3b285c3f2b5eea627ae197d61f5bc7a943f102d9bf6a3bf5cd662082dcbd0cf4957db6aa1cbcea76eab44e2f12327c4e7107d75ecc72366194668a578f1 WHIRLPOOL 23b07b925611d31e108ac2b8f7fe608e1e4033a594f08d14535270130fcab15f8aad4c0a74d6bcfb67bdb1304409d368d55655e3dd2c81e83a2d404f7128e5cb
+MISC ChangeLog-2015 1880 SHA256 c1475e0b2f9ea3dcadbb72d09eb1fc24483a3465f50373309f62692e27c0ae87 SHA512 bbf97546bd0a2e18e017eecb5ba610bba70e487975c6be55cf3c65e2cf96d604960c274db17ad085a71adcda6bd88290a85d8006f8fd671183db4812cf0393ba WHIRLPOOL 50dd8d6264f98735d6409ba5666fa241dcefd45d1c4d8683ac02522ee8fb17b6a584856e278a101bf8d9579cb936672dbb168c659a0eb1f9b80e390308942b8f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/pprocm/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-admin/pprocm/pprocm-1.0-r2.ebuild b/app-admin/pprocm/pprocm-1.0-r2.ebuild
new file mode 100644
index 000000000000..a91f192678ca
--- /dev/null
+++ b/app-admin/pprocm/pprocm-1.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="PProcM"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ncurses-based program to monitor CPU, disk, network and memory usage"
+HOMEPAGE="http://www.fusedcreations.com/PProcM/"
+SRC_URI="http://www.fusedcreations.com/PProcM/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+ dev-perl/POE
+ dev-perl/Sys-Statistics-Linux
+ dev-perl/IO-Pipely
+ dev-lang/perl"
+
+RDEPEND="
+ ${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS README )
+
+src_install() {
+ newbin "${MY_PN}" "${PN}"
+ einstalldocs
+}
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
new file mode 100644
index 000000000000..bb9bc12f3231
--- /dev/null
+++ b/app-admin/prelude-manager/Manifest
@@ -0,0 +1,15 @@
+AUX prelude-manager-3.0.0-conf.patch 479 SHA256 308bcc53dcc291b6ed7f0e8d06f5184ee8d01043a05ae463d674abac48a1d966 SHA512 085f46e905e5c4d0d838f11e4cd8462ede754c5009c69c623c841528dc204082ef08d18696f52eec1d220060d7ce3e5007079ebe918465fd797a5e76f68725bf WHIRLPOOL edb47512b185437fac63883c1fb9ce47cd4ad0826f0f607a48f2655321825427c9410dfd9ccc57eb6b57bffe02ce0843aba6f85c06fe592bf3898f66d4da8a30
+AUX prelude-manager-3.0.0-configure.patch 2683 SHA256 8fa0621937db43186f4175d5508ec0c111824a22f4ba7b67e1fc71f113cac150 SHA512 41dc4eb1ece15d42a21e6da611b4b8bb855b7c7fb1f75621499dc0ad33043e8f08ebadd4402855e850a2b603bc71fbbee09682c9ef40fda51b31d15038180099 WHIRLPOOL 5a97c6f95d56843c9c818684f68d9a6681b8c40f9e2237647dcf4dbc30c0cdbf75ae28b185fdb114e59541f56c535471beb6b30100f7361044ace7b13dceebbb
+AUX prelude-manager-3.0.0-run.patch 552 SHA256 6ae5590d3f2556bbb519b6ef7e6acd2420fac667158e2b40754eccf0fa34195e SHA512 2442f6e1436ef3cf9a2b572ca0c4402a67109555e56fb51355d3187386b2be69644d95b7f6e42264a2fce7db92f3d7e1274ead9c6a283f80ace040359afab88b WHIRLPOOL d71b143e3c064c9d45589d11d0c1149d5f993c3ad690319cae738e8502ffb4d15d3726f16325e428f7588fcea26d3df009927f11b9b5be8a533be54cdf4e5048
+AUX prelude-manager-3.1.0-run.patch 570 SHA256 95bae35ff9b2da40a0fd256f3ebba32050c15e9aae5cfcd013b0d5645a3a9a67 SHA512 6e8d59b49de65c00abf756c823acb43d65af065bae363f83c3f8d9b6b8743b6a449f517d129cd7d98054ded94faccf33d29e1570462e73ffd51d070da0d081c5 WHIRLPOOL a72da90c1b004e3aa726db379fdbd0b638adc2ef4c0e9dfcd8357ffec324a1c66eaa706e95b8487f3e4c64a4fbb589def6dbb6708f17999c395c76df68fc5abd
+AUX prelude-manager.initd 591 SHA256 048b5c970bc8d4142f74859e62712e6229f6d1301b329edef22f2ef3219be9a3 SHA512 0115c313fd1e964508951a9074aeb9cd5b63a14d2a63d5f205dd141d22b806955c1852d9291945725dc6d9474210700edaeb444962fd7e2f673a7adf51a8c902 WHIRLPOOL b47eaca06a22521ba3fcc3584b40a4333273c17a6ff80a2fabd1e023ebc6769e3c4e3109e14d4f0e67bf7dda213487ecb8533b7526ab13c4e881f2883af2c3c8
+AUX prelude-manager.run 133 SHA256 10fda7dada1c209ad0aadfab673e1bcc0bf2847e9e78dc0df110272b73866600 SHA512 f129cc45efb710d336dd177ba465f542aaac767579dafbbacbdc88b56fcf3b95eb219a9dff7863ca47475748b93d001218ff28a7e49b3060c62278a72666986e WHIRLPOOL 6371a588deaeed160c05f99579ade6b6c092f089f188a65a8e0317191dc7cde09ade8e8b83fd4fa2c346cb8d3422a514abdce0057327135b0ca5e9e41eecf412
+AUX prelude-manager.service 398 SHA256 f2c0eeef81da24ce44471fafcc6556d3503e246b37b0d457aa846f2329cdad78 SHA512 b3700ef920e739f521c87477a8752f787345971cd7077a4a0722b3d4069ca2ba55df3db87da4b544f559cd2e4faf2ef3b068e1c5dead6003f580dc04b4590495 WHIRLPOOL 7e545fd701e8d0f5f6f11f3a5fcdc6f1245b5b77811657334a17171de984abc3b20b29b70218c703f049312258fb86c092c71f7fc98b7ab78caef3e20f2e68b6
+DIST prelude-manager-3.0.0.tar.gz 1286459 SHA256 379de4c79ccdba4093e9c5a2b9e5c6cee8e8d8694e1358c3d248250c4957dc0b SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67 WHIRLPOOL 35814a88e62e4bfdbd3e8c88f733cd304f8fb355d820ae9887da0c9e6b02936b7aed8d73a05cc458fbf01f7a9e48174d446b1174e1edd44637fadcdc282f3f92
+DIST prelude-manager-3.1.0.tar.gz 1301799 SHA256 e5d0dbe306c5473fb5ea86d465595eca2c3d7c74b13c9dcf8786bbbc6e36ae0d SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10 WHIRLPOOL 05b6b619f7ddabcbf970e38e9c3af90b8cf6274b694caa276891f2743ea8b991f724f7f5dbbe9867afda1bba3b59d07525fca7f0fe03b0594f8ea0c796f33ce7
+DIST prelude-manager-4.0.0.tar.gz 1353116 SHA256 fa7b5094f9ebeaefa443dd3d3bb3b260e1de42548d4a691a7dd22b18116f67a1 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a WHIRLPOOL 1f4f8b7a8ad8df7a97ba3e97252eb9aff7d03f37f1c533b67544d00d02918f2f43cc61f6e523f09d4317951838bd32d8eda212e0e4e7db98def36525fbd603b0
+EBUILD prelude-manager-3.0.0.ebuild 1349 SHA256 10badcf1ad7005a1a3be061c411f6c1d895fab1a9b9cfbf964bf30e233469410 SHA512 404cd27a552a6eb9bc8ae005ddacd9734f26f52897f7d9a21568b7cb2ba1cfe82a5a9cda32f591043c65124faf5322d0dcff95b1b0cca5cb60c75331c3e8b322 WHIRLPOOL 5e548fe7b1bb6ec7e6028ca89aaf3f7021d43a442730898de5708c086430152756f3f2712215abc69e1dca70225e56bff132b14c410f9ada2df63e09ceed6915
+EBUILD prelude-manager-3.1.0.ebuild 1235 SHA256 88113da35aaebe778e68ecd97dbe08c7eaa37a8b60d5d0bf5724a7003d227ba1 SHA512 280a181934c56049823297b749b4b0de5f1f819e1c057f910bd208cbb5ebb8928a17d70969e32768ac7e6be624e314607f1b11fdba8daa375a12df443dc1a28a WHIRLPOOL 7dcc20e71b0b0082900003acb77e25a6351f98c866fa3314833b9dd922c45ea720a1e30934622cad6bca04d75d3b16577b63cfa587331f330cd5fde01c66c3ab
+EBUILD prelude-manager-4.0.0.ebuild 1253 SHA256 9f51f7685ecf80eb784d11365f7253350778e7d568e526591826b2dda222379b SHA512 3a0d79d24de4d97ba73be7cdf62f4d2d158225cdf35945e51de3854b7465a23eddc9315204a303c833e73a8965826ea18cf09951aa79697bfdc9523f0149025f WHIRLPOOL 926c13f2b0ff4fdd8bcf1142db2e4d8eb193729e961a3763bd7830c14817e6a710367985a5ba747b3ff03095ee8a4e59968d8910d0d48e1cbf559caed201c411
+MISC ChangeLog 1110 SHA256 ccfb6f577a1c1f3f7e55af01084bc11d7266a25c41a70320593fa2c63e7dda87 SHA512 2c6ec9bbbb64d890e2f9624dfb4ad265cee91a8effefe52ee52d0add804297d89553c3816a00053b2c96cc0dd532e1dfd56b54632fe7af3d5078b261669ff62f WHIRLPOOL 459bc333d21b8d4d5d03f313ea5dc9bdb7fe21bd6e93e028cb00218e9f6f95c11b39371feec7d31fc81360f216c4c26561eb55b351619209802afd2f7e0d1058
+MISC metadata.xml 1037 SHA256 aaa25cd083a1232228db30f0b8b98e55e1d43aee7877941897bdc7afea9ce7d2 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34 WHIRLPOOL 48aa0a4d1d6ca37fc049dd13ee2d77a67198f8f73c35d8701af378e84c4e4a87d665b876d48559c616ed28ea190f8e39ce5ab312a67b2ac243f60c7f9c728c89
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
new file mode 100644
index 000000000000..246ce7d921e5
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
@@ -0,0 +1,11 @@
+--- a/prelude-manager.conf.in
++++ b/prelude-manager.conf.in
+@@ -361,7 +361,7 @@
+ # (same source, target and classification combination) every 2 minutes
+ # to reporting plugins (eg. to the database).
+ [thresholding]
+-path = alert.classification.text, alert.source.node.address.address, alert.target.node.address.address
++path = alert.classification.text, alert.source(0).node.address(0).address, alert.target(0).node.address(0).address
+ limit = 120
+ count = 100
+ hook = reporting
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
new file mode 100644
index 000000000000..bc1949f01510
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
@@ -0,0 +1,57 @@
+When : when you try to use enable with libmaxmind, libpreludedb, xml, libwrap, they are not working
+Why : Needed if you want to use useflags
+--- a/configure.in
++++ b/configure.in
+@@ -110,7 +110,10 @@
+ dnl **************************************************
+ LIBMAXMINDDB_MIN_VERSION=1.0.0
+
+-PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
++AC_ARG_ENABLE(libmaxminddb, AC_HELP_STRING(--enable-libmaxminddb, Define whether libmaxminddb is available), , enable_libmaxminddb="yes")
++if test x$enable_libmaxminddb = xyes; then
++ PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
++fi
+ if test x$enable_libmaxminddb = xyes; then
+ AC_CHECK_HEADER(maxminddb.h, enable_libmaxminddb=yes, enable_libmaxminddb=no)
+ fi
+@@ -126,11 +129,14 @@
+ dnl * Check for libpreludedb *
+ dnl **************************************************
+
+-AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
+-AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
++AC_ARG_ENABLE(libpreludedb, AC_HELP_STRING(--enable-libpreludedb, Define whether libpreludedb is available), , enable_libpreludedb="yes")
++if test x$enable_libpreludedb = xyes; then
++ AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
++fi
+ if test x$enable_libpreludedb = xyes; then
+ AC_DEFINE_UNQUOTED(HAVE_LIBPRELUDEDB, , Define whether libpreludedb is available)
+ fi
++AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
+
+
+
+@@ -138,7 +144,10 @@
+ dnl * Check for the Libxml2 *
+ dnl ********************************************************
+
+-AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
++AC_ARG_ENABLE(xmlmod, AC_HELP_STRING(--enable-xmlmod, Enable XML), , enable_xmlmod="yes")
++if test x$enable_xmlmod = xyes; then
++ AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
++fi
+ AM_CONDITIONAL(HAVE_XML2, test x$enable_xmlmod = xyes)
+
+
+@@ -147,9 +156,10 @@
+ dnl * TCP WRAPPER CHECK *
+ dnl **************************************************
+
++AC_ARG_WITH(libwrap, AC_HELP_STRING(--with-libwrap, Compile in libwrap (tcp_wrappers) support.), , with_libwrap="yes")
+ AC_ARG_WITH(libwrap-prefix, AC_HELP_STRING(--with-libwrap-prefix@<:@=PFX@:>@,
+ Compile in libwrap (tcp_wrappers) support @<:@default=auto@:>@.),
+- libwrap_required=true, with_libwrap="yes")
++ libwrap_required=true, )
+
+ if test x$with_libwrap != xno; then
+ LIBWRAP_INCLUDE="tcpd.h"
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
new file mode 100644
index 000000000000..ef6d553a3d27
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
@@ -0,0 +1,13 @@
+When : everytime
+Why : since systemd, run dir has changed
+--- a/configure.in
++++ b/configure.in
+@@ -304,7 +304,7 @@
+
+ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
+ manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
+-manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
++manager_run_dir=/run/prelude-manager
+
+ AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
+ AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
new file mode 100644
index 000000000000..4012c6c4b794
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager-3.1.0-run.patch
@@ -0,0 +1,13 @@
+When : everytime
+Why : Fix the run dir to comply with the Gentoo FS layout.
+--- a/configure.ac
++++ b/configure.ac
+@@ -337,7 +337,7 @@
+
+ manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
+ manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
+-manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
++manager_run_dir=/run/prelude-manager
+
+ AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
+ AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
diff --git a/app-admin/prelude-manager/files/prelude-manager.initd b/app-admin/prelude-manager/files/prelude-manager.initd
new file mode 100644
index 000000000000..14a39ba415e8
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+BIN_MANAGER=/usr/bin/prelude-manager
+PID_MANAGER=/run/prelude-manager/prelude-manager.pid
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting prelude-manager"
+ checkpath -d -m 0755 -o root:root /run/prelude-manager
+ start-stop-daemon --start --exec $BIN_MANAGER \
+ --pidfile $PID_MANAGER -- -d -P $PID_MANAGER
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping prelude-manager"
+ start-stop-daemon --stop --exec $BIN_MANAGER \
+ --pidfile $PID_MANAGER
+ eend $?
+}
diff --git a/app-admin/prelude-manager/files/prelude-manager.run b/app-admin/prelude-manager/files/prelude-manager.run
new file mode 100644
index 000000000000..739808485129
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.run
@@ -0,0 +1,4 @@
+# Configuration to create /run/prelude-manager directory
+# Used as part of systemd's tmpfiles
+
+d /run/prelude-manager 0755 root root
diff --git a/app-admin/prelude-manager/files/prelude-manager.service b/app-admin/prelude-manager/files/prelude-manager.service
new file mode 100644
index 000000000000..15eee91b8aa7
--- /dev/null
+++ b/app-admin/prelude-manager/files/prelude-manager.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Prelude-Manager service
+DefaultDependencies=no
+After=remote_fs.target
+Before=prelude-lml.service prelude-correlator.service
+
+[Service]
+ExecStart=/usr/bin/prelude-manager -d -P /run/prelude-manager/prelude-manager.pid
+Type=forking
+PIDFile=/run/prelude-manager/prelude-manager.pid
+Restart=always
+
+[Install]
+WantedBy=prelude-lml.service prelude-correlator.service multi-user.target
diff --git a/app-admin/prelude-manager/metadata.xml b/app-admin/prelude-manager/metadata.xml
new file mode 100644
index 000000000000..5990a2a5fbd3
--- /dev/null
+++ b/app-admin/prelude-manager/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>thomas.andrejak@gmail.com</email>
+ <name>Thomas Andrejak</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ Prelude-Manager is a high availability server that
+ accepts secured connections from distributed sensors
+ and saves received events to a media specified by the user
+ (database, log file, mail etc.). The server schedules and
+ establishes the priorities of treatment according to the
+ critical character and the source of the alerts.
+ </longdescription>
+ <use>
+ <flag name="tcpwrapper">Enables Prelude Manager using
+ tcp wrapper. It requires <pkg>sys-apps/tcp-wrappers</pkg>
+ .</flag>
+ <flag name="dbx">Enables Prelude Manager storing Prelude
+ alerts into database through <pkg>dev-libs/libpreludedb</pkg>
+ .</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
new file mode 100644
index 000000000000..c9aec56bed73
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpwrapper xml geoip dbx"
+
+RDEPEND="net-libs/gnutls
+ dev-libs/libprelude
+ dbx? ( dev-libs/libpreludedb )
+ tcpwrapper? ( sys-apps/tcp-wrappers )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( dev-libs/libmaxminddb )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-conf.patch"
+ "${FILESDIR}/${P}-configure.patch"
+ "${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+ default_src_prepare
+
+ mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ $(use_enable dbx libpreludedb) \
+ $(use_with tcpwrapper libwrap) \
+ $(use_enable xml xmlmod) \
+ $(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+ default_src_install
+
+ rm -rv "${D}/run" || die "rm failed"
+ keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+ prune_libtool_files --modules
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
new file mode 100644
index 000000000000..45047c38dbc8
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpwrapper xml geoip dbx"
+
+RDEPEND="net-libs/gnutls:=
+ ~dev-libs/libprelude-${PV}
+ dbx? ( ~dev-libs/libpreludedb-${PV} )
+ tcpwrapper? ( sys-apps/tcp-wrappers )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( dev-libs/libmaxminddb )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-run.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ $(use_with dbx libpreludedb-prefix) \
+ $(use_with tcpwrapper libwrap) \
+ $(use_with xml xml-prefix) \
+ $(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+ default
+
+ rm -rv "${ED%/}/run" || die "rm failed"
+ keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+ find "${D}" -name '*.la' -delete || die
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
new file mode 100644
index 000000000000..30855a48ed97
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbx geoip tcpwrapper xml"
+
+RDEPEND="net-libs/gnutls:=
+ ~dev-libs/libprelude-${PV}
+ dbx? ( ~dev-libs/libpreludedb-${PV} )
+ geoip? ( dev-libs/libmaxminddb )
+ tcpwrapper? ( sys-apps/tcp-wrappers )
+ xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ $(use_with dbx libpreludedb-prefix) \
+ $(use_enable geoip libmaxminddb) \
+ $(use_with tcpwrapper libwrap) \
+ $(usex xml '' '--without-xml-prefix')
+}
+
+src_install() {
+ default
+
+ rm -rv "${ED%/}/run" || die "rm failed"
+ keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+ find "${D}" -name '*.la' -delete || die
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
new file mode 100644
index 000000000000..8367ab2a66e9
--- /dev/null
+++ b/app-admin/procinfo-ng/Manifest
@@ -0,0 +1,7 @@
+AUX procinfo-ng-2.0.304-as-needed.patch 441 SHA256 f33190637299d56ea1d28bec95fbb93c8e819fa001b4f44154a9a47b0f8cb74c SHA512 70a95c828a7a9bcea8559e1709bfcb2a88fd53a9aaf3c58c51faa04f32b50ec2f0db2705f6093e06ae0efdf2aafa7854b9f7aadf072ee8cd667fb2dce48e5ba0 WHIRLPOOL 3998f9684da975b74def71fd7898fba267b149067dc9abf4fa1f41529eca30583095af81bb1187ee3d38f76cd9ceef96c7a87d7597e4ec12c76f4d2b261874ef
+AUX procinfo-ng-2.0.304-man.patch 243 SHA256 ad2482e17513bec7a2bc08e15585126448ae797d71a0af15b47d5533f531aa7f SHA512 2541b4738e6323627625e7d65ee2ddc88d61e76f7b5bfbd382472d048ad21e3b63eb8a92feb7af6e62ac54045aa25ffbdfe36d67c1a4dc0c7a7be9abeb5ba9ed WHIRLPOOL ba0b05c8f4bdc9b216da2da6b4b47ce2dccd1a8be1be40167057427afcb0561cd229aa1042481ccd96d604c35b080600f7088a3879f9737c9e915fa9e6bff75c
+DIST procinfo-ng-2.0.304.tar.bz2 62469 SHA256 0cd944df90c1ea55b489ea64ec4863fe7f1a158f16660c58f94067e4f96786b0 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf WHIRLPOOL 376048ba76414384dc9a804af5c22064181941b5663cf2f3817b5ba1429a573068235877324a7adec40dc82a539597224e36839333eacaa74f4c67dbd8b82ef3
+EBUILD procinfo-ng-2.0.304-r1.ebuild 929 SHA256 3e1c6ea9e5fa105d6676ad904874c54386d986726d1f6bcbb64098d7ab473639 SHA512 7ddd5610fb89bb0b672c4e232905ffdefd596c1c0971629ca01a82e271f1354940789e639052072c8083b563c04494d5d12b9ab1f645b00ed24667a3ed4f5a86 WHIRLPOOL afbaa2a7c6ecf7a072dd4e11328b1af996c9d2145b50fc5777a820abc6c926092b636a17bf6df39d567d9cd373b0cb5a8537a6ce44593939fadb1aba26fd035a
+MISC ChangeLog 2799 SHA256 024b787089927aa27125869b308e1f128eb5586371dc17409503e44dbc80f49e SHA512 0e56c59640cdfc2236f2f2f6d87bcf920edb144202b84d30301fe7bf272d8a77401cf22579450c6f6ffe7d033142eb3c5b0347aba5eeda25642b8feaa139e9e3 WHIRLPOOL 54b27100508fcf9d48582649156530849bf4ec3634e2254bb62c277148d9af6cd2924a133737a49eee6af414d44b200f20496eeb9640978939e6d19fcaa6e4ee
+MISC ChangeLog-2015 1806 SHA256 bd260df95404139d327b2797a1f9aade3bed515f6d60a6cb3593dd92b8bf8bcb SHA512 1d15849f056c84e953398cc6816b879f984c1507017ada4834d7154f305e095e2a89a320cd0f7f3fe4061e9d6b1c713edcc9d2cdc686319b7b78b44e275079fa WHIRLPOOL 658e7d2029ad2045ed87075a4ab802944a64fc5efda043fdb584487d2c150828a65f8d1b13bc96ac35d8c46f00f4ee5f848397319faac99ac717b5305e23b4b0
+MISC metadata.xml 356 SHA256 fdb9a034009275bf682931f8cdccc69e080b6fbab5f56f4d474bef06144c85f4 SHA512 3b442e3aff5a26f504f930a0698b376cb0091daa868579ea436aad142222b101c88ace8faaf8fdf9e79dfdb2c7feaeb44f863c0b0d43e7ec85237c56e892255e WHIRLPOOL a0e86569bb42536ecf9123560c1d62b97aab125459af8c3e5ff2fd3655b3c12cc22bd8ee558e60f6cafe7d6173cb134741e0624886f2ac699d672f8b9127357a
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
new file mode 100644
index 000000000000..a489f5337879
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-as-needed.patch
@@ -0,0 +1,11 @@
+--- Makefile.in 2009-04-27 05:33:50.000000000 +0200
++++ Makefile.in.new 2009-10-11 15:22:23.458985416 +0200
+@@ -44,7 +44,7 @@
+ cygwin_procstat.cpp cygwin_rendercpupagestat.cpp \
+ lib/routines.cpp lib/timeRoutines.cpp lib/prettyPrint.cpp \
+ Makefile
+- $(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@
++ $(CXX) $(CFLAGS) $(LDFLAGS) procinfo.cpp -o $@ $(LIBS)
+
+ #procinfo.o: procinfo.cpp procinfo.h
+ # $(XX) $(CFLAGS) procinfo.cpp -o procinfo.o
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
new file mode 100644
index 000000000000..ce818fcd3e77
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
@@ -0,0 +1,11 @@
+--- procinfo-ng-2.0.217/procinfo.8.orig 2009-01-11 11:21:23.000000000 +0100
++++ procinfo-ng-2.0.217/procinfo.8 2009-01-11 11:21:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ .SH SYNOPSIS
+ .B procinfo
+ [
+-.IR \-fdDSbrhv
++.IR \-dDSbrhv
+ ] [
+ .IR \-n N
+ ]
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
new file mode 100644
index 000000000000..91691a0324a8
--- /dev/null
+++ b/app-admin/procinfo-ng/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">procinfo-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
new file mode 100644
index 000000000000..9cdb4c9c0fd6
--- /dev/null
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-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 autotools eutils toolchain-funcs
+
+DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
+HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses
+ !app-admin/procinfo"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-man.patch
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ # removing -s flag as portage does the stripping part and add support
+ # for custom LDFLAGS. Plus correct for --as-needed
+ sed \
+ -e 's:-s -lncurses:${LDFLAGS}:' \
+ -i configure.in || die "sed configure.in failed"
+ eautoreconf
+}
+
+src_compile() {
+ emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest
new file mode 100644
index 000000000000..1e791eaeef10
--- /dev/null
+++ b/app-admin/procinfo/Manifest
@@ -0,0 +1,9 @@
+AUX cpu-usage-fix.patch 791 SHA256 6f1be6a86a4e38008660cb7f5039c5c267a3ec1c0d6819b298473e0aa2797bba SHA512 48b8bae8a8f117edd60dbb43172768bdbf8c8c0f718739ab1957afbecab323255de48504298ae2c03e3c52fac86dc47cd6bd44cd5c48d1f450404268833fd090 WHIRLPOOL f1922fb81c80b140f8518c3d186fe13620df3efa8644903993deaa44b3a6e0d8c6190e4331550a090d873149c27cd9d8fb869f7e4a1f302a5c6e20c89f8ac615
+AUX kernel-2.6.patch 9954 SHA256 db154ead361395186e9fe3a120eb71ce1b3cd8df04560459ec44398db7a0b9a1 SHA512 4c5ee12f199bb24459c1a41a927343bf4c1503229f8522c36ed07df7ec953331346e1271e5ac9bd1ad2d0a5efa5dfdc0276da40d68185655e1a5a96f4b8c0cff WHIRLPOOL def7e81259848bf6e5d8b32307f5cc85647f48354fb238f3f0c9c5309f208c37deeff15478ecd78d5919545b6bdf443141b1ba495cfcf3247749a36b2dfcc232
+AUX procinfo-18-stat.patch 778 SHA256 b0312e05e8f77faf73e9dd18e1c8a0133c26159d0fd3032821f883a99444f96f SHA512 d9672780ca78976e84cddd80469553b1d5dcbb8c361ec4e2c6229e608a6a309293ced9ac41ee55b609ce7c8b4019571e406bda5228c2277e0e1ff7553ba700da WHIRLPOOL 7be4cc18a97b81a351800ff56209e001bdc4b61f21a312ce5acd7b6b4a159f235df71ce0741a437911b3b890c564cd3c80bae87b40fc4e3999a64376742091b2
+AUX procinfo-flags.patch 373 SHA256 80b65c4444ce0367876e6e083de99402a5abafc5065bee15e5951d5c274e75be SHA512 00ee615dc6156a5c162237abcfaec7596dd358e534c68208b39d1f2487d73e10cde77bf3ead8650d18cce640f2a5381eb13078c87e6525ce8d2448beba1454c1 WHIRLPOOL f705a03521fbef410b7d1df0510a67aa6ca216a2a643de3ce71f5ca445521e33f0f08b0c0c6a7566b3d4ae13e1d73322edfef738b821d32c7bbd92bf10b651fd
+DIST procinfo-18.tar.gz 24365 SHA256 c114e625b87fb06585484eb9f3ff868de165b3e61926fee55479d1bd3de09b99 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa WHIRLPOOL b906ab0c015a199cad894eff1c1c104abe5c8c599a18bc6310904c45b26347b8c8c906cd6839ab4b01e0a917557d52f4c465fcb884193c79c54d93136c9f4777
+EBUILD procinfo-18-r2.ebuild 836 SHA256 54bbe38387d864a4479845562ab75be988835c596a89a251945aaee68c3617b1 SHA512 f91367e56f4b3191eff3050a3e4b388eca8bc65d070c5592821b22ca7fea6fdb53dbbeb912a5ebf7b3091d1ea66950b62f3c5777318c4f8df7ee37f50a843d91 WHIRLPOOL 11ab91df681435814429a7d8b86fad23dab5fbccf7d4da1b1c7bc37db13cd92fbf6bb8c608042875b106843adb28ae6b88de7ab530bedd0b1d15c8f3075600f4
+MISC ChangeLog 2643 SHA256 3d9f833f4502e66163891b2e0ce65b7da1af3dda0da105b37c3c0cbefac19101 SHA512 f7455f466b0ae097667c815b39ed2a3a47ae708505d4cb4433f76b174b2f0f92c3a84f78c9fdb5aed24395fd5e5a8d6ee972967bf26dab117e13ca79298475fd WHIRLPOOL c01e4f807b1259f00f2cf4a53f27012a3c18fcf43e7d013e5b26a27140e2826a785ed98a3cf653937ec112ef71f0b7068908aa965da29530832541546eeacd04
+MISC ChangeLog-2015 3714 SHA256 88bc4a58fa28d8c4386bbe2ac220904459dbca76113b5d5e00cac1b6988912c1 SHA512 311676e7548ddd8d480649a8d8d31d06644ef5d9ffd86f82e91bd13f6f4478f2793cb6f176355f4c107d6158ad239581206d1a2a4f8eccca6283f44ac2b055a8 WHIRLPOOL 8ec0dde2695479d364d81de5d56ca07dc42e8a8378be3f6fc68251b9219430e5d5a2f8c52f0d905871bd5a7004b2354908e41a17199fc9826c339a5c69bc4d64
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/procinfo/files/cpu-usage-fix.patch b/app-admin/procinfo/files/cpu-usage-fix.patch
new file mode 100644
index 000000000000..f2bace1bd2cc
--- /dev/null
+++ b/app-admin/procinfo/files/cpu-usage-fix.patch
@@ -0,0 +1,31 @@
+--- procinfo.c~ 2005-01-31 20:52:29.250918264 +0200
++++ procinfo-18/procinfo.c 2005-01-31 20:48:55.907351416 +0200
+@@ -402,26 +402,8 @@
+ }
+
+ elapsed = new.uptime;
+-
+-/* XXX Is this stuff still relevant/true? */
+-
+-#ifdef __i386__ /* IRQ 0 is timer tick on i386's... */
+- if (nr_irqs) {
+- if (fs && old.uptime)
+- elapsed = DIFF (intr[0]);
+- } else
+-#endif
+-#ifdef __sparc__ /* IRQ 10 is timer tick on sparc's... */
+- if (nr_irqs) {
+- if (fs && old.uptime)
+- elapsed = DIFF (intr[10]);
+- } else
+-#endif
+- {
+- /* This won't be exact... */
+- if (fs && old.uptime)
+- elapsed = DIFF (uptime);
+- }
++ if (fs && old.uptime)
++ elapsed = DIFF (uptime);
+
+ printf ("user : %s %s",
+ hms (bDIFF (cpu_user)), perc (bDIFF (cpu_user), elapsed, nr_cpus));
diff --git a/app-admin/procinfo/files/kernel-2.6.patch b/app-admin/procinfo/files/kernel-2.6.patch
new file mode 100644
index 000000000000..b1eef39e3088
--- /dev/null
+++ b/app-admin/procinfo/files/kernel-2.6.patch
@@ -0,0 +1,296 @@
+diff -ruN procinfo-18/procinfo.c procinfo-19/procinfo.c
+--- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
++++ procinfo-19/procinfo.c 2004-06-17 10:28:33.767925439 +0100
+@@ -5,9 +5,10 @@
+ Displays general info from /proc.
+
+ Date: 1995-07-08 05:30:34
+- Last Change: 2001-02-25 00:27:21
++ Last Change: 2004-06-17 11:28:13
+
+ Copyright (c) 1994-2001 svm@kozmix.cistron.nl
++ Copyright (c) 2004 procinfo@meisel.cc (upgrades for 2.6 kernel)
+
+ This software is released under the GNU Public Licence. See the file
+ `COPYING' for details. Since you're probably running Linux I'm sure
+@@ -26,6 +27,7 @@
+ #include <string.h>
+ #include <termios.h>
+ #include <termcap.h>
++#include <ctype.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/param.h> /* for HZ -- should be in <time.h> ? */
+@@ -72,9 +74,9 @@
+ int nr_irqs = 0;
+ int nr_cpus = 0;
+
+-FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp,
++FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp, *diskstatsfp,
+ *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
+- *versionfp, *cpuinfofp;
++ *versionfp, *cpuinfofp, *vmstatfp;
+
+ char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
+
+@@ -89,9 +91,13 @@
+ {
+ unsigned long elapsed;
+ char loadavg[32];
+- int i;
++ int i, havetwosix = 0, lastdisk;
+ static int have_m_c = -1; /* Do we have cache info? */
+ static int have_m_l = -1; /* Do we have new-style-one-datum-per-line? */
++ char devicename[10];
++ char *last;
++ unsigned int q,w,a,s,d,f,g,h,j,k,l,y,x;
++ int disk_counter = 0, ret;
+
+
+ /**** /proc/uptime ****/
+@@ -237,6 +243,50 @@
+
+ printf ("Bootup: %s Load average: %s\n\n", booted, loadavg);
+
++/**** /proc/vmstat ... 2.6.x kernel only ****/
++ if (vmstatfp) {
++ havetwosix = 1;
++ fseek (vmstatfp, 0L, SEEK_SET);
++ while (fgets (line, sizeof (line), vmstatfp)) {
++ char *type = strtok (line, " ");
++ if (ISSTR ("pgpgin")) {
++ new.pgin = VAL;
++ } else if (ISSTR ("pgpgout")) {
++ new.pgout = VAL;
++ } else if (ISSTR ("pgactivate")) {
++ new.pgac = VAL;
++ } else if (ISSTR ("pgdeactivate")) {
++ new.pgdeac = VAL;
++ } else if (ISSTR ("pgfault")) {
++ new.pgfault = VAL;
++ } else if (ISSTR ("pswpin")) {
++ new.swin = VAL;
++ } else if (ISSTR ("pswpout")) {
++ new.swout = VAL;
++ }
++ }
++ }
++
++/**** /proc/diskstats ... 2.6.x kernel only ****/
++ if (diskstatsfp) {
++ havetwosix = 1;
++ fseek (diskstatsfp, 0L, SEEK_SET);
++ while (fgets (line, sizeof (line), diskstatsfp)) {
++ char *type = strtok (line, "\n");
++ ret = sscanf (type, "%d%d%s%d%d%d%d%d%d%d%d%d%d%d", &q, &w, devicename, &a, &s, &d, &f, &g, &h, &j, &k, &l, &y, &x);
++ if (ret != 14) /* Everything with less than 14 elements is not a disk device */
++ continue;
++ last = devicename+strlen(devicename)-1;
++ if (isalpha(*last)) {/* Is the last char is a number ignore it .. like fd0 */
++ if (++disk_counter > 7) /* 7 disks is all we have room for */
++ continue;
++ else {
++ new.disk_r[disk_counter-1] = a;
++ new.disk_w[disk_counter-1] = g;
++ }
++ }
++ }
++ }
+
+ /**** /proc/stat ****/
+
+@@ -249,6 +299,9 @@
+ new.cpu_nice = VAL;
+ new.cpu_sys = VAL;
+ new.cpu_idle = VAL;
++ new.cpu_iowait = VAL;
++ new.cpu_hirq = VAL;
++ new.cpu_sirq = VAL;
+ /*
+ * according to bug #1959, sometimes the cpu_idle
+ * seems to go backwards(!) on SMP boxes. This may
+@@ -262,34 +315,54 @@
+ new.disk[1] = VAL;
+ new.disk[2] = VAL;
+ new.disk[3] = VAL;
++ new.disk[4] = VAL;
++ new.disk[5] = VAL;
++ new.disk[6] = VAL;
+ } else if (ISSTR ("disk_rio") && io_or_blk == 0) {
+ new.disk_r[0] = VAL;
+ new.disk_r[1] = VAL;
+ new.disk_r[2] = VAL;
+ new.disk_r[3] = VAL;
++ new.disk_r[4] = VAL;
++ new.disk_r[5] = VAL;
++ new.disk_r[6] = VAL;
++ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
++ new.disk_w[0] = VAL;
++ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
++ new.disk_w[0] = VAL;
++ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
++ new.disk_w[0] = VAL;
+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
+ new.disk_w[0] = VAL;
+ new.disk_w[1] = VAL;
+ new.disk_w[2] = VAL;
+ new.disk_w[3] = VAL;
++ new.disk_w[4] = VAL;
++ new.disk_w[5] = VAL;
++ new.disk_w[6] = VAL;
+ } else if (ISSTR ("disk_rblk") && io_or_blk == 1) {
+ new.disk_r[0] = VAL;
+ new.disk_r[1] = VAL;
+ new.disk_r[2] = VAL;
+ new.disk_r[3] = VAL;
++ new.disk_r[4] = VAL;
++ new.disk_r[5] = VAL;
++ new.disk_r[6] = VAL;
+ } else if (ISSTR ("disk_wblk") && io_or_blk == 1) {
+ new.disk_w[0] = VAL;
+ new.disk_w[1] = VAL;
+ new.disk_w[2] = VAL;
+ new.disk_w[3] = VAL;
++ new.disk_w[4] = VAL;
++ new.disk_w[5] = VAL;
++ new.disk_w[6] = VAL;
+ } else if (ISSTR ("disk_io:")) {
+- int disk_counter = 0, ret;
+ unsigned int q, w, e, r, t, y, u; /* I'm NOT in the mood today. */
+ char *barf;
+
+ while ((barf = strtok (NULL, " "))) {
+
+- if (++disk_counter > 4) /* 4 is all we have room for */
++ if (++disk_counter > 7) /* 7 is all we have room for */
+ continue;
+
+ ret = sscanf (barf, "(%d,%d):(%d,%d,%d,%d,%d)",
+@@ -374,7 +447,10 @@
+
+ printf ("system: %s %s",
+ hms (bDIFF (cpu_sys)), perc (bDIFF (cpu_sys), elapsed, nr_cpus));
+- printf (" swap in :%9lu", bDIFF (swin));
++ if (havetwosix)
++ printf (" page act:%9lu", bDIFF (pgac));
++ else
++ printf (" swap in :%9lu", bDIFF (swin));
+ if (new.disk_r[2])
+ printf (" disk 3: %8lur%8luw\n", bDIFF (disk_r[2]),
+ bDIFF (disk_w[2]));
+@@ -383,14 +459,53 @@
+ else
+ putchar ('\n');
+
++ if (havetwosix) {
++ printf ("IOwait: %s %s",
++ hms (bDIFF (cpu_iowait)), perc (bDIFF (cpu_iowait), elapsed, nr_cpus));
++ printf (" page dea:%9lu", bDIFF (pgdeac));
++ if (new.disk_r[3])
++ printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
++ bDIFF (disk_w[3]));
++ else if (new.disk[3])
++ printf (" disk 4: %8lu\n", bDIFF (disk[3]));
++ else
++ putchar ('\n');
++
++ printf ("hw irq: %s %s",
++ hms (bDIFF (cpu_hirq)), perc (bDIFF (cpu_hirq), elapsed, nr_cpus));
++ printf (" page flt:%9lu", bDIFF (pgfault));
++ if (new.disk_r[4])
++ printf (" disk 5: %8lur%8luw\n", bDIFF (disk_r[4]),
++ bDIFF (disk_w[4]));
++ else if (new.disk[4])
++ printf (" disk 5: %8lu\n", bDIFF (disk[4]));
++ else
++ putchar ('\n');
++
++ printf ("sw irq: %s %s",
++ hms (bDIFF (cpu_sirq)), perc (bDIFF (cpu_sirq), elapsed, nr_cpus));
++ printf (" swap in :%9lu", bDIFF (swin));
++ if (new.disk_r[5])
++ printf (" disk 6: %8lur%8luw\n", bDIFF (disk_r[5]),
++ bDIFF (disk_w[5]));
++ else if (new.disk[5])
++ printf (" disk 6: %8lu\n", bDIFF (disk[5]));
++ else
++ putchar ('\n');
++ }
++
+ printf ("idle : %s %s",
+ hms (bDIFF (cpu_idle)), perc (bDIFF (cpu_idle), elapsed, nr_cpus));
+ printf (" swap out:%9lu", bDIFF (swout));
+- if (new.disk_r[3])
+- printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
+- bDIFF (disk_w[3]));
+- else if (new.disk[3])
+- printf (" disk 4: %8lu\n", bDIFF (disk[3]));
++ if (havetwosix)
++ lastdisk = 3;
++ else
++ lastdisk = 6;
++ if (new.disk_r[lastdisk])
++ printf (" disk %d: %8lur%8luw\n", lastdisk+1, bDIFF (disk_r[lastdisk]),
++ bDIFF (disk_w[lastdisk]));
++ else if (new.disk[lastdisk])
++ printf (" disk %d: %8lu\n", lastdisk+1, bDIFF (disk[lastdisk]));
+ else
+ putchar ('\n');
+
+@@ -786,6 +901,8 @@
+ meminfofp = myfopen (PROC_DIR "meminfo");
+ statfp = myfopen (PROC_DIR "stat");
+ /* These may be missing, so check for NULL later. */
++ diskstatsfp = fopen (PROC_DIR "diskstats", "r");
++ vmstatfp = fopen (PROC_DIR "vmstat", "r");
+ modulesfp = fopen (PROC_DIR "modules", "r");
+ devicesfp = fopen (PROC_DIR "devices", "r");
+ filesystemsfp = fopen (PROC_DIR "filesystems", "r");
+@@ -990,6 +1107,9 @@
+ new.disk_r[1] = new.disk_w[1] =
+ new.disk_r[2] = new.disk_w[2] =
+ new.disk_r[3] = new.disk_w[3] = 0;
++ new.disk_r[4] = new.disk_w[4] = 0;
++ new.disk_r[5] = new.disk_w[5] = 0;
++ new.disk_r[6] = new.disk_w[6] = 0;
+ redrawn = 1;
+ message = io_or_blk ? "showing I/O in blocks" :
+ "showing I/O per requests";
+diff -ruN procinfo-18/procinfo.h procinfo-19/procinfo.h
+--- procinfo-18/procinfo.h 2001-02-24 23:30:45.000000000 +0000
++++ procinfo-19/procinfo.h 2004-06-17 09:24:16.511726412 +0100
+@@ -81,11 +81,11 @@
+ unsigned long uptime;
+ long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
+ long s_to, s_us, s_fr;
+- unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
+- unsigned long disk[5];
+- unsigned long disk_r[5];
+- unsigned long disk_w[5];
+- unsigned long pgin, pgout, swin, swout;
++ unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_iowait, cpu_hirq, cpu_sirq;
++ unsigned long disk[8];
++ unsigned long disk_r[8];
++ unsigned long disk_w[8];
++ unsigned long pgin, pgout, pgac, pgdeac, pgfault, swin, swout;
+ unsigned long *intr; /* Phew. That's better. */
+ unsigned long old_intr;
+ unsigned long ctxt;
+diff -ruN procinfo-18/routines.c procinfo-19/routines.c
+--- procinfo-18/routines.c 2001-02-24 23:30:45.000000000 +0000
++++ procinfo-19/routines.c 2004-06-16 16:36:51.000000000 +0100
+@@ -388,9 +388,13 @@
+ hms (unsigned long t)
+ {
+ unsigned int d, h, m, s;
++ unsigned long q;
+ static char buf[22];
+
+- t = t * 100 / HZ;
++ q = 100 / HZ; /* We need this because the libc does something funny here */
++ /* if we try to use: t = t * 100 / HZ; here! */
++ /* procinfo@meisel.cc 11. Feb. 2004 */
++ t = t * q;
+ d = (int) (t / 8640000);
+ t = t - (long) (d * 8640000);
+ h = (int) (t / 360000);
diff --git a/app-admin/procinfo/files/procinfo-18-stat.patch b/app-admin/procinfo/files/procinfo-18-stat.patch
new file mode 100644
index 000000000000..d7dc4a458b28
--- /dev/null
+++ b/app-admin/procinfo/files/procinfo-18-stat.patch
@@ -0,0 +1,21 @@
+diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c
+--- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
++++ procinfo-18-mod/procinfo.c 2008-04-16 10:16:29.000000000 +0100
+@@ -76,7 +76,7 @@
+ *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
+ *versionfp, *cpuinfofp;
+
+-char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
++char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL;
+
+ float rate = 1.0; /* per interval or per sec */
+
+@@ -446,7 +446,7 @@
+ */
+ char *q;
+
+- if ((q = strstr (p, "PIC"))) {
++ if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) {
+ while (*q != ' ') /* eat up "PIC" or "PIC-foo" */
+ q++;
+ while (*q == ' ') /* eat up spaces */
diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch
new file mode 100644
index 000000000000..e254c254e1a9
--- /dev/null
+++ b/app-admin/procinfo/files/procinfo-flags.patch
@@ -0,0 +1,16 @@
+--- procinfo-18/Makefile.orig 2001-02-25 00:29:53.000000000 +0100
++++ procinfo-18/Makefile 2006-10-21 13:57:47.000000000 +0200
+@@ -2,10 +2,10 @@
+
+ prefix=/usr
+
+-CC = gcc -Wall -Wstrict-prototypes
++CC +=
+
+-CFLAGS = -O2
+-LDFLAGS = -s
++CFLAGS += -Wall -Wstrict-prototypes
++LDFLAGS +=
+
+ # If you get lots of `undefined references', you probably need -lncurses
+ # instead:
diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/procinfo/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-admin/procinfo/procinfo-18-r2.ebuild b/app-admin/procinfo/procinfo-18-r2.ebuild
new file mode 100644
index 000000000000..33a1d8dc6daa
--- /dev/null
+++ b/app-admin/procinfo/procinfo-18-r2.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 toolchain-funcs
+
+DESCRIPTION="Displays some kernel stats and info on a running Linux system"
+HOMEPAGE="http://www.kozmix.org/src/"
+SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/kernel-2.6.patch
+ epatch "${FILESDIR}"/cpu-usage-fix.patch
+ epatch "${FILESDIR}"/${PN}-flags.patch
+ epatch "${FILESDIR}"/${P}-stat.patch
+}
+
+src_compile() {
+ emake \
+ CC=$(tc-getCC) \
+ LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install() {
+ dobin procinfo
+ newbin lsdev.pl lsdev
+ newbin socklist.pl socklist
+
+ doman *.8
+ dodoc README CHANGES
+}
diff --git a/app-admin/profile-cleaner/Manifest b/app-admin/profile-cleaner/Manifest
new file mode 100644
index 000000000000..40c82b39b85a
--- /dev/null
+++ b/app-admin/profile-cleaner/Manifest
@@ -0,0 +1,3 @@
+DIST profile-cleaner-2.36.tar.gz 7757 SHA256 17ae2f6f30bcfbfb28a3b2faf8836a6cbcbdc5c0ad3e43b3bb92a29a20fac719 SHA512 c56e92f816276d55e298dfac529e8195cf05f1a441aae40d25665d1db6d03b5ca741b99136e9f6fc93eabaa56dfcd8f2856a2dd5c37728c72befc756ff28ac75 WHIRLPOOL ac0778a31ff69f143065caec614278bdca94f5ff7c8fd3bc41f8536c83f3b46727e08f858ee53c505996833ef84204579cae399062cd05198cc897e9b357b991
+EBUILD profile-cleaner-2.36.ebuild 501 SHA256 ce6c8001ef2de2b8e95eea62c0494af6ccc84e14e6608616394d831f6609e11e SHA512 de4e1b361be03eaa01f7b6512269d957f7e5789ad4ab3ce6ec957e886c8cd5614de4f2902a9bc41cf166e7294f44c141ee457490814429846b088afcf0980287 WHIRLPOOL d75bc6ac5e3cb1945eaa608d8a96b08c80146c547c74d392b037cc3a67cec3cc60dec7a26117ea7c8a8a850debf9389013a362f3573ad8acc2914eee3bdd0507
+MISC metadata.xml 518 SHA256 2b543e311ea22abe9af8d166ee3417a57c3d88281f1f701b5f30f63871500aaf SHA512 7d1f584b8e989fd94abaea851c83c7734eb654f1d98e950724a6f72b50b8a1c7e0167ba99067dcfdec32a9ca5036bbdde7c46256214bf395de70a4d6b79f974f WHIRLPOOL 41709edbd8b4432c0a7e121993ae1190475ea0ea34dca6fa55348781900e1cc2b1bc71a09a306cac6061a68a1ed6739cd1ce5a3a3a82a391a74363d1264b142a
diff --git a/app-admin/profile-cleaner/metadata.xml b/app-admin/profile-cleaner/metadata.xml
new file mode 100644
index 000000000000..739dde6ad582
--- /dev/null
+++ b/app-admin/profile-cleaner/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>fdsfgs@krutt.org</email>
+ <name>soredake</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/graysky2/profile-cleaner/issues</bugs-to>
+ <remote-id type="github">graysky2/profile-cleaner</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild b/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild
new file mode 100644
index 000000000000..3095e8c606e6
--- /dev/null
+++ b/app-admin/profile-cleaner/profile-cleaner-2.36.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Vacuum and reindex browser sqlite databases"
+HOMEPAGE="https://github.com/graysky2/profile-cleaner"
+SRC_URI="https://github.com/graysky2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-shells/bash
+ sys-devel/bc
+ sys-apps/coreutils
+ sys-apps/findutils
+ sys-apps/grep
+ sys-apps/sed
+ sys-process/parallel
+ dev-db/sqlite:3"
diff --git a/app-admin/psmon/Manifest b/app-admin/psmon/Manifest
new file mode 100644
index 000000000000..730a64ba01b9
--- /dev/null
+++ b/app-admin/psmon/Manifest
@@ -0,0 +1,5 @@
+DIST psmon-1.39.tar.gz 57475 SHA256 f97d43573473ccfb089d8eca5287151679f378d0e9114f01dd9ba18a28d10ad5 SHA512 08992023af29433da0fe8c48b610df3008b9ea14e197b52bc9582895275fc65cd0faca7e29f36356344219d6a61ef9350713aaa60377ce7ae49a882044b91e32 WHIRLPOOL 3cc5bb554e8919d58ed1dd5a1cdf989d527b917478b550eca77154183dbdcd9d8017c58f9b61f038fafd6b8295fe03939e01fbff2a18b55063a262a8c7979b6f
+EBUILD psmon-1.39-r1.ebuild 695 SHA256 b1879db64be6bfa2a7be9aeb6f95d71fd2e672402b946e5c343bfa651d45a820 SHA512 54a8b473acd59f2f75851ff5e67d6113632f9d11f5f61cc0d1939d6e800a14ec1781e34dbb287c938cee00057161d9f44f99d009e598d5d664bb044778f98cc0 WHIRLPOOL a8fc0c729bf518aa6ca1ba9d011208ea233db80ca66623234114d22ab43099317045d97dff36ad3ba0f549d839bc42df496f6fd0107ced9913ab0f3cf607c232
+MISC ChangeLog 2521 SHA256 5e58e2558081f91e3c2f9a3f6e9c09dd4e5bce733b18c6766714d76c2d52fbcc SHA512 9dc332a4dc043cc3835fe42c327f22f919ca8a49fd999e9842a407d52b9dc5c1b875d02df822067f35537984971ad69a43dfa7bf978f843f8f36e696960fdb5e WHIRLPOOL 65f791d37c6272b00e2a296953f7c1e1496995ab32a425c5c28b05f3fe66730efe89665a6bb5948378f1f29b4ca0e41c6a803d7d1d1a0edda40e04b74a86b80d
+MISC ChangeLog-2015 3030 SHA256 aa34584e3461facb8019262275bceee1a18a8555420a78e53cf31826f012ba4f SHA512 19e42b5c10b9e9b032cadbbdc63fe30b0a1ae2b1c6c0fc98032cd0ce604d7ca29d2fd6441a20d80086c1439372769407fa14ca7219a2424e734fec375b76ab16 WHIRLPOOL cdbf8dde79cd7578ef1f0d0f6c7920169bce4ecd6dca91e20eb66ca8a220de4d2a8c33cba9eaf735b0e43555f119726ae8ff352cbca92c877b4df0b10ace5ed0
+MISC metadata.xml 375 SHA256 549dbd830d017e446d4065ce4f2bca290cfe7f6c8be9d9941e2fefcb676d96af SHA512 450413515ed27e78edeec89a59c27cb83efb6c5be58cf5321d1212ca191c5d87c6982e7d8cfb8f28a79383c529ecbaa7b02219d695dc5712b5566afada6fcf08 WHIRLPOOL bbcc5fdc73f34710b6a2613e69df44971db7d4944108f75f8c865d4018f140fffd8055a4196150700b1b68c3618cdd3e20d386f9ef51110fa5763a904ed83f2e
diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
new file mode 100644
index 000000000000..fb1a2d3c2106
--- /dev/null
+++ b/app-admin/psmon/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 perl script that monitors processes to make sure they are running as
+ the user has intended. Will respawn dead processes and/or kill illegal
+ processes.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/psmon/psmon-1.39-r1.ebuild b/app-admin/psmon/psmon-1.39-r1.ebuild
new file mode 100644
index 000000000000..c1f5927344ec
--- /dev/null
+++ b/app-admin/psmon/psmon-1.39-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit perl-app
+
+DESCRIPTION="Monitors process table to slay aggressive, and spawn dead, processes"
+HOMEPAGE="http://www.psmon.com/"
+SRC_URI="http://www.psmon.com/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0
+ dev-perl/Config-General
+ dev-perl/Proc-ProcessTable
+ dev-perl/Unix-Syslog
+ virtual/perl-Getopt-Long"
+
+src_install() {
+ perl-module_src_install
+ insinto /etc
+ doins etc/psmon.conf
+}
+
+pkg_postinst() {
+ einfo "NOTICE: Please modify at least the NotifyEmail parameter found in"
+ einfo "the /etc/psmon.conf file"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
new file mode 100644
index 000000000000..38b2787eff82
--- /dev/null
+++ b/app-admin/puppet-agent/Manifest
@@ -0,0 +1,15 @@
+AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13696 SHA256 16adf7c701ee44ea7b33cc4bfdf089e965454237f30eed1525ba104016e80fba SHA512 f2f76fe892c8f83a85285b34fc6177db7198af4289e4f3350784a6f08fc50a69e74a5bc714aacae3c8a1fed6a3be930c9f517b354ac49108a4ec185f17bcd513 WHIRLPOOL 409d49b27c2424d8ef46e12d9375f6751fbf14ae5b6ff9f5b46cdacf8d3d567b06ca3e21cb5e0f757d2084947ecccfab35952394088cc003bef61fce56fee196
+AUX mcollective.initd 469 SHA256 6a576f0b0a627102b2295b0c715e020dbb0789efde64ec6e291d5850300b7feb SHA512 f8356e70bdc879f1ca9e8528c0109db890e26e2b843bd454a08350fd3bfeafabfcf30ba6b5d39e0b843e3d063221a220fc8af80f42d2360a73b5f7bd95e6d462 WHIRLPOOL 8f2b6b9649146f0083c0eca15a4f21fed631e4f104c5870e1e44c787d9787c7994b217f90b3efdda9e015e487382fc7cf856e4a7af919798caceafdbe9e0cfc0
+AUX mcollective.service 390 SHA256 2ba4d9ae263897a901805dac0e2b899786ee5a92fb08c133ec99681824f02e0c SHA512 28fdc1f094d8995c806e2bfbd5b5ba8299603e19d379270be009f69b5ae186abfde65d1b7d0c0213e686f0c1cf944731a22b1ebbef1bb8c12edaf298b6c05901 WHIRLPOOL 5665177f6da26b0793a1890ac15180076dc035d00e4f99914065b607c5ae0c3de3416ffbcfc720f250e15a841acdec06893361fd42d8628b30d99031ba5ea3f8
+AUX puppet-agent.conf.tmpfilesd 39 SHA256 41ea7cfc1eea6f7c125560236da8fee3fb340d5b995a746ad0d0d56100d6e6a7 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5 WHIRLPOOL 04acbc8c88abdb55db32e9f9a3bc5162724b3739e7073a508ff468097a68e0166794920c18a504e6d03f6d30a635095ee43674e98ed60facafc71e5ccf8837b0
+AUX puppet.initd 765 SHA256 5157630d3856c2cec4e22a19fb7e2d1471ff34aaacbb10f3d97fba702cc71772 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171 WHIRLPOOL c5a9e8605141e4bceb5ce77ca2ca7de0452c110cc058ea139a01c3658b89374f2d23835dbd4ee6fd4edbbcc756257270302c358acd04b1d4708803fa1a864f3c
+AUX puppet.service 355 SHA256 9ffee4138261d0abd9a45a38d23b16cc8beb6a90aca05d1a64efea5b5ddc2edc SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6 WHIRLPOOL 0f64879163051ce1cb4d4ca1d17e11e9dd7abca890824a15621b635a7c1fc391010c190952b63db637c08a0eb8130bb0f9147a378206916c3e71d43e1fb8758a
+DIST puppet-agent_1.10.7-1xenial_amd64.deb 16449418 SHA256 a23169ff2adeff419436f738a991d3026c3f06b993a9824922d26a125a53fd0f SHA512 5c73eea444186cbd0d52e42a20858964db6e7f2b6e537274b5b0a44499cc2bb0622a4eb6a55fa10dcc3946bdae3bb00b9d228aa5d1d444cc53aeefddf11f7b5b WHIRLPOOL 5eb0c71bc630ad878f2731353c93195b4e686ff0d48796fff0b700550f8f8ab69d039c818a557bdf231ecb08b85e8529706f280b19bae031a24f2687e50ae32b
+DIST puppet-agent_1.10.7-1xenial_i386.deb 16182468 SHA256 ee60570ec29561adfded01fec2017756d5f921c08677a530149b0da2ead1f29f SHA512 7d5a41af7619fe008fec5302e23482d688692affaeded4b0b2f4e693168c2ef6995beee5e2410a9cb2e7f99650119e9c5f8007ed65709ad623654bdd6c09e402 WHIRLPOOL 81d7a325d2c675f2392dfc16f1d3a411c6e7a2e449844b90358d0a97c31cc3ccdbf6a8a891bd818017b9504e898fe8aed2d12233dae4822f125f7ab2230ceb1d
+DIST puppet-agent_5.1.0-1xenial_amd64.deb 15141786 SHA256 1a3ad0ef1a5e4026927f3ae010e9a48b9c1e31dfb8e0691d01383d29f3b14644 SHA512 a210d225591328e2c041aad1dd7cfdac614531e1ceb524c3e35d3330962111bdc66408268550072e53190d6a10a7c8244b0bfa8a12b81f023883831c1fcbd070 WHIRLPOOL 34dc5cfcf6bb3500b89451078734d5d7a03a53a0be9e5501d6ded574cf2b6dbafe207db87aa919fd9cdadb6c2a0a05191854be3245d477e035fe7d52778cf527
+DIST puppet-agent_5.1.0-1xenial_i386.deb 15596316 SHA256 41a4d70b3ff87352d9aa5594d2b65176f9854b38b21c738321e6d7dd516ccf25 SHA512 9e364fc50baa081cc808c0e0277d6625f6064dad7d56fba352d552e9398e7197405a8c3e15fac4f569dfa11c7c4657261f06b8c90f04bef6fcc6a9794d94e927 WHIRLPOOL e54f2a75b753f94b5dff8d230776afad6193f446d8156d2d2e10d9248732a607a83fa79fe01c4fae36ad8f3cf4ddb453906cf2f4fda87e3e414ede4fa893c58e
+EBUILD puppet-agent-1.10.7.ebuild 3499 SHA256 1097408bfba9ee47a6d6e25c5ac631221b303bd2a72c87ebba7539a05a595107 SHA512 22bd5df84895605e506ce0b9ee000bf72208b1e24c3907834c744613d341430336ee8abc0125f94af8accbf22057e739612a939e18b4206fbd122848d1446366 WHIRLPOOL 07cac34b6b1259cfb9af1cb695730869a7bfeb23ac52a45add1485de334e95b95366421d774ddb51c24edc18e00b55adcea845b55771ef60b9bb317123f67529
+EBUILD puppet-agent-5.1.0-r1.ebuild 3290 SHA256 11dce268631acad8339cd951bafc5e5f7c1d9b7e106441c1db1312f9e8ed89b9 SHA512 9babb71d75b321e7d795ffbdcf8f6c3986bbbc302e6f70331f145eaa72dd7192d39e50587f9604927db08bdd2b705d89b8caff49bf914e35b3e5dbb58de5d22c WHIRLPOOL a9dacee439fccfabcd05cacf308f53da604d776e465b5254915b02c149566d07a237ce282603164af14f6844c4a6440b050fcd158127a9d7d8a1093a163a173b
+MISC ChangeLog 12414 SHA256 43b79bfdeb14a8a8c06df8809dac296ae71e59e85e5243bcdd578dd99c3c3f7b SHA512 4ad26d58ea469acd9c510f6582175ecb0a58954cc7eb2c8c90c2736e227fce04f9d196cce20b64a52153323058d6f5a2831de364251803d8eb0656b15ea4cafc WHIRLPOOL 16dab8e7506da0d6bb98f91d08c1890c12e9152baa7f15c4e1ad01f210845acfb55cbe3c8bde1a1b71559cb60d84ea436c24798290802891e3047d024b66edfb
+MISC ChangeLog-2015 1925 SHA256 14cec0025e9af42a203c9a087daf7d2bce1dd92aec66445814fe3ba58fb55611 SHA512 f5c921d2ee0079c50c6618d8efa13438d07fe0626133269c8be9b5dd7f7a3aa6d2d1643d445d5e1d527094b2d814c0d5858974e5b38dd475dcb9d0271162ec72 WHIRLPOOL 92882e38ab2de443b8c4edb81327915b6ac76d1df5bd4306827ad92704bfe844ceda17c4abc81210de36718ad6d51eade549d720035e46ef6e719262f0441354
+MISC metadata.xml 502 SHA256 93c372bb207d39c92f64f58733dce40b0156cbbc0b9464c91826e0885e4edcd3 SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95 WHIRLPOOL db08ec51b5c3ce9b2cd5599e002301ea345072eac18b51486161b665970d0032297365e3001060d716d29c13696a664c4be68b5a6d17043ec8b204a0adce7ac3
diff --git a/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
new file mode 100644
index 000000000000..619c5dd68cba
--- /dev/null
+++ b/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
@@ -0,0 +1,329 @@
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
+index 374667c..12160c6 100644
+--- a/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
++++ b/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
+@@ -2,14 +2,19 @@
+ require 'fileutils'
+
+ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
+- desc "Provides packaging support for Gentoo's portage system."
++ desc "Provides packaging support for Gentoo's portage system.
+
+- has_features :versionable, :reinstallable
++ This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
++ flags to be passed to emerge. These options should be specified as a string (e.g. '--flag'), a hash
++ (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
++
++ has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
+
+ {
+- :emerge => "/usr/bin/emerge",
+- :eix => "/usr/bin/eix",
+- :update_eix => "/usr/bin/eix-update",
++ :emerge => '/usr/bin/emerge',
++ :eix => '/usr/bin/eix',
++ :qatom_bin => '/usr/bin/qatom',
++ :update_eix => '/usr/bin/eix-update',
+ }.each_pair do |name, path|
+ has_command(name, path) do
+ environment :HOME => '/'
+@@ -24,15 +29,18 @@ def self.instances
+ result_format = self.eix_result_format
+ result_fields = self.eix_result_fields
+
++ limit = self.eix_limit
+ version_format = self.eix_version_format
+ slot_versions_format = self.eix_slot_versions_format
++ installed_versions_format = self.eix_installed_versions_format
++ installable_versions_format = self.eix_install_versions_format
+ begin
+- eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++ eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+ update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+
+ search_output = nil
+- Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+- search_output = eix *(self.eix_search_arguments + ["--installed"])
++ Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++ search_output = eix *(self.eix_search_arguments + ['--installed'])
+ end
+
+ packages = []
+@@ -57,65 +65,123 @@ def self.instances
+
+ def install
+ should = @resource.should(:ensure)
+- name = package_name
+- unless should == :present or should == :latest
+- # We must install a specific version
+- name = package_atom_with_version(should)
++ cmd = %w{}
++ name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++ name = qatom[:pfx] + name if qatom[:pfx]
++ name = name + '-' + qatom[:pv] if qatom[:pv]
++ name = name + '-' + qatom[:pr] if qatom[:pr]
++ name = name + qatom[:slot] if qatom[:slot]
++ cmd << '--update' if [:latest].include?(should)
++ cmd += install_options if @resource[:install_options]
++ cmd << name
++ emerge *cmd
++ end
++
++ def uninstall
++ should = @resource.should(:ensure)
++ cmd = %w{--rage-clean}
++ name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++ name = qatom[:pfx] + name if qatom[:pfx]
++ name = name + '-' + qatom[:pv] if qatom[:pv]
++ name = name + '-' + qatom[:pr] if qatom[:pr]
++ name = name + qatom[:slot] if qatom[:slot]
++ cmd += uninstall_options if @resource[:uninstall_options]
++ cmd << name
++ if [:purged].include?(should)
++ Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
++ emerge *cmd
++ end
++ else
++ emerge *cmd
+ end
+- emerge name
+ end
+
+- # The common package name format.
+- def package_name
+- @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
++ def reinstall
++ self.install
+ end
+
+- def package_name_without_slot
+- package_name.sub(self.class.slot_pattern, '')
++ def update
++ self.install
+ end
+
+- def package_slot
+- if match = package_name.match(self.class.slot_pattern)
+- match[1]
++ def qatom
++ output_format = self.qatom_output_format
++ result_format = self.qatom_result_format
++ result_fields = self.qatom_result_fields
++ @atom ||= begin
++ search_output = nil
++ package_info = {}
++ # do the search
++ search_output = qatom_bin *([@resource[:name], '--format', output_format])
++ # verify if the search found anything
++ match = result_format.match(search_output)
++ if match
++ result_fields.zip(match.captures) do |field, value|
++ # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
++ if value == '(null)'
++ package_info[field] = nil
++ elsif !value or value.empty?
++ package_info[field] = nil
++ else
++ package_info[field] = value
++ end
++ end
++ end
++ @atom = package_info
++ rescue Puppet::ExecutionFailure => detail
++ raise Puppet::Error.new(detail)
+ end
+ end
+
+- def package_atom_with_version(version)
+- if slot = package_slot
+- "=#{package_name_without_slot}-#{version}:#{package_slot}"
+- else
+- "=#{package_name}-#{version}"
+- end
++ def qatom_output_format
++ '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+ end
+
+- def uninstall
+- emerge "--unmerge", package_name
++ def qatom_result_format
++ /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
+ end
+
+- def reinstall
+- self.install
++ def qatom_result_fields
++ [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
+ end
+
+- def update
+- self.install
++ def self.get_sets
++ @sets ||= begin
++ @sets = emerge *(['--list-sets'])
++ end
+ end
+
+ def query
++ limit = self.class.eix_limit
+ result_format = self.class.eix_result_format
+ result_fields = self.class.eix_result_fields
+
+ version_format = self.class.eix_version_format
+ slot_versions_format = self.class.eix_slot_versions_format
+- search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
+- search_value = package_name_without_slot
++ installed_versions_format = self.class.eix_installed_versions_format
++ installable_versions_format = self.class.eix_install_versions_format
++ search_field = qatom[:category] ? '--category-name' : '--name'
++ search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++
++ @eix_result ||= begin
++ # package sets
++ package_sets = []
++ self.class.get_sets.each_line do |package_set|
++ package_sets << package_set.to_s.strip
++ end
+
+- begin
+- eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++ if @resource[:name].match(/^@/)
++ if package_sets.include?(@resource[:name][1..-1].to_s)
++ return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
++ end
++ end
++
++ eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+ update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+
+ search_output = nil
+- Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+- search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
++ Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++ search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
+ end
+
+ packages = []
+@@ -127,10 +193,19 @@ def query
+ result_fields.zip(match.captures) do |field, value|
+ package[field] = value unless !value or value.empty?
+ end
+- if package_slot
+- package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
+- package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
++ # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
++ # version_available is what we CAN install / update to
++ # ensure is what is currently installed
++ # This DOES NOT choose to install/upgrade or not, just provides current info
++ # prefer checking versions to slots as versions are finer grained
++ if qatom[:pv]
++ package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
++ package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
++ elsif qatom[:slot]
++ package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
++ package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
+ end
++
+ package[:ensure] = package[:ensure] ? package[:ensure] : :absent
+ packages << package
+ end
+@@ -138,10 +213,9 @@ def query
+
+ case packages.size
+ when 0
+- not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
+- raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
++ raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
+ when 1
+- return packages[0]
++ @eix_result = packages[0]
+ else
+ raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
+ end
+@@ -155,39 +229,73 @@ def latest
+ end
+
+ private
++ def eix_get_version_for_versions(versions, target)
++ # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
++ return nil if versions.nil?
++ versions = versions.split(',')
++ # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
++ versions.find { |version| version == target }
++ # 3.5.2
++ end
++
++ private
+ def eix_get_version_for_slot(versions_and_slots, slot)
++ # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
+ return nil if versions_and_slots.nil?
+- versions_and_slots = versions_and_slots.split(",")
+- versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
+- version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
++ versions_and_slots = versions_and_slots.split(',')
++ # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
++ versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
++ # [2.7.12: 2.7
++ # 3.4.5: 3.4
++ # 3.5.2: 3.5]
++ version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
++ # [3.5.2: 3.5]
+ version_for_slot.first if version_for_slot
+- end
+-
+- def self.slot_pattern
+- /:([\w+.\/*=-]+)$/
++ # 3.5.2
+ end
+
+ def self.eix_search_format
+- "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
++ "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
+ end
+
+ def self.eix_result_format
+- /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
++ /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+ end
+
+ def self.eix_result_fields
+- [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
++ # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
++ [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
+ end
+
+ def self.eix_version_format
+- "{last}<version>{}"
++ '{last}<version>{}'
+ end
+
+ def self.eix_slot_versions_format
+- "{!first},{}<version>:<slot>"
++ '{!first},{}<version>:<slot>'
++ end
++
++ def self.eix_installed_versions_format
++ '{!first},{}<version>'
++ end
++
++ def self.eix_install_versions_format
++ '{!first}{!last},{}{}{isstable}<version>{}'
++ end
++
++ def self.eix_limit
++ '0'
+ end
+
+ def self.eix_search_arguments
+- ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
++ ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
++ end
++
++ def install_options
++ join_options(@resource[:install_options])
++ end
++
++ def uninstall_options
++ join_options(@resource[:uninstall_options])
+ end
+ end
diff --git a/app-admin/puppet-agent/files/mcollective.initd b/app-admin/puppet-agent/files/mcollective.initd
new file mode 100644
index 000000000000..6500cd878815
--- /dev/null
+++ b/app-admin/puppet-agent/files/mcollective.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MCOLLECTIVE_PID_DIR="${MCOLLECTIVE_PID_DIR:-/var/run/puppetlabs}"
+
+command="/usr/sbin/mcollectived"
+pidfile="${MCOLLECTIVE_PID_DIR}/mcollectived.pid"
+
+command_args="--pidfile ${pidfile} --config=/etc/puppetlabs/mcollective/server.cfg --daemonize"
+
+depend() {
+ need net
+}
+
+start_pre() {
+ checkpath --directory "${MCOLLECTIVE_PID_DIR}"
+}
diff --git a/app-admin/puppet-agent/files/mcollective.service b/app-admin/puppet-agent/files/mcollective.service
new file mode 100644
index 000000000000..9a6fdefb8ca8
--- /dev/null
+++ b/app-admin/puppet-agent/files/mcollective.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=The Marionette Collective
+After=network.target
+
+[Service]
+Type=forking
+StandardOutput=syslog
+StandardError=syslog
+ExecStart=/usr/sbin/mcollectived --config=/etc/puppetlabs/mcollective/server.cfg --pidfile=/var/run/puppetlabs/mcollective.pid --daemonize
+ExecReload=/bin/kill -USR1 $MAINPID
+PIDFile=/var/run/puppetlabs/mcollective.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd b/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
new file mode 100644
index 000000000000..42d082111940
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
@@ -0,0 +1 @@
+d /var/run/puppetlabs 0755 root root -
diff --git a/app-admin/puppet-agent/files/puppet.initd b/app-admin/puppet-agent/files/puppet.initd
new file mode 100644
index 000000000000..1c366bcf9641
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet.initd
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppetlabs/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+ need localmount
+ use dns logger puppetserver netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+ ebegin "Reloading $RC_SVCNAME"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/puppet-agent/files/puppet.service b/app-admin/puppet-agent/files/puppet.service
new file mode 100644
index 000000000000..61b03134b331
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Puppet agent
+Wants=basic.target
+After=basic.target network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/puppetagent
+EnvironmentFile=-/etc/sysconfig/puppet
+EnvironmentFile=-/etc/default/puppet
+ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml
new file mode 100644
index 000000000000..423c18e429e6
--- /dev/null
+++ b/app-admin/puppet-agent/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>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <use>
+ <flag name="puppetdb">Adds puppetdb support</flag>
+ <flag name="experimental">Add patches for things in testing</flag>
+ </use>
+ <longdescription lang="en">
+ Collection of puppet utils, clients and batteries included.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.7.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.7.ebuild
new file mode 100644
index 000000000000..300ebc50b6d6
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.10.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="experimental puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/glibc
+ >=sys-libs/readline-6.0
+ <sys-libs/readline-7.0
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+ /opt/puppetlabs/puppet
+ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/engines/*
+ /opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
+ /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_prepare() {
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/mcollective.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+ dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-5.1.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..1bb845bea050
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.1.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/mcollective
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/glibc
+ >=sys-libs/readline-6.0
+ <sys-libs/readline-7.0
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+ /opt/puppetlabs/puppet
+ /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+ /opt/puppetlabs/puppet/lib/engines/*
+ /opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
+ /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/mcollective
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/mcollective
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ dodir var/log/puppetlabs/puppet/
+ fperms 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd" puppet
+ newinitd "${FILESDIR}/mcollective.initd" mcollective
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/mcollective.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+ dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+ dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
new file mode 100644
index 000000000000..77ef179d5580
--- /dev/null
+++ b/app-admin/puppet-lint/Manifest
@@ -0,0 +1,13 @@
+DIST puppet-lint-2.0.2.gem 60928 SHA256 d8d5336f14d9e484c33007c8527596154c2be8b5e7fb5a9f43f978298381f294 SHA512 e3cdba2cb3c55b73489bdd9e8df24f225ff8134cebc1f2a05a7118905c59eab47e8998f5afc6294288f4a7e226029e17351812b918ee51b81be921e16c94f692 WHIRLPOOL 168c57cc2884e7a4304fa205cbd5fa4c566f0f159bd1d373d11d400ff75a00626885a18998b139793f4fbbe3602fb6ce4f0231ce42e118da8faa1d8f1bec4f13
+DIST puppet-lint-2.2.1.gem 74240 SHA256 f7f191e8bcd8ff35744bd5197548d283ecc1e117e08b6a3f0e614cb306140d87 SHA512 16aeaf4614104c5d3642c7c61acacbb33f4c0518a18c814cf2cc20aa40c19ac2e392758a980178d50c80c41544c8164d407ad7cd8d783a0d97b1606c55680570 WHIRLPOOL 71cebaebeb9d7e825db185a97c98d3b785bbcdb240f3e5c364ed145f017e205e09db3c03086dc1ab32d0474b43aa46f7284d5e41b4bf42dbc734b85ae42a930b
+DIST puppet-lint-2.3.0.gem 76288 SHA256 39393fe622b3e3c9585afcdda887b42117dfeac2317fbcd5548e0ddaa668e4bf SHA512 d0c21bad8eb5e7e2352de7e919ad44cccfb0086980a52e8d26b167c29a2a78e2e6efb692c8ac88c28cffcec125e1bf2f26973dca642d2ee9fea62a1342dfb709 WHIRLPOOL d6bb940745292ca90020c1eb1e1bee94ed479ef96dae23f4a34758431df9eb84cc46c9ad4acebf33613be54fd8c97cb59180f1895ecdbd454de9e79084c5f37e
+DIST puppet-lint-2.3.2.gem 82432 SHA256 872f0da4ea05ec561ed4b25ce2bba13626790e2239eab1b826e62af9a2d215be SHA512 5da388ad11285172e74de775d691ea49ebbbcadf938e7bddadff1bb9c9485dc30d7fa51e51db74d7912d23434223e3625e267a6785bd7f37243136553716db5e WHIRLPOOL e8559628e4e068161e1fec37f7f39f9228568132a6d977e4c2d87c1a1af741fd515ee43589b05d238c01aa43a257a29ac926e5d57d538bc3481f8aa6ee8ac822
+DIST puppet-lint-2.3.3.gem 84992 SHA256 8d3f294b1220253580ec7b19ff8a88e2065566d3da47adbefd88a7e178796e23 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68 WHIRLPOOL c18b37622f195fe433872d180304ff16fcee83cbb21f245d3a839444ba11343ff2cb5fc521e4f0ffa0c7c94513e9409fe1b9ac9006ff5fe6ccf4b1f1d6739793
+EBUILD puppet-lint-2.0.2.ebuild 503 SHA256 8d83abe2030de646921f11e7747099b09ce34bf6206acf76b60fb197d665c0e1 SHA512 b459abca72be46ac909ac058848aaf16b0b2fd767093f3f1545ef18bd162227673af8ef282b0d030b750fec50dc879b618eb0a9363eedb10c026b09ac0351149 WHIRLPOOL e16ff8c1866c80101f8f833f81f18c3e0b9000092946680473a31a75cb25e4f5bc6195daf1f863d2dd66caa27afe120bd4a3c3e188b056122ea3d9ebfe879ab4
+EBUILD puppet-lint-2.2.1.ebuild 525 SHA256 d0b5728608094425dd94dd3ea08790d23d688a4a5c56b39ea388e612430a520f SHA512 c2863ca471667702e071d87481d8910e5d8ca13818b27229022480dfd1aa3fdb2bd7ae21ad2cc7d9c4aad271d4e84436efa95ad76412fa8391aa2a5632ead215 WHIRLPOOL 05c0d0e806e03d890b00a72820d476b16f76bea287d0327e01613a91761db3e895f39264af5fff5572fbe5642a8adb50a92dd0fd7ae54ff919b71ad20df7cd07
+EBUILD puppet-lint-2.3.0.ebuild 525 SHA256 266c3c0d79635e1872305e92e541761b0496d51caf1448118eb2d9f92e056301 SHA512 1927bed1d195f060ca98aaa1f2a9f9a6d8225d048e29919bc36d6012c31c98881337e57321c97dbbbdbb57dae657c7b9c1f6f60d1dc36809e10b09b9febe9e16 WHIRLPOOL 051e24ce2cadca4eb236b0e71d7860e3bbc2f6f1b76764be7aac0e7d9919f096f63beb786fee2bf0453daaf6d3afe0f735e25fead4f818a3b9ee20c318ff6067
+EBUILD puppet-lint-2.3.2.ebuild 615 SHA256 531e30786dc2c67d1fc1360ecd40856e10df84a9ce4bd2cd5aeafd3be2547665 SHA512 c2ea85bb7a595bc0c298eaa4b321a1abc95a0a7867856b75318e19934cde219c2ea6cb9d996fa7db5747da2bb9bc285a2f5adcb510d924ae9cd9d3bff5805fff WHIRLPOOL d21f0d4808778bde3b3ae4fc054253d9604810e55ec95d06fbc2de3108cacc66aef7f86eb7f6b43e6ddcfd030f0ba02cfadba2d15c5aaaec9be163a3186fab65
+EBUILD puppet-lint-2.3.3.ebuild 615 SHA256 531e30786dc2c67d1fc1360ecd40856e10df84a9ce4bd2cd5aeafd3be2547665 SHA512 c2ea85bb7a595bc0c298eaa4b321a1abc95a0a7867856b75318e19934cde219c2ea6cb9d996fa7db5747da2bb9bc285a2f5adcb510d924ae9cd9d3bff5805fff WHIRLPOOL d21f0d4808778bde3b3ae4fc054253d9604810e55ec95d06fbc2de3108cacc66aef7f86eb7f6b43e6ddcfd030f0ba02cfadba2d15c5aaaec9be163a3186fab65
+MISC ChangeLog 3852 SHA256 4053511418c5e19328d9d1feca08d814fedef10c1cebf398e99bbe7230dcdce1 SHA512 375a4abf4bd9e347590e63a7c45749b0e390b12ab2d798a5a887747545407992acd7bc60f0ac1ec3e8d3e4564fa0391948b871d20db574aef9f7002983fd0937 WHIRLPOOL 7422217e48fca437bc1436c07ee93f5bd9cce8da062931f408ec05c1bbb3ae4d2be7622398588e430cfeaeb64130ec0444ff2d7698cdb23b1742e695d1ad828e
+MISC ChangeLog-2015 1441 SHA256 ab8336378627268c4f61a8a208b904c41a451658f9cae0492dccf3e28a0b8366 SHA512 063d6de458f028fddbaf9cd80cbe9398d31fbd8c6d4fc4970c32677b5aa63065ce42b98e67ab1b301147af4da017cfa7d2e792cd08f58fff31f552906137ed97 WHIRLPOOL 94b9d67e5efad587961dece4723ed61e64b439651eba8f07b0b6289185ef553ad943032bc3569431645ab57100c74fc17a6dc9ab81a4ff1b6082e105b444bade
+MISC metadata.xml 453 SHA256 7b03ac09f03a175f7512588228dab2a9d47c9e23270df31872e98a38564fb6c6 SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524 WHIRLPOOL a68d2d406e645e54223b5c9e66f7f02af3626d135bf458792b94515b5ad7ff5e554eae87f25ae0c96383db0ac25c7ebac82261ed7d0405505bc32685666a1e5a
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
new file mode 100644
index 000000000000..78dad76cdc2f
--- /dev/null
+++ b/app-admin/puppet-lint/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>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
+<longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
new file mode 100644
index 000000000000..cf379613b0f5
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec-its:1
+ dev-ruby/rspec-collection_matchers:1 )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild b/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
new file mode 100644
index 000000000000..57be7f078fe7
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec-its:1
+ dev-ruby/rspec-collection_matchers:1
+ dev-ruby/rspec-json_expectations )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
new file mode 100644
index 000000000000..5b79542ae57f
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec-its:1
+ dev-ruby/rspec-collection_matchers:1
+ dev-ruby/rspec-json_expectations )"
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
new file mode 100644
index 000000000000..65e7f40bb291
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec-its:1
+ dev-ruby/rspec-collection_matchers:1
+ dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
new file mode 100644
index 000000000000..65e7f40bb291
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec-its:1
+ dev-ruby/rspec-collection_matchers:1
+ dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
new file mode 100644
index 000000000000..dd9b86ebd180
--- /dev/null
+++ b/app-admin/puppet/Manifest
@@ -0,0 +1,29 @@
+AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 SHA256 3e9b90dcec65bbc74b9d9fb42caddfc2604ae08fc2a6b0c390eb5fac1dbc9249 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca WHIRLPOOL 428438d32e7225e7b89098dcd3d72e884783bce7ef53ca7485c4a2dfbd72cf0bfe6a27b93b67088519c59236f8c4dedb5fabb20729bd1406129e1777b67d11ee
+AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
+AUX puppet-fix-tests-4.7.0.patch 1102 SHA256 d974f75a8b3ec0f71f4834db5cac674164bf127ff579ce6ad166e065a5c10117 SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8 WHIRLPOOL a97bc23c6b427413308fa0b4381ac017288e6f30ff9db187b89f07af9fb9acfbec938b0ae623d1dac860d8846aabcaeefde4674287dc5b8fbcc9d6748394229c
+AUX puppet-systemd.patch 481 SHA256 779e66ea3c09d9cb2a0600592df6c5ca246fba08c87b5eaf004e47b131a6f988 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97 WHIRLPOOL 2bd4000ef90ffa3c2915619c4c10d0f702ea8c86d291591531e16979015460d41fe2172268183bb75516a711dba6a8918a95f0fa74d1cf71ab63574b14a3a759
+AUX puppet.init 917 SHA256 a598aeacec8b1e71489f00cef1b6b603288a310ec8a9c27937c4cc7f0fd0701c SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf WHIRLPOOL 5b12d2d4b7188dde335588ff350e86f461f14808fc55b93bc525b61754c045f7dcbe1aadf6feb6b85b61de186eee97bbe9421113086d7522dfe331476109ee66
+AUX puppet.init-4.x 764 SHA256 c354e4707158b237f76ef2d507cc86b928d8db44d24b612f900c427caa137084 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8 WHIRLPOOL ac390e37325a17d3abaea064331b100b19f28eb660526f493f4e3fe18a62a55f1fcd6d81f30de1e4721020f88def4c1bf507bcd540fb8b3a69d423ce67c9742d
+AUX puppet.init-r1 610 SHA256 288eb3d1e6bf0ab47aebb85da327e18354d5b8bba46e86d7670cc520db20638e SHA512 c1f3040f6ed07933bbf261ba5d3f7574fa500ebdc5b6f71eb15f02f71e355384175fbf8a5411d1be9b6a379b6fe3d74ca9d4ec164b6b4632eaa8878595573125 WHIRLPOOL 2bad8def65b5c2157a973b902c2a59d2e9ed401ce9f5f92fa8d9b7543cb5d9049508a0a159aea65cc016b49f320757d2d0ba458a83547f97bc8eca9f83a76926
+AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
+AUX puppetmaster.init 1090 SHA256 b1d7efb06110e2d2a2ae21d851d2105cd5fb6830e2277df744772756248e51c2 SHA512 cb8b63aecee163c680449edfa63f9070582d3c1c924e3692dc7c18a7f84e166e9e4d88abae44d6e828eb3d4ab57b0d3a1f64e3a69453fa30d5559e4ae1716975 WHIRLPOOL 7405854be09ae905f74259a7cac0fe80df09622a1025e397e715cd68e36499f41afc168033c7567ed225bf3ffb5954bbc27e83716bd0b7f364862514f83b9a22
+AUX puppetmaster.init-4.x 1108 SHA256 28ad17b7ea6b74481c3ae65fcea9015b585abf576eee87dd4595d0c1309988a6 SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6 WHIRLPOOL a1cae317b8e1af1c2f5e6baec5da1698b52e654143e04e6bfd6f467cb9bd78472b86beb020acd7e34ca1f7d67f34d58ef001ad02efb934c64c41218c07d2c0df
+AUX puppetmaster.init-r1 921 SHA256 b5504a04d02e788ea789faab466419e3c4ec0284ec0b65b53ab6af37c62d23a7 SHA512 cb73ee391fc493648504af8eee2595af102ed9dcd9043f4316fb93749b37d0492e28f0082fc43bb8266357d1c298246e75f3d8b99d195dd169e3a5761f06fbba WHIRLPOOL 887dca8a6e0cf5de720a7371a51f7ab6ba4143c7fdad789cb765a4744074e0dcbde8375c7024b78ec84892921a1843fba8659f474cc6071d07c9c3a3a4d93f54
+AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909
+DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
+DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
+DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
+DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb
+DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
+DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
+EBUILD puppet-3.8.7-r1.ebuild 5301 SHA256 62c457fdbe347a1237427fbcca093e205e8aa5f0a0a82d848015efce50bde0ae SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba WHIRLPOOL d1b96ec8d9c38baefe15a5b77fa6f18ee0dfd40a030425050bcca09bad8bb9316a4c3815a8c027eae1c4c1a51755a88b67cbbd0351a4ef228e7cf6b539803b0e
+EBUILD puppet-4.10.1.ebuild 4911 SHA256 5027b773b1f78cd11cee723f431c9254d3bcf5a28da47e6866daa6b491355fa9 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa WHIRLPOOL f178c02748737602a6f277a29d54a1808f63b0c5cd3aee0c9dc39b2a0dec1c30a5b6093cce9b8cf7a13c52b10f8f1c7c38edb908ac575c0a6587fa86cbda20d2
+EBUILD puppet-4.10.6-r1.ebuild 5573 SHA256 49daf4ffbc0311cb92b30b10219da4b421eb4d3d67958394d5078c3b0e22ddc9 SHA512 3ca9a12e808f70aef8b02975804012a7fbe96484b12ccb0a871a3f79686d71f24eda5342d41ce555aa65a827c645631f3f0e9f943b1ce93d6fe4c60eb910dd84 WHIRLPOOL 01521b31871c76e5de3dffc5bb91fb22a9392977976971e69219ea052499aafb7893988e40e746c12c95025306ce2b10e76d1531fd9f1ef93d750c9e209f8fd3
+EBUILD puppet-4.10.6.ebuild 5529 SHA256 f9a004fbb4a13514101692d29cbf23e96d05c91cd5b77bf47ce68f9c0ea58fff SHA512 1c0728ea0ea361c1c551629349ad36e3191a1279400130e4a5fa067a2b9e9022c0537056e78425c9f49abba905972d5607265e7516c302e4c09360a9f344fa74 WHIRLPOOL b55127045d5778b3daf4fc4bc7b82d57a5668bd382d6b3fd0fa73b1a9320fb60c50acdd096aa371521383cb17259c42b5518c95fc448ea438be6ccd2b44d4474
+EBUILD puppet-4.10.8.ebuild 5566 SHA256 d4810b6e8b5a23d4de3290943ff28ed2c76d7585d566529a0ffb0083970ced2b SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528 WHIRLPOOL eadcc24108873db026d1294a3b9b293eed5bc0ef609a083bc83f8cb38f3dc0e013e90f08a7cd478c660e32f31299fe37bc123cdd7f1daef61d55f9d1cb052dc9
+EBUILD puppet-4.8.1.ebuild 4732 SHA256 4ee2c0ea64544ba7993687e6405f716f51b6f486bb10f23d4bdad763f968b0a1 SHA512 7dcfecdb30c78d673de700786036b0328588d93175ed419e4b84a5a57f4c76b9c09e59f85c3e14bb24c5a0883b5885b4fb9f6878e604a5a939b0c33ecd398f14 WHIRLPOOL b4811641f59d9663fef5c72f07e4a220608fff5a5c60ab3a594d992b2707795d7975088e260c8a5fcacb1c7381708de8cc19e036bb1ace78b9bf1e9429df5ff2
+EBUILD puppet-5.1.0-r1.ebuild 3818 SHA256 6b8f56ce122a09f24f1752fd18d21d67dbbdc0e2b065a240e42838dec5da153c SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1 WHIRLPOOL 5b41c22e086ca783dc3a33bbe3d20664f808508ebf960847dc0616067e948341b91735867624b7c6eed16364a8c60104d279e7dc364d820007609ab8a7b9d780
+EBUILD puppet-5.1.0.ebuild 3865 SHA256 87a9da9798d6ce26a1135e14b287922d8658852a357f1a56c4ad235094db377c SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec WHIRLPOOL 4744be2477265de9abda387530b4b28ec49b47a606019f634cb0465a96d35630936c1472e9ad5468fb7b5220415f02a71701e7a135e340cca6a119e43fc2ad39
+MISC ChangeLog 7719 SHA256 ebfd68981bbfd64b0ff92511b97749e56ab20d4663b4190a4ce89fc458a3a40b SHA512 98f3a66da3959b16036bf32851f8881d1928092c5ce64c02819dd9bf8578a2eb142e8f2ced5a85aa6d5b5cf1f15842e8ac9d6b9a851b2efdcab59eca9f2df1bd WHIRLPOOL 6fb9b83691125722682f433be9c49a75d7ee4e9eccc26ab6d273a379508f830b3ba7bf67a87924b4c0722590003f20530e2d9ddb1d29f2d5a0458d070672cef3
+MISC ChangeLog-2015 37770 SHA256 3183b2d4bab4f43c30b81d32da261e55a0311a0e0f32127fe36e7678a7964670 SHA512 5495eb8a18269cf58f6d8f5e20049da35692ce6e30fe126f65c0c15b77c477206b3dca3e2b61ac165d82ed2fc665775b474cf4bc667d3746aa5d12a58f55c51a WHIRLPOOL c5401b362aa38e38685603c8d0365a06c08f3f4b46533d2242b614133ddbca4c5ebe8897d60109c7c383cd4f5a61f118313e7c949f501e3f80473981ef26498d
+MISC metadata.xml 1514 SHA256 b064512148509253a4e3621c23e9ec3722bb39dd72ed5b1720799faa6625f73b SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64 WHIRLPOOL 8488598872c70c1d28c302636b4a5b009be8cd0380a814b161500af8db6343bde421d95d1ca4ce8877cfbc1d073b825cbd2a8e90dc2ac170fceb146d0916a400
diff --git a/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
new file mode 100644
index 000000000000..09b345e8bc97
--- /dev/null
+++ b/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
@@ -0,0 +1,329 @@
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
+index 374667c..12160c6 100644
+--- a/lib/puppet/provider/package/portage.rb
++++ b/lib/puppet/provider/package/portage.rb
+@@ -2,14 +2,19 @@
+ require 'fileutils'
+
+ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
+- desc "Provides packaging support for Gentoo's portage system."
++ desc "Provides packaging support for Gentoo's portage system.
+
+- has_features :versionable, :reinstallable
++ This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
++ flags to be passed to emerge. These options should be specified as a string (e.g. '--flag'), a hash
++ (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
++
++ has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
+
+ {
+- :emerge => "/usr/bin/emerge",
+- :eix => "/usr/bin/eix",
+- :update_eix => "/usr/bin/eix-update",
++ :emerge => '/usr/bin/emerge',
++ :eix => '/usr/bin/eix',
++ :qatom_bin => '/usr/bin/qatom',
++ :update_eix => '/usr/bin/eix-update',
+ }.each_pair do |name, path|
+ has_command(name, path) do
+ environment :HOME => '/'
+@@ -24,15 +29,18 @@ def self.instances
+ result_format = self.eix_result_format
+ result_fields = self.eix_result_fields
+
++ limit = self.eix_limit
+ version_format = self.eix_version_format
+ slot_versions_format = self.eix_slot_versions_format
++ installed_versions_format = self.eix_installed_versions_format
++ installable_versions_format = self.eix_install_versions_format
+ begin
+- eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++ eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+ update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+
+ search_output = nil
+- Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+- search_output = eix *(self.eix_search_arguments + ["--installed"])
++ Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++ search_output = eix *(self.eix_search_arguments + ['--installed'])
+ end
+
+ packages = []
+@@ -57,65 +65,123 @@ def self.instances
+
+ def install
+ should = @resource.should(:ensure)
+- name = package_name
+- unless should == :present or should == :latest
+- # We must install a specific version
+- name = package_atom_with_version(should)
++ cmd = %w{}
++ name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++ name = qatom[:pfx] + name if qatom[:pfx]
++ name = name + '-' + qatom[:pv] if qatom[:pv]
++ name = name + '-' + qatom[:pr] if qatom[:pr]
++ name = name + qatom[:slot] if qatom[:slot]
++ cmd << '--update' if [:latest].include?(should)
++ cmd += install_options if @resource[:install_options]
++ cmd << name
++ emerge *cmd
++ end
++
++ def uninstall
++ should = @resource.should(:ensure)
++ cmd = %w{--rage-clean}
++ name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++ name = qatom[:pfx] + name if qatom[:pfx]
++ name = name + '-' + qatom[:pv] if qatom[:pv]
++ name = name + '-' + qatom[:pr] if qatom[:pr]
++ name = name + qatom[:slot] if qatom[:slot]
++ cmd += uninstall_options if @resource[:uninstall_options]
++ cmd << name
++ if [:purged].include?(should)
++ Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
++ emerge *cmd
++ end
++ else
++ emerge *cmd
+ end
+- emerge name
+ end
+
+- # The common package name format.
+- def package_name
+- @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
++ def reinstall
++ self.install
+ end
+
+- def package_name_without_slot
+- package_name.sub(self.class.slot_pattern, '')
++ def update
++ self.install
+ end
+
+- def package_slot
+- if match = package_name.match(self.class.slot_pattern)
+- match[1]
++ def qatom
++ output_format = self.qatom_output_format
++ result_format = self.qatom_result_format
++ result_fields = self.qatom_result_fields
++ @atom ||= begin
++ search_output = nil
++ package_info = {}
++ # do the search
++ search_output = qatom_bin *([@resource[:name], '--format', output_format])
++ # verify if the search found anything
++ match = result_format.match(search_output)
++ if match
++ result_fields.zip(match.captures) do |field, value|
++ # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
++ if value == '(null)'
++ package_info[field] = nil
++ elsif !value or value.empty?
++ package_info[field] = nil
++ else
++ package_info[field] = value
++ end
++ end
++ end
++ @atom = package_info
++ rescue Puppet::ExecutionFailure => detail
++ raise Puppet::Error.new(detail)
+ end
+ end
+
+- def package_atom_with_version(version)
+- if slot = package_slot
+- "=#{package_name_without_slot}-#{version}:#{package_slot}"
+- else
+- "=#{package_name}-#{version}"
+- end
++ def qatom_output_format
++ '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+ end
+
+- def uninstall
+- emerge "--unmerge", package_name
++ def qatom_result_format
++ /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
+ end
+
+- def reinstall
+- self.install
++ def qatom_result_fields
++ [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
+ end
+
+- def update
+- self.install
++ def self.get_sets
++ @sets ||= begin
++ @sets = emerge *(['--list-sets'])
++ end
+ end
+
+ def query
++ limit = self.class.eix_limit
+ result_format = self.class.eix_result_format
+ result_fields = self.class.eix_result_fields
+
+ version_format = self.class.eix_version_format
+ slot_versions_format = self.class.eix_slot_versions_format
+- search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
+- search_value = package_name_without_slot
++ installed_versions_format = self.class.eix_installed_versions_format
++ installable_versions_format = self.class.eix_install_versions_format
++ search_field = qatom[:category] ? '--category-name' : '--name'
++ search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
++
++ @eix_result ||= begin
++ # package sets
++ package_sets = []
++ self.class.get_sets.each_line do |package_set|
++ package_sets << package_set.to_s.strip
++ end
+
+- begin
+- eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++ if @resource[:name].match(/^@/)
++ if package_sets.include?(@resource[:name][1..-1].to_s)
++ return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
++ end
++ end
++
++ eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
+ update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+
+ search_output = nil
+- Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
+- search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
++ Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
++ search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
+ end
+
+ packages = []
+@@ -127,10 +193,19 @@ def query
+ result_fields.zip(match.captures) do |field, value|
+ package[field] = value unless !value or value.empty?
+ end
+- if package_slot
+- package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
+- package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
++ # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
++ # version_available is what we CAN install / update to
++ # ensure is what is currently installed
++ # This DOES NOT choose to install/upgrade or not, just provides current info
++ # prefer checking versions to slots as versions are finer grained
++ if qatom[:pv]
++ package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
++ package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
++ elsif qatom[:slot]
++ package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
++ package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
+ end
++
+ package[:ensure] = package[:ensure] ? package[:ensure] : :absent
+ packages << package
+ end
+@@ -138,10 +213,9 @@ def query
+
+ case packages.size
+ when 0
+- not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
+- raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
++ raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
+ when 1
+- return packages[0]
++ @eix_result = packages[0]
+ else
+ raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
+ end
+@@ -155,39 +229,73 @@ def latest
+ end
+
+ private
++ def eix_get_version_for_versions(versions, target)
++ # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
++ return nil if versions.nil?
++ versions = versions.split(',')
++ # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
++ versions.find { |version| version == target }
++ # 3.5.2
++ end
++
++ private
+ def eix_get_version_for_slot(versions_and_slots, slot)
++ # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
+ return nil if versions_and_slots.nil?
+- versions_and_slots = versions_and_slots.split(",")
+- versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
+- version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
++ versions_and_slots = versions_and_slots.split(',')
++ # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
++ versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
++ # [2.7.12: 2.7
++ # 3.4.5: 3.4
++ # 3.5.2: 3.5]
++ version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
++ # [3.5.2: 3.5]
+ version_for_slot.first if version_for_slot
+- end
+-
+- def self.slot_pattern
+- /:([\w+.\/*=-]+)$/
++ # 3.5.2
+ end
+
+ def self.eix_search_format
+- "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
++ "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
+ end
+
+ def self.eix_result_format
+- /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
++ /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+ end
+
+ def self.eix_result_fields
+- [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
++ # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
++ [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
+ end
+
+ def self.eix_version_format
+- "{last}<version>{}"
++ '{last}<version>{}'
+ end
+
+ def self.eix_slot_versions_format
+- "{!first},{}<version>:<slot>"
++ '{!first},{}<version>:<slot>'
++ end
++
++ def self.eix_installed_versions_format
++ '{!first},{}<version>'
++ end
++
++ def self.eix_install_versions_format
++ '{!first}{!last},{}{}{isstable}<version>{}'
++ end
++
++ def self.eix_limit
++ '0'
+ end
+
+ def self.eix_search_arguments
+- ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
++ ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
++ end
++
++ def install_options
++ join_options(@resource[:install_options])
++ end
++
++ def uninstall_options
++ join_options(@resource[:uninstall_options])
+ end
+ end
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
new file mode 100644
index 000000000000..64c38ae5a31d
--- /dev/null
+++ b/app-admin/puppet/files/50puppet-mode-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch b/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
new file mode 100644
index 000000000000..7d62e0c1f786
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2016-10-11 13:24:09.500955469 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb.new 2016-10-11 13:24:00.501700977 -0500
+@@ -139,15 +139,6 @@
+ indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
+ end
+
+- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
+- handler.expects(:check_authorization).with(anything,
+- anything,
+- Not(has_entry(:environment)))
+- expect(lambda { handler.uri2indirection("GET",
+- "#{master_url_prefix}/node/bar",
+- {:environment => 'bogus'}) }).to raise_error(not_found_error)
+- end
+-
+ it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+ handler.expects(:check_authorization).with(anything,
+ anything,
diff --git a/app-admin/puppet/files/puppet-systemd.patch b/app-admin/puppet/files/puppet-systemd.patch
new file mode 100644
index 000000000000..72d7d69a2f77
--- /dev/null
+++ b/app-admin/puppet/files/puppet-systemd.patch
@@ -0,0 +1,10 @@
+--- ext/systemd/puppet.service 2017-02-02 18:28:58.000000000 -0600
++++ ext/systemd/puppet.service 2017-03-09 10:56:59.091489324 -0600
+@@ -17,7 +17,7 @@
+ EnvironmentFile=-/etc/sysconfig/puppetagent
+ EnvironmentFile=-/etc/sysconfig/puppet
+ EnvironmentFile=-/etc/default/puppet
+-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
++ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
new file mode 100644
index 000000000000..d30367ad3fb2
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need localmount net
+ use dns logger puppetmaster netmount nfsmount
+}
+
+checkconfig() {
+ if [ ! -d "${PUPPET_PID_DIR}" ] ; then
+ eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+ return 1
+ fi
+
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+
+ local options=""
+ [ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+ ebegin "Starting puppet"
+ start-stop-daemon --start --quiet \
+ --pidfile "${PUPPET_PID_DIR}/agent.pid" \
+ --exec /usr/bin/puppetd -- ${options}
+ eend $? "Failed to start puppet"
+}
+
+stop() {
+ ebegin "Stopping puppet"
+ start-stop-daemon --stop --quiet \
+ --pidfile "${PUPPET_PID_DIR}/agent.pid"
+ local ret=$?
+ eend ${ret} "Failed to stop puppet"
+ rm -f "${PUPPET_PID_DIR}/agent.pid"
+ return ${ret}
+}
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x
new file mode 100644
index 000000000000..f7106e6f0294
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init-4.x
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+ need localmount
+ use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+ ebegin "Reloading $RC_SVCNAME"
+ start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/puppet/files/puppet.init-r1 b/app-admin/puppet/files/puppet.init-r1
new file mode 100644
index 000000000000..36398d26fe2b
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+extra_started_commands="reload"
+
+command="/usr/bin/puppet"
+
+command_args="agent --pidfile ${pidfile} ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+ need localmount
+ use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
diff --git a/app-admin/puppet/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd
new file mode 100644
index 000000000000..afecf479a6a1
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.confd
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
new file mode 100644
index 000000000000..687003752329
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+ PUPPETMASTER_PID="master"
+else
+ PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+ command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+depend() {
+ need localmount
+ use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+ checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+ ebegin "Reloading ${SVCNAME}"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
new file mode 100644
index 000000000000..286f7e67579a
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init-4.x
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+ PUPPETMASTER_PID="master"
+else
+ PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+ command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+depend() {
+ need localmount
+ use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+ checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+ ebegin "Reloading $RC_SVCNAME"
+ start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/puppet/files/puppetmaster.init-r1 b/app-admin/puppet/files/puppetmaster.init-r1
new file mode 100644
index 000000000000..22479c5e1a61
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster.init-r1
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+ PUPPETMASTER_PID="master"
+else
+ PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+ command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+
+command="/usr/bin/puppet"
+
+depend() {
+ need localmount
+ use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+ checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+ checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+ checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d
new file mode 100644
index 000000000000..cd33231df7f7
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d
@@ -0,0 +1 @@
+D /var/run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
new file mode 100644
index 000000000000..fcc0764c44d5
--- /dev/null
+++ b/app-admin/puppet/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Centralised configuration management for networks
+ Puppet lets you centrally manage every important aspect of your system
+ using a cross-platform specification language that manages all the
+ separate elements normally aggregated in different files, like users,
+ cron jobs, and hosts, along with obviously discrete elements like
+ packages, services, and files.
+
+ Puppet's simple declarative specification language provides powerful
+ classing abilities for drawing out the similarities between hosts while
+ allowing them to be as specific as necessary, and it handles dependency
+ and prerequisite relationships between objects clearly and explicitly.
+ </longdescription>
+ <use>
+<!-- <flag name='puppetdb'>Enable puppetdb support</flag> -->
+ <flag name="augeas">Enable augeas support</flag>
+ <flag name="diff">Enable diff support</flag>
+ <flag name="rrdtool">Enable rrdtool support</flag>
+ <flag name="shadow">Enable shadow support</flag>
+ <flag name="experimental">Add patches for things in testing</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
new file mode 100644
index 000000000000..f7e608e5bbfa
--- /dev/null
+++ b/app-admin/puppet/puppet-3.8.7-r1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.7.0
+ >=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+ dev-ruby/json
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+DEPEND="${DEPEND}
+ emacs? ( virtual/emacs )
+ xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Fix compatibility with ruby22 and later. Psych has been the
+ # default YAML engine since ruby 2.0 and ruby22 and later no longer
+ # define YAML::ENGINE at all.
+ sed -i -e '/YAML_ENGINE =/ s/syck/psych/' lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
+
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # Avoid Rails specs to avoid this dependency and because they
+ # currently fail against Rails 4.1.
+ find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+ rm -r spec/unit/rails || die
+ rm spec/unit/parser/collector_spec.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use emacs ; then
+ elisp-compile ext/emacs/puppet-mode.el
+ fi
+
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+ #${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ #systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+ # Initial configuration files
+ insinto /etc/puppet
+
+ # Location of log and data files
+ keepdir /var/log/puppet
+ fowners -R puppet:puppet /var/log/puppet
+
+ if use minimal ; then
+ rm "${ED}/etc/puppet/auth.conf"
+ else
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+ newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ insinto /etc/puppet
+
+ keepdir /etc/puppet/manifests
+ keepdir /etc/puppet/modules
+
+ keepdir /var/lib/puppet/ssl
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+ fperms 0750 /var/lib/puppet
+ fi
+ fperms 0750 /etc/puppet
+ fowners :puppet /etc/puppet
+
+ if use emacs ; then
+ elisp-install ${PN} ext/emacs/puppet-mode.el*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ if [ \
+ -f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+ -f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+ -f "${EPREFIX}/etc/puppet/puppetca.conf" \
+ ] ; then
+ elog
+ elog "Please remove deprecated config files."
+ elog " /etc/puppet/puppetca.conf"
+ elog " /etc/puppet/puppetd.conf"
+ elog " /etc/puppet/puppetmasterd.conf"
+ elog
+ fi
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "2" ]; then
+ elog
+ elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+ elog "http://docs.puppetlabs.com/guides/upgrading.html"
+ elog
+ fi
+ done
+
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
new file mode 100644
index 000000000000..77b1ce4bfcd7
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
+ emacs? ( virtual/emacs )
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use emacs ; then
+ elisp-compile ext/emacs/puppet-mode.el
+ fi
+
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use emacs ; then
+ elisp-install ${PN} ext/emacs/puppet-mode.el*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.10.6-r1.ebuild b/app-admin/puppet/puppet-4.10.6-r1.ebuild
new file mode 100644
index 000000000000..62e5e757fb54
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.6-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# test? (
+# dev-ruby/mocha:0.14
+# =dev-ruby/rack-1*
+# dev-ruby/rspec-its
+# dev-ruby/rspec-collection_matchers
+# >=dev-ruby/vcr-2.9:2
+# >=dev-ruby/webmock-1.24:0
+# )"
+
+DEPEND+=" ${DEPEND}
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # Use working version of mocha
+ sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing specs that need further investigation.
+ sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
+ spec/integration/indirector/facts/facter_spec.rb || die
+ sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
+ rm -f spec/unit/indirector/ldap_spec.rb \
+ spec/unit/parser/functions/create_resources_spec.rb || die
+
+ # Avoid specs that rely on tools from other OSs
+ rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+ spec/unit/provider/user/directoryservice_spec.rb || die
+
+ # Avoid specs that depend on hiera-eyaml to avoid circular
+ # dependencies
+ rm -f spec/unit/functions/lookup_spec.rb || die
+
+ # Avoid specs that fail due to an unpackaged file
+ sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.10.6.ebuild b/app-admin/puppet/puppet-4.10.6.ebuild
new file mode 100644
index 000000000000..90ba147596df
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.6.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# test? (
+# dev-ruby/mocha:0.14
+# =dev-ruby/rack-1*
+# dev-ruby/rspec-its
+# dev-ruby/rspec-collection_matchers
+# >=dev-ruby/vcr-2.9:2
+# >=dev-ruby/webmock-1.24:0
+# )"
+
+DEPEND+=" ${DEPEND}
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # Use working version of mocha
+ sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing specs that need further investigation.
+ sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
+ spec/integration/indirector/facts/facter_spec.rb || die
+ sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
+ rm -f spec/unit/indirector/ldap_spec.rb \
+ spec/unit/parser/functions/create_resources_spec.rb || die
+
+ # Avoid specs that rely on tools from other OSs
+ rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+ spec/unit/provider/user/directoryservice_spec.rb || die
+
+ # Avoid specs that depend on hiera-eyaml to avoid circular
+ # dependencies
+ rm -f spec/unit/functions/lookup_spec.rb || die
+
+ # Avoid specs that fail due to an unpackaged file
+ sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.10.8.ebuild b/app-admin/puppet/puppet-4.10.8.ebuild
new file mode 100644
index 000000000000..00ed4a2f7ad9
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.8.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+# test? (
+# dev-ruby/mocha:0.14
+# =dev-ruby/rack-1*
+# dev-ruby/rspec-its
+# dev-ruby/rspec-collection_matchers
+# >=dev-ruby/vcr-2.9:2
+# >=dev-ruby/webmock-1.24:0
+# )"
+
+DEPEND+=" ${DEPEND}
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ if use experimental; then
+ epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
+ fi
+
+ # Use working version of mocha
+ sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing specs that need further investigation.
+ sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
+ spec/integration/indirector/facts/facter_spec.rb || die
+ sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
+ rm -f spec/unit/indirector/ldap_spec.rb \
+ spec/unit/parser/functions/create_resources_spec.rb || die
+
+ # Avoid specs that rely on tools from other OSs
+ rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
+ spec/unit/provider/user/directoryservice_spec.rb || die
+
+ # Avoid specs that depend on hiera-eyaml to avoid circular
+ # dependencies
+ rm -f spec/unit/functions/lookup_spec.rb || die
+
+ # Avoid specs that fail due to an unpackaged file
+ sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
new file mode 100644
index 000000000000..e2846fe6aefd
--- /dev/null
+++ b/app-admin/puppet/puppet-4.8.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ >=dev-ruby/rgen-0.6.5
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
+ emacs? ( virtual/emacs )
+ xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+ if use emacs ; then
+ elisp-compile ext/emacs/puppet-mode.el
+ fi
+
+ if use xemacs ; then
+ # Create a separate version for xemacs to be able to install
+ # emacs and xemacs in parallel.
+ mkdir ext/xemacs
+ cp ext/emacs/* ext/xemacs/
+ xemacs-elisp-compile ext/xemacs/puppet-mode.el
+ fi
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use emacs ; then
+ elisp-install ${PN} ext/emacs/puppet-mode.el*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use xemacs ; then
+ xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+ xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "3" ]; then
+ elog
+ elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+ elog "/etc/puppetlabs/puppet"
+ elog "Also, puppet now uses config directories for modules and manifests."
+ elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
+ elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
+ elog "for more information."
+ elog
+ fi
+ done
+
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-5.1.0-r1.ebuild b/app-admin/puppet/puppet-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..f74a524361aa
--- /dev/null
+++ b/app-admin/puppet/puppet-5.1.0-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "4" ]; then
+ elog
+ elog "Please see the following url for the release notes for puppet-5"
+ elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+ elog
+ fi
+ done
+}
diff --git a/app-admin/puppet/puppet-5.1.0.ebuild b/app-admin/puppet/puppet-5.1.0.ebuild
new file mode 100644
index 000000000000..42e505f2b7e8
--- /dev/null
+++ b/app-admin/puppet/puppet-5.1.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+# need to get deps up to date for this
+#USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ >=dev-ruby/facter-3.0.0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # can't be run within portage.
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+ # fix systemd path
+ epatch "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ if use ldap ; then
+ insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+ fi
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"; dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+
+ for v in ${REPLACING_VERSIONS}; do
+ if [ "$(get_major_version $v)" = "4" ]; then
+ elog
+ elog "Please see the following url for the release notes for puppet-5"
+ elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+ elog
+ fi
+ done
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
new file mode 100644
index 000000000000..9804af7c599d
--- /dev/null
+++ b/app-admin/puppetdb/Manifest
@@ -0,0 +1,8 @@
+AUX puppetdb.initd 1824 SHA256 cb406d0eb615d53e19b3b68598d446062ce53098278e78db602d677eb8f37ea9 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961 WHIRLPOOL 659f4530099f9dcf7f0b56cd8241d4e1e4a7b1a31e0bd9d921ecca565f5158cc19be9f49b1c01d5a6d6e4ad7ab8abac584ec06c42dfa6209a01b933aff7ed0f3
+DIST puppetdb-4.4.0.tar.gz 23629723 SHA256 b9e656846981397a3eed64dff44a7171e6a01b7e8c76c877bd93267d96f50414 SHA512 2caaa2b39146b42388b03ecd830d386efcc25774dfe9b6e1bd25fd6f1820902364dda7526c2e019657d18371be4afdb84a165d9bec1078a6c3621bc80241a5a2 WHIRLPOOL 768e33674c5b62c96c3379cd822f09f519d6e70cd976526ba630c8bfef7c1ee226f0b5bcb6957040355769aecbd1889f25fbc22e8685a6430c077af9f5256639
+DIST puppetdb-5.0.1.tar.gz 24055687 SHA256 ac75c40c16ecfd14a64c3122811adcceaa2f32c1874e07c763ad0b1ec7338a27 SHA512 0e08e27a2004b6cf07704a77d931ad30326559e3fd6504c9a839f468c8379c49407214187bf47f960fd3b5cdba9ec162c69e67e7ed7125c4137a77ed076e42f1 WHIRLPOOL fdde4ec40c95cf436da97f78f5c70a0adcc037cea9f20e93b569cec966dfb5d40c78ce5991571ab2495aca1d424341bdbf785eced325b5b9925628eca03c0357
+EBUILD puppetdb-4.4.0.ebuild 2807 SHA256 3a047598cce8551a0d7d351782f8d725e43051148aaeb34055a5ee4d683bbd0d SHA512 16d8e30f793351b58fee71964122754bf270dc977480804e86461e0131c67e2081eff5f2b728bcce69186ebdab7707aa7f03cf70b3afc4e42a18b59d1ed2d11a WHIRLPOOL 4e21f78d43607fb3f0916b78d96f1caa7b05637c50f65eba32c951ddfd34711ffa4aaf16c08fa10842d91e7eaa6a3d11322f8afcabde530e2f35f362b3447304
+EBUILD puppetdb-5.0.1.ebuild 2763 SHA256 5f2b268e16f7cd1dcdfa841f0e5e5d9bed6b326014986356eee081c71a9ba02e SHA512 032e3f021880cd77a83d5841e130af2eb2e831f54d3760542ee7c3a97a98e5f92e7abe2697d83e896881fd285c7af826854030faade413bba66f0642cd6d7fcf WHIRLPOOL 383ff1eaab16137b7cd57cfc08568c939a892556411b762e2808ed3adfaeb54ef1d5f0e77c5c43d2085317b4c54a4547a84952e03b7a76faf10daada9a51f5a8
+MISC ChangeLog 8628 SHA256 36660f6cf0c1651feab9ff36627e50898819767efd65a3d483c8587952a80daa SHA512 7fb22ded0dcea17ffd3e4af54d15002bac8546ed3934f93ef4b9fee4ff24fbe2e928adeaa2132fd8023a8ec6d59b34cd384ac120958bf14b4661c706f4b3d5b0 WHIRLPOOL 74823e3d2e87b97db89c6dedd6322e9ca0e357135c0c39a2b0794d99469e640388d02c97cc612448ff09a71f373b6b222dc32a0fa6a5bcdca175e4c8e4476b38
+MISC ChangeLog-2015 1236 SHA256 3fea32c44cd920a4d0afd13b438efb32b9a64e483039d8f4379492a5f9d19b42 SHA512 57021ccb882ac0ee0b534edeed6cf510d3919616289edb066ae561b1db2ee81ebb95903abf45b57c45759a6755edee74c0968630a8296b919a7f393e25a8af01 WHIRLPOOL a4eb6aac2ccbc720cdb5aba6050445a4a33ab5bba4eeee30357fc96208a6a3a21df16f0c9bde06a000d9551d49dc2f9bcabccfe453e884356c0a320b2bd19b0a
+MISC metadata.xml 485 SHA256 f18e5c9519ed297b90056ab501981cbe9a4c4815d64f6ff85ebad1b5aa45dfe5 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2 WHIRLPOOL cd481863aa29249fe38cd2ed4dd4bb4093c4a52fc26f6900c491fbc500071878140185b72e84a35c978a8b12fad1548d8cf7c1c972bdbac838b95832b54f14be
diff --git a/app-admin/puppetdb/files/puppetdb.initd b/app-admin/puppetdb/files/puppetdb.initd
new file mode 100644
index 000000000000..29a634e47a9e
--- /dev/null
+++ b/app-admin/puppetdb/files/puppetdb.initd
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+
+LOGDIR="/var/log/puppetlabs/puppetdb"
+RUNDIR="/run/puppetlabs/puppetdb"
+
+checkconfig() {
+ if [ ! -x $JAVA_BIN ]; then
+ eerror "Missing JAVA_BIN."
+ eend 1
+ fi
+ if [ ! -d $INSTALL_DIR ]; then
+ eerror "Missing INSTALL_DIR."
+ eend 1
+ fi
+ if [ ! -e $BOOTSTRAP_CONFIG ]; then
+ eerror "Missing BOOTSTRAP_CONFIG."
+ eend 1
+ fi
+ if [ ! -e $CONFIG ]; then
+ eerror "Missing CONFIG."
+ eend 1
+ fi
+ if [ ! -n $USER ]; then
+ eerror "Missing USER."
+ eend 1
+ fi
+ if [ ! -n $GROUP ]; then
+ eerror "Missing GROUP."
+ eend 1
+ fi
+
+ checkpath -d -m 0755 "${LOGDIR%/*}"
+ checkpath -d -m 0755 "${RUNDIR%/*}"
+ checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+ checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+ JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'"
+ EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting PuppetDB"
+ start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+ -m --pidfile "${RUNDIR}/puppetdb.pid" \
+ -b --exec "/bin/bash" \
+ -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+ local retval=$?
+ if [ $retval -ne 0 ]; then
+ ewarn "Error starting puppetdb."
+ fi
+ eend $retval
+}
+
+stop() {
+ ebegin "Stopping PuppetDB"
+ start-stop-daemon --stop --pidfile "${RUNDIR}/puppetdb.pid"
+ eend $?
+}
diff --git a/app-admin/puppetdb/metadata.xml b/app-admin/puppetdb/metadata.xml
new file mode 100644
index 000000000000..df9a6a6a1c9d
--- /dev/null
+++ b/app-admin/puppetdb/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>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ PuppetDB collects data generated by Puppet. It enables advanced Puppet features like exported resources, and can be the foundation for other applications that use Puppet’s data.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppetdb/puppetdb-4.4.0.ebuild b/app-admin/puppetdb/puppetdb-4.4.0.ebuild
new file mode 100644
index 000000000000..c2792c8d0e2f
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-4.4.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppetdb
+ enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+ sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+ sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ dodir /opt/puppetlabs/server/data/puppetdb
+ insinto /opt/puppetlabs/server/apps/puppetdb
+ insopts -m0744
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppetdb.jar
+ insinto /etc/puppetlabs/puppetdb
+ doins ext/config/logback.xml
+ doins ext/config/bootstrap.cfg
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetdb/conf.d
+ doins ext/config/conf.d/jetty.ini
+ doins ext/config/conf.d/repl.ini
+ doins ext/config/conf.d/database.ini
+ doins ext/config/conf.d/config.ini
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+ doins ext/cli/foreground
+ doins ext/cli/ssl-setup
+ doins ext/cli/export
+ doins ext/cli/config-migration
+ doins ext/cli/foreground
+ doins ext/cli/anonymize
+ doins ext/cli/import
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetdb/bin
+ doins ext/bin/puppetdb
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+ dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+ # init type tasks
+ newconfd ext/default puppetdb
+ systemd_dounit ext/redhat/puppetdb.service
+ systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+ newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetdb.logrotate.conf puppetdb
+ fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+ fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+ elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+ elog
+ elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetdb/puppetdb-5.0.1.ebuild b/app-admin/puppetdb/puppetdb-5.0.1.ebuild
new file mode 100644
index 000000000000..f9227ac7708d
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-5.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppetdb
+ enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+ sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+ sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ dodir /opt/puppetlabs/server/data/puppetdb
+ insinto /opt/puppetlabs/server/apps/puppetdb
+ insopts -m0744
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppetdb.jar
+ insinto /etc/puppetlabs/puppetdb
+ doins ext/config/logback.xml
+ doins ext/config/bootstrap.cfg
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetdb/conf.d
+ doins ext/config/conf.d/jetty.ini
+ doins ext/config/conf.d/repl.ini
+ doins ext/config/conf.d/database.ini
+ doins ext/config/conf.d/config.ini
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+ doins ext/cli/foreground
+ doins ext/cli/ssl-setup
+ doins ext/cli/config-migration
+ doins ext/cli/foreground
+ doins ext/cli/anonymize
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetdb/bin
+ doins ext/bin/puppetdb
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+ dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+ # init type tasks
+ newconfd ext/default puppetdb
+ systemd_dounit ext/redhat/puppetdb.service
+ systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+ newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetdb.logrotate.conf puppetdb
+ fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+ fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+ elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+ elog
+ elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
new file mode 100644
index 000000000000..ddf125acf98a
--- /dev/null
+++ b/app-admin/puppetserver/Manifest
@@ -0,0 +1,10 @@
+AUX puppetserver.init 2138 SHA256 d0beb6010d75aa355662bacc11f122823725ee36cb925606962d750cd6c6bbdc SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11 WHIRLPOOL 7ff953601ecd6e23ea2578fd70b5553bb25149e2bb6620f4607d686959e9c52f9d79bdc607438a1a7cbf081fd03ee46ae61385c6690836b534fc4c5a7937ef4b
+AUX puppetserver.initd 2021 SHA256 6765d45ca5cd20ddc3f7fc784216a9cd0453575077e7ebfa8c4cdc0ca22d6b23 SHA512 e219da1099bb4183f5b835b93d414a0c3181332e6e898d14cfdaa6e7347c98d23b01b98ed0995e60ab37c755c407d90ee2ad73dc7e63488c9922f62d569d89c6 WHIRLPOOL 347416638227bd122e03f2e8adfe175597ddb298ddf1dd2bde222ba763b8a86785535641c44ef5a9223b33e8d013abbe645c5512589d987070b5a88107ac9b31
+DIST puppetserver-2.8.0.tar.gz 34015599 SHA256 0f6f49b149639b80c3caecaeced44c7c0cb98728da7ce12f6725b061f3152812 SHA512 7023278fe501614f1ff9650f72b9193054cb79888ce03f29932a10fa826ee07d67e96eee80a3f2c19007b8bae14008846ea850fb98544bcd39e1ada11fadd22c WHIRLPOOL 6319b7aaefd45b5c49189e15eb06575841c8ca24f3032739515f48f35efcc0ea4d3490f84b2325ff864b57e1a789263596d7f6095a4b35171d3b17a77b07ae68
+DIST puppetserver-5.0.0.tar.gz 66380485 SHA256 b1b62c31d31a69cf1912d6b785f53cbff219a98e0e7300b7f50114694b06ccbf SHA512 1dd7b332871abf12981a7ef33ee92a813275c86ca0cd72a24c3853679c3e93aaf264b76bf4108bf62c04021889e0b7ee0bb46963bd1f3df1f8e67c48e41698e8 WHIRLPOOL 89d15509f3afc96ccdae5370346c101dc48daa68dddbfc98b51151d0e706945858b4485d7358710223c43760f317b5aa6a27b247db3fa02d80077694b0ee4a9c
+EBUILD puppetserver-2.8.0.ebuild 4052 SHA256 48b793e9706747cfd5283cfc8317c32277b5b306ee7df3252222cfe29e281b20 SHA512 10fe93d4747aa1d7f3f1c4f400c63ad4a75e5dc7f5a662c0601bbd22a69b3f29ef04bd7f7fdabdf3fe74e5d2fef2429a083db598f1869648e739d8d6f99974af WHIRLPOOL e23d0e5111eeb62d923c014f90672c994e311b97ad0ecab57b1727dfba9ae85402780ce8ad7b75d90778f59a97f8f3336f15a6546d1df34761df28993ace8af7
+EBUILD puppetserver-5.0.0-r1.ebuild 4939 SHA256 08674dbcd4d0a317128964b18c4dbc93a32effa38126d6b9ca749d48b51237f3 SHA512 04832ab34dea9f8f6cc31f1b22688e3e8961c592b28f8b0e58522c849d2e3ba37879d7fff3afbf572ea768141da6fba871f1d9766c3bde2ff8573dabddce1248 WHIRLPOOL e226ac44eab49bf807272cca5d8738f9bdf0092d043b3d49d8d9efd2dfa55636d3652e7fa674ccf5814987b44b39fce7751e226c828edd0b372df7c4bdd76169
+EBUILD puppetserver-5.0.0-r2.ebuild 4890 SHA256 491606b7edde87459361b8d138181a13f92ab297450dba73702f83f646a52e9e SHA512 65f3d4e8522a505b039aa73a7fc724f62dd3d68a9db0f2f03487f7644de8143e43e3b3f73a73d66b56cbc8a7c2bbb78af8dd528aedf35bb4d74f3ef31bf201be WHIRLPOOL bc08bddfa5945c83bc4d5639e2ffc859f859fb6d47b3d45b9e21d7ec7cd7584688fac019dd504c5cb02697a1c8fa9260eccb33fc242522e114c0f1b2aec24196
+MISC ChangeLog 7993 SHA256 9a47868558e376193b4e988493a375526e8a01b780cb28e7ac140958522e0843 SHA512 473e51d6f52a3fbe7224caeba4aa4363357c87acb5939ba2d238f9857f1c72dba6eb5ccc3d76e9cce6d8c564df7888185ee960c963b7b8308006cd3f53d7c716 WHIRLPOOL af4fa4e71885c9a6cad8a59712e7de6c7854629c07a235915ad0b882fa0539c9e996e2e222eb2a835580049bcc0bf59618e36b825842c48c696f65f5fd0537d4
+MISC ChangeLog-2015 878 SHA256 55c43d296cd6cf910139ea29afe0d041358cc5a8ea0366936dfb75ba21640eae SHA512 5ad7c7171faf5a1c05cb9afaf307880e37744cdf472b1f6f1a72c1ab98f58f2e2150d8582ad72ad0ab9b45a075b7c1ce700603c942b183328a18cee505a186b7 WHIRLPOOL 7c5aaee9bea21577e2864ccc6c31d5accafd4a74ebb79d4f73388a0b3995de84471ed7b18c896747c8730349236136cd23f44f5c71a7aff3a08ef13ef42cc682
+MISC metadata.xml 468 SHA256 cedfad43df11b56dfc9042bc532da2c772f94202ca8819f38fd9cba9e3341107 SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c WHIRLPOOL 356c70f8cfbd446e22a6849124d474ef9ce0663da00694accad62fab22458f69802bb06a247c61950a6e2c384996f6b067c0440499ddfa667342fbe8d627721d
diff --git a/app-admin/puppetserver/files/puppetserver.init b/app-admin/puppetserver/files/puppetserver.init
new file mode 100644
index 000000000000..34126ed8b1e5
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.init
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+ if [ ! -x $JAVA_BIN ]; then
+ eerror "Missing JAVA_BIN."
+ eend 1
+ fi
+ if [ ! -d $INSTALL_DIR ]; then
+ eerror "Missing INSTALL_DIR."
+ eend 1
+ fi
+ if [ ! -e $BOOTSTRAP_CONFIG ]; then
+ eerror "Missing BOOTSTRAP_CONFIG."
+ eend 1
+ fi
+ if [ ! -e $CONFIG ]; then
+ eerror "Missing CONFIG."
+ eend 1
+ fi
+ if [ ! -n $USER ]; then
+ eerror "Missing USER."
+ eend 1
+ fi
+ if [ ! -n $GROUP ]; then
+ eerror "Missing GROUP."
+ eend 1
+ fi
+
+ checkpath -d -m 0755 "${LOGDIR%/*}"
+ checkpath -d -m 0755 "${RUNDIR%/*}"
+ checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+ checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+ PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom -XX:OnOutOfMemoryError=\"kill -9 %p\" -cp ${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar clojure.main -m puppetlabs.trapperkeeper.main"
+ PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d --bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file /opt/puppetlabs/server/data/puppetserver/restartcounter"
+ EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}"
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting Puppet Server"
+ start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+ -m --pidfile "${RUNDIR}/puppetserver.pid" \
+ -b --exec "/bin/bash" \
+ -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+ local retval=$?
+ if [ $retval -ne 0 ]; then
+ ewarn "Error starting puppetserver."
+ fi
+ eend $retval
+}
+
+stop() {
+ ebegin "Stopping Puppet Server"
+ start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading Puppet Server"
+ start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+ eend $?
+}
+
diff --git a/app-admin/puppetserver/files/puppetserver.initd b/app-admin/puppetserver/files/puppetserver.initd
new file mode 100644
index 000000000000..080dd2c8de28
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.initd
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+ if [ ! -x $JAVA_BIN ]; then
+ eerror "Missing JAVA_BIN."
+ eend 1
+ fi
+ if [ ! -d $INSTALL_DIR ]; then
+ eerror "Missing INSTALL_DIR."
+ eend 1
+ fi
+ if [ ! -e $BOOTSTRAP_CONFIG ]; then
+ eerror "Missing BOOTSTRAP_CONFIG."
+ eend 1
+ fi
+ if [ ! -e $CONFIG ]; then
+ eerror "Missing CONFIG."
+ eend 1
+ fi
+ if [ ! -n $USER ]; then
+ eerror "Missing USER."
+ eend 1
+ fi
+ if [ ! -n $GROUP ]; then
+ eerror "Missing GROUP."
+ eend 1
+ fi
+
+ checkpath -d -m 0755 "${LOGDIR%/*}"
+ checkpath -d -m 0755 "${RUNDIR%/*}"
+ checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+ checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+ JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppet-server-release.jar' clojure.main -m puppetlabs.trapperkeeper.main --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}'"
+ EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetserver -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting Puppet Server"
+ start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+ -m --pidfile "${RUNDIR}/puppetserver.pid" \
+ -b --exec "/bin/bash" \
+ -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+ local retval=$?
+ if [ $retval -ne 0 ]; then
+ ewarn "Error starting puppetserver."
+ fi
+ eend $retval
+}
+
+stop() {
+ ebegin "Stopping Puppet Server"
+ start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading Puppet Server"
+ start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+ eend $?
+}
+
diff --git a/app-admin/puppetserver/metadata.xml b/app-admin/puppetserver/metadata.xml
new file mode 100644
index 000000000000..13a741219359
--- /dev/null
+++ b/app-admin/puppetserver/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>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <use>
+ <flag name="puppetdb">Adds support for connecting to puppetdb</flag>
+ </use>
+ <longdescription lang="en">
+ Puppet Server is the next-generation application for managing Puppet agents.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/puppetserver/puppetserver-2.8.0.ebuild b/app-admin/puppetserver/puppetserver-2.8.0.ebuild
new file mode 100644
index 000000000000..7dfbffdcbbc8
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-2.8.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+ >=virtual/jdk-1.7.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ dodir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # init type tasks
+ newconfd ext/default puppetserver
+ newinitd "${FILESDIR}/puppetserver.initd" puppetserver
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ newins ext/default gentoo.conf
+ systemd_dounit ext/redhat/puppetserver.service
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+}
+
+pkg_postinst() {
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+}
diff --git a/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..b26b41865539
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.0.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ doins jruby-9k.jar
+ doins jruby-1_7.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ dodir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # init type tasks
+ newconfd ext/default puppetserver
+ newinitd "${FILESDIR}/puppetserver.init" puppetserver
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ newins ext/default gentoo.conf
+ systemd_dounit ext/redhat/puppetserver.service
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+ elog "while read LINE"
+ elog "do"
+ elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild b/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..569321228c04
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.0.0-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ doins jruby-9k.jar
+ doins jruby-1_7.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ dodir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ systemd_dounit ext/redhat/puppetserver.service
+ insinto /etc/default
+ newins ext/default puppetserver
+ # normal init type tasks
+ dosym ../default/puppetserver /etc/conf.d/puppetserver
+ newinitd "${FILESDIR}/puppetserver.init" puppetserver
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+ elog "while read LINE"
+ elog "do"
+ elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
new file mode 100644
index 000000000000..12910813238c
--- /dev/null
+++ b/app-admin/pwcrypt/Manifest
@@ -0,0 +1,6 @@
+DIST pwcrypt-1.2.2.tar.gz 36902 SHA256 276710b34f9e66ba6b19ba43c46abaf727a28ed94bbd209a9bd28a655029c2e1 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf WHIRLPOOL db45fbd5ead3cad86735ebcbab3d7716fdb45987c1ef292bc5a538f05248ddf2ef523da5203ead01924bc55d524b74ea59b801db82d0a30e0c7b3b46a08f8965
+EBUILD pwcrypt-1.2.2-r1.ebuild 600 SHA256 ec00440312ee740dd9554ff8fa3e2736a87fe851ddefdf3a17027501b69ecfd8 SHA512 c25aec3737c58ce888455c64615cf478b4e4e868534ea0b5f4e060491c48a9789c6b9072295d98c9092301242513b737a7e200ee96c03145dd348ec0b8f98a37 WHIRLPOOL e174a62d6adb9be9ba88cc67253598bb7f50fffc832654f67a17f2159c7739190855eb9df83fdecd2f0e19b10f4e7776778496c2ea481347c2e2d299d3c4fd52
+EBUILD pwcrypt-1.2.2.ebuild 477 SHA256 991b0d64df6a07c30b27e87bf5bc33d8eeca08b5eff8aebb081502d503b7f5a3 SHA512 1c92437b27116f5e2061bc929899c39cd4ae61d97f686fc597b06dc54e5b0a28da38ae704d718a17a377e8497fb23f730f56bf87c1dee4bae783ae8d5dac3838 WHIRLPOOL 893750491c87c028f526940cdb88656c68678c35a23962d3d07ba3e1be5ed3a27a48d00cf093e370afe9c6937f10ae60b789ea2ff963972bf3b80066cbd7d888
+MISC ChangeLog 2235 SHA256 93c8158e696cd831738e9957d877df98110cd81f97ef48b442c76d30fd9ec668 SHA512 ec990360354c8e46c8661ff6e72abd92fcd82196a03677d8f658fde0738b79dc7bb787ad6591d5581a743f6a094e08a55ba25ee8ba9718876512f5ac0c955936 WHIRLPOOL 6c188bf052099fbb07a21794de8fe353d1d7a2a23fc4f95b0c4c0f182d6be6e100e9a373eb81710306ce7b5ccfa853052815b09560a6c3bc3c037fe18212027a
+MISC ChangeLog-2015 1796 SHA256 9bdd037db0138a07b44c24641a5e9270627ae3ee6c753fd5ee6519fc9138daa9 SHA512 7bc969e39c44beddbfa29e6d20e23d5c7a59bb0c77266f1ee4fccbeff44fdbdd4f7cb8f7714c16d967a0dce2097fa1be5535fd0d8925f269c85a739da043b085 WHIRLPOOL 8e441f5dca0063d1554b2eb6d9be3a4eaaf1611772d78e19813dc1ff3d912ff5f937ded604cdb6fa14a843270f42ae5fcd685c4b93ce671d8ece135c893f7d63
+MISC metadata.xml 221 SHA256 27a3fa259bbce0eb90b1fe397126b9d5ef4e906e824ae72f9ea923fff8da6d02 SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0 WHIRLPOOL e8ddaad694d5f22a229ccc3dc7597a11dce9ffd502ed3fa64b9cc760d3404c4dac31c9b9948b38b2eee0efc446a8aee52a73f87ec28d229670ba3bfc3cb9a95c
diff --git a/app-admin/pwcrypt/metadata.xml b/app-admin/pwcrypt/metadata.xml
new file mode 100644
index 000000000000..21dc8fdf43ff
--- /dev/null
+++ b/app-admin/pwcrypt/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>hattya@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..bd467dcf45c8
--- /dev/null
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
+HOMEPAGE="http://xjack.org/pwcrypt/"
+SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DOCS=( CREDITS README )
+
+src_prepare() {
+ sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
+ sed -i \
+ -e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
+ -e "/-install/s/ -s//" \
+ src/Makefile.in || die
+
+ tc-export CC
+}
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild
new file mode 100644
index 000000000000..46467862af0a
--- /dev/null
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
+HOMEPAGE="http://xjack.org/pwcrypt/"
+SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_prepare() {
+ tc-export CC
+}
+
+src_install() {
+ dobin src/pwcrypt
+ dodoc CREDITS README
+}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
new file mode 100644
index 000000000000..b23623571eda
--- /dev/null
+++ b/app-admin/pwgen/Manifest
@@ -0,0 +1,9 @@
+AUX 2.06-special-char.patch 252 SHA256 bbc3cdf4abf3bf4cc0ee1174990b3c4657a585d3393873b0991ba8aab85e2c6e SHA512 67b2fe0d146b395445cc2cfd1c7721132f3986e964edab41582f0061fc3c9ff6eee8833628230a58a9a9f4a30ad95c7b685082982d62d0e240430072baaea2b9 WHIRLPOOL 7dc36808625095bf201469dc355641eca1ed47ba93fdea1e388c1aae9e1dbf4417813f19644819c472bfd96f1c2b54abc1f793dea9d3430f1b5a855e1106b809
+AUX pwgen.rc 389 SHA256 d01d1d8df72c83abd71b238710ada0114bd58b860f46da33db9f248775b0dac9 SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d WHIRLPOOL 6e0457fe2f76fd669095afd15d9fca216a8468ddf8d8eca78f824bbe9c2955f6c80a4dbef53751eb2fe5ee7c19d18751dd49cc1d40a5d1958ca538845a749a8b
+DIST pwgen-2.07.tar.gz 53513 SHA256 eb74593f58296c21c71cd07933e070492e9222b79cedf81d1a02ce09c0e11556 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d WHIRLPOOL b1c7b543efd552ebd2db83ada501093d7ee03d6975df4a81255540b2b84817ef9b8abcf287cbc2500773987bb416946afc7104edaaa06400b76d7bc68db55469
+DIST pwgen-2.08.tar.gz 54884 SHA256 dab03dd30ad5a58e578c5581241a6e87e184a18eb2c3b2e0fffa8a9cf105c97b SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255 WHIRLPOOL 0c6044403b103a1a8e62095b35214221b7ca98ed4fd6a0e5b06860555c7acb3909079f82a67b4c7b67398bdf2e0213c3e0f8a579cfeeade93eb11bf12ae24612
+EBUILD pwgen-2.07.ebuild 699 SHA256 14231ced74fe41d594dcf8034bf5ad94cbc83770b3d16a469eac904592fa5ca7 SHA512 076cc779fff3df62668cce9fcfd58a98ce0f30fb535f1452f96233c96420f3893bb61f92d370cfded1dc49e2e32d89ba059a071db93d67d78d2ec12a65c13bc3 WHIRLPOOL 39f4b7602217bf49d0c053064fa0a1f0edb152e7f37dfae27105204730e853c81e3fd617210b0877a56732eb473abdb7c3a9ad83003859c41693be7039020fda
+EBUILD pwgen-2.08.ebuild 627 SHA256 dafe503d492896854be208bd7f7cae91bde664817f4f926e0335f4d28e4819d4 SHA512 496b99be5baf7587ac5f0effaf6d39a040cb2cfc50b3a8a812e698aa3a559f6a96c3665fa877f5373d6fbc0488697e4e18ebfbffd4bbac91b1710f89033b8b38 WHIRLPOOL 9e54186bfe38df8729fcf4d6d29b01fb85840f996be176a99424d05cee1ec1021331d56277fbf64bc86437ad047e45be64204a35baeb59f733eaf53b4cd9c070
+MISC ChangeLog 3382 SHA256 a2649d014be0aacc98c3d7b9533f1c761eb5a2d89f9aeed9ed9b0cb0ec1a2f5c SHA512 c0d073eaeab5573d43760f09bb3a503a6535bb5ce27b969ccfe39d3718e85592a3c17fd60519085cfc485c69d2fba10eb1eb37b3019a261b3756c47869ecb260 WHIRLPOOL 892028510ac40a665f8dbfc57bed0aa1fdcf78aee04250844ba018fe4a812ac91f57d0d5a43f84bc0a5da7e5fbb292a92638dff65e84230b742afe1ef0fb5588
+MISC ChangeLog-2015 9113 SHA256 a2636adf29f24199ab943d94d8e4b367e60dd08ee48503c16d4f45aad1dfd40e SHA512 3f96ad3a43fc722acc392bd31631da292974c4b9fb14ce441ee3144debc42de5b0880577915dccba0790acbc6e3a0c1cefd8f18e24232e978466e04e6f7c1d7f WHIRLPOOL 3b54141b34a40fd1536bc0ad8261268a5a6f0e0f73e30a695ef426a1e772daf82f56d2e39030dbbfef0485219f09f9bdf78bf760960bed3d2c6ab80a214221da
+MISC metadata.xml 840 SHA256 815eb7c1e6be1e4f9537ba0052b570cb7406f91d6af29b77cb5aae02d809e77c SHA512 f1ddaa129a4b819ad685a226edc557559d3e67b1ee7d32dce486f36187cc2d2458b69209810e7888388450ded2921ee787eb167ad1a1783b819d8c938f18d2ab WHIRLPOOL 2274cf64a918e5df1fff8cc5f8ef14fbf621ce384e5561c932a5e199edfbdf953ae8fe6d8b2c50bd2d96921ed4e874d65156b5b9bf51461fe90185e2ee1c3aba
diff --git a/app-admin/pwgen/files/2.06-special-char.patch b/app-admin/pwgen/files/2.06-special-char.patch
new file mode 100644
index 000000000000..3d014fa4bf11
--- /dev/null
+++ b/app-admin/pwgen/files/2.06-special-char.patch
@@ -0,0 +1,11 @@
+--- a/pwgen.c
++++ b/pwgen.c
+@@ -138,7 +138,7 @@ int main(int argc, char **argv)
+ break;
+ case 's':
+ pwgen = pw_rand;
+- pwgen_flags = PW_DIGITS | PW_UPPERS;
++ pwgen_flags |= PW_DIGITS | PW_UPPERS;
+ break;
+ case 'C':
+ do_columns = 1;
diff --git a/app-admin/pwgen/files/pwgen.rc b/app-admin/pwgen/files/pwgen.rc
new file mode 100644
index 000000000000..94c4067e2faf
--- /dev/null
+++ b/app-admin/pwgen/files/pwgen.rc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ before local
+}
+
+start() {
+ ebegin "Auto-scrambling root password for security"
+ echo root:`pwgen -s 16` | chpasswd > /dev/null 2>&1
+ eend $? "Failed to scramble root password."
+}
+
+stop() {
+ ebegin "Stopping pwgen"
+ eend $? "Failed to stop pwgen."
+}
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
new file mode 100644
index 000000000000..610641cdf301
--- /dev/null
+++ b/app-admin/pwgen/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>julian@simioni.org</email>
+ <name>Julian Simioni</name>
+ <description>Proxy-Maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="livecd">Install init script for root password scrambling on boot</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">pwgen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
new file mode 100644
index 000000000000..9df81de14409
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.07.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_prepare() {
+ epatch "${FILESDIR}"/2.06-special-char.patch
+}
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+ default
+ use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
new file mode 100644
index 000000000000..e7712ee76083
--- /dev/null
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Password Generator"
+HOMEPAGE="https://sourceforge.net/projects/pwgen/"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="livecd"
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}"/etc/pwgen
+}
+
+src_install() {
+ default
+
+ use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
+}
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
new file mode 100644
index 000000000000..f7cd038b614b
--- /dev/null
+++ b/app-admin/pydf/Manifest
@@ -0,0 +1,5 @@
+DIST pydf_12.tar.gz 14207 SHA256 860029145e42f3484fa647c42966c236d90cba0221681dbf5f48257b6c5b8c92 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0 WHIRLPOOL 0e5ac13af4ed1ecf8aa4b6c203fc7309032692c2b4dc1e029a4c8897d7430be58bf3ef7cea549e2432142586dc76b42fcb790a90cc9b61fe68ee860d720200b9
+EBUILD pydf-12-r1.ebuild 793 SHA256 7ce0fe62f538f556795c5658fd70208f86504a216a425eea2c56ba4c2cfb0df5 SHA512 7767f179a3d9faf11a67fc54b22691dec463098da1953ba16f966e2119bd923e6a1e3a53db7b355eb62f4a56d2f8aeeee299a16e76082932cbfb9293bdf37844 WHIRLPOOL be1e8f5c948ccfe8dc5f065626e78189ac7bc8a97109868b23552f85c0f0bb6af7e1aa523e8af8701227c602e8101ecc625ec7b6025ebdb395ab44f087da961e
+MISC ChangeLog 3914 SHA256 cacd40adcd653dd1b4f6c588b190af6fe343d6818667a6ff67d755f61c70fd32 SHA512 b9e8a834a331de20fc612e035c390632b126aeb7cd02702f786bceaf43f953fd4b31c44e0fca6f423002293d80a70470a03be07092b41753c20f39187ae91d20 WHIRLPOOL 9c08c916d2486c1908a3caf8d37d10018845791a498e7f8bee106de3f383941e18fef6166d401509fdf6bff7b55be1d9f4c6ba447251106789f3acafa5fe010d
+MISC ChangeLog-2015 5529 SHA256 4ed81d549558e9fc943ef0b9a3dbbd106420f8616e8e172db0f803743bf359a5 SHA512 db9a4fae2a4503401677dfc3c2c1e581f86361cc673ad067e0266b7af2335418c9d033a6bd25970d6d21f6714d28d88894cc3a7d37ae95225bcc26f692caaa5e WHIRLPOOL ceb84d163976e4ad77443e60aa438bd815558b187255596c663a0b820bbdee364792d4e3ef122a1ccfd98f5777989d92e201dde521ec148b644e0d4b4e5621e5
+MISC metadata.xml 251 SHA256 65fefc8f357a2115f90604fc64897190bd846e558d3e81cda31e1f435817e2a8 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da WHIRLPOOL dd811640d6aea5a34e2768fd7ffad5e505ef6a4bd4b22949d2c736016ab6d0175beb01d11308abe16125abb0d98c6c85a88fd218c78064f23b42beb2fbadd2f3
diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml
new file mode 100644
index 000000000000..58c1077b82e4
--- /dev/null
+++ b/app-admin/pydf/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>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
new file mode 100644
index 000000000000..363b2db7d70f
--- /dev/null
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -0,0 +1,36 @@
+# 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 python-r1
+
+DESCRIPTION="Enhanced df with colors"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~arm64 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+src_prepare() {
+ default
+ sed -i -e "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:" "${PN}" || die
+}
+
+src_install() {
+ python_foreach_impl python_doscript "${PN}"
+ insinto /etc
+ doins "${PN}rc"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
new file mode 100644
index 000000000000..96b56f087190
--- /dev/null
+++ b/app-admin/python-updater/Manifest
@@ -0,0 +1,6 @@
+DIST python-updater-0.14.tar.bz2 10354 SHA256 78b8a8680ef2a64baf2e1a3624694967ea119109f9c171106b93e02661f3ba4a SHA512 6d5589326a1dc1cb83c42a0d1cdadce4e33ee25a1699e93475d5167666f06fda900822fa3f5657c473999860a36cfb6f6dd1312b66695e47ad3035404e26b9db WHIRLPOOL 6d839525fabdf19f8fc729bc341cb13bfdec2a5f96eff9524ea8af018987c86d284aa7a52a6c1f32aac34403f0fef47a9a7e6963b91282529bc30997c6d2666b
+EBUILD python-updater-0.14.ebuild 1064 SHA256 4a3f8c031420c711ef563762c112a5993c1bf4ea15d238e46199c5d1017ed754 SHA512 fc62c55e1e3d099be2000ae59c1a1f315b6b0e1709a77717f557cfb09e70de9a94656d373820023b605c418be99d92211e5cda72638835d8a50bc94d09112c85 WHIRLPOOL 408b72b77e7cc3405452b53cd48a9d97508be9b579f4516ec38c06aed83f5a97400b61485d9b5bb44dcaf683fdf6f0b4b91e1db990faf4537d689ecdfef79944
+EBUILD python-updater-9999.ebuild 926 SHA256 84f97d37e95fe67260d4bd6cfbf4e2687e1fef300b76a91be705b2e7f3217470 SHA512 aa89856534e7ce4993a44b7ef4bc0f41d3e478b8cb6df919c505556ed7778255ed7610648312ef264faf979a8803ea58adb545f22f8f9d2cfcdde8849725d83e WHIRLPOOL a991c011e6ec61a48e7db035d15e232e450be2791673c481e53aa50a3f91a13b30ebd2cf56a3705aa29587810bde5fba2b474aaf4f300eca1ea94660180d3cb0
+MISC ChangeLog 5057 SHA256 a0d529204a8bd3bc6087983dd733a298a42635495fb5b7a83fd298c080a78d7f SHA512 7a7e2824dfcc42fac42c8d93ef24e2d42a2df1e94bfaf18d44113d2a25975ce16f885d7f72ad641f7f52fb01710a8b0c5d2a8b84b90f175798bcf1e0a59f4134 WHIRLPOOL 6878308417ae36ff01c9dd3851e8bd4826b3ae3e9b571cc11aa4050f341a6c0e0cc8d3c0f7b93572a56ff4973fdb35d477c81766c5258e51eeba6beddc8f45f8
+MISC ChangeLog-2015 13308 SHA256 0f01ea2ccccf360f53458908d18ab104669427bac6c132abb4990a718f1b32cf SHA512 40a06e66699d1df0a16a3e70c6a22e97f8e21583065de6e11e2fd654859dff2b28489c0f4354565499a0445f81ca8510cf1ce6b5bbccb5ee333985e84f87d809 WHIRLPOOL 41514a89d4708d708403f22e04c4c3fb5c1c538afdef1b5a848c50fe81385d12706631adfcfb41ade2649bb31b0013a3478650123bc6f0cdf6fb11e3a49e2f41
+MISC metadata.xml 236 SHA256 4709fa7f17a11d5eae6dd884b488d3c6eb8f85e9b63fe3684b4f234d3b9b14a9 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3 WHIRLPOOL d73790bb41c2cefb5e2f7b163fc95a79b9674d9808ca34cef58fbc8c5a765023a0be285508a2e7f5f70eadc5725cf8d63553d599e4b367f52fac3374de347abb
diff --git a/app-admin/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
new file mode 100644
index 000000000000..9e5274c5b4ae
--- /dev/null
+++ b/app-admin/python-updater/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>python@gentoo.org</email>
+ <name>Python</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/python-updater/python-updater-0.14.ebuild b/app-admin/python-updater/python-updater-0.14.ebuild
new file mode 100644
index 000000000000..73a56953cebd
--- /dev/null
+++ b/app-admin/python-updater/python-updater-0.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing active Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND="
+ sys-apps/gentoo-functions
+ sys-apps/help2man
+ "
+fi
+RDEPEND="
+ sys-apps/gentoo-functions
+ || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
+"
+
+src_compile() {
+ [[ ${PV} == 9999 ]] && emake python-updater
+ default
+}
diff --git a/app-admin/python-updater/python-updater-9999.ebuild b/app-admin/python-updater/python-updater-9999.ebuild
new file mode 100644
index 000000000000..8e2df7dfc60b
--- /dev/null
+++ b/app-admin/python-updater/python-updater-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing active Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND="
+ sys-apps/gentoo-functions
+ sys-apps/help2man
+ "
+fi
+RDEPEND="
+ sys-apps/gentoo-functions
+ || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
+"
+
+src_compile() {
+ [[ ${PV} == 9999 ]] && emake python-updater
+ default
+}
diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest
new file mode 100644
index 000000000000..c2444e9ee503
--- /dev/null
+++ b/app-admin/qpage/Manifest
@@ -0,0 +1,8 @@
+AUX qpage 568 SHA256 5cb20ac629427c42af8a4a5d57e072f4f72d836ce594df6ec97cba3a0fa14396 SHA512 3153cab39730cf1173a1cdb3fa61dead6f767650427b03e7f69173969272eda683fb9aee79b69b1bb879f3c6a30266d6842ceb7f438c09806e35886d923832b4 WHIRLPOOL 01708ee0242ebea6fdd6c1f38176bb037214e4431deefdf1631d0ef721c16374f7bd9ec2da923a90eb18eb4b12a852ff6a28e6324a3e0bfd3a62561f249aabdd
+AUX qpage-3.3-fix-warning.patch 450 SHA256 3a6f2ae761c617452d0ccf9758922dee0f096bcec1a4af70af49c16531ef1740 SHA512 c2b0ad552ff60471171693eca90e51470072c73961bf30406e59c7929f02f093d754d5f1e278a43e0aac8d1031dafcbd085b0b59a1d9634f6f631c2a84e7a7c1 WHIRLPOOL 71790fb7248d879be1848130866b79bfc505a0478b3d52b7b7c9e10acbd474b4fda3517957ee8fbf6486937f438248419ee5e802e72cf870f7e5f3137a443f02
+AUX qpage-3.3-gentoo.patch 1764 SHA256 2598701418487cbb1b216f047ed0dde4d9596858590e364f35ec1cffd634b01b SHA512 5bdcab57907871dabd1b4beca928fe30bad1729a5185c5885f6c3252b0e3a5394fe0bf5d4f206438d9d83a608669d0a73bb9dea7c9b94c48dbef77e4331e60a8 WHIRLPOOL 949a4d10d37493c2279e82835b68557f4ffe4fc9363b77b7bb5cd776a3eec7cd76108f5b5153f8667f85b21da0947439816271b74d2b85aa0eedef80ed7a5f4c
+DIST qpage-3.3.tar.Z 225689 SHA256 0bbecd2908380c5d28b8beeee0d0238854162128db5ef4ea603614d52ee7d24c SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9 WHIRLPOOL 2a1ed78e6f25a07e872848cb75c82111f6c80ae4b03714ff5f7a872a33788da58d2cd1a14d127e4f17503939e0d640a6a43cc0d5adf83f8616d927da16cfe9fc
+EBUILD qpage-3.3.ebuild 1674 SHA256 3e38f2532669a8f192927d6ed6b243409532fea954b655a4bea3e63f74e763e4 SHA512 b83c8a54ec808a662a52d530ce9e64a81196ace477476f689591eacaff7a4dcbf5eed98081d05045b0b796fca32d2bc06f5cb7c53aff6c32d48344b75ed1e598 WHIRLPOOL 3a97e85d1a6306b01e15f094aab16fe096e05c954d2f5e609ca1a98264b9a163be9f0109d29f5baa491861c27d8240adede50a94a76550009738c6a423c232dd
+MISC ChangeLog 2372 SHA256 c41126a094db04867944c1569556dda62753dbfe41fbcd9a1246f9b7e2ac46b5 SHA512 69e47ceaef325555598cb3f31903836a3d06f1bb1e43e5329902f59dd3752c4a5bc2db7bb19a302456b2c984dd34bd5d8dbdf40ec8df01c9c8bc8249a41bb799 WHIRLPOOL 2898631321368ba678fc121545b3a4c682deaef6dd5378a4d0f6ade8f7f0e7233db4e772c28ebf8c8f215ee6ec5447a8b4f629095e47cd94cf61f08199d46a54
+MISC ChangeLog-2015 2108 SHA256 69c55360c2b7c6c0bf6caf28d87d02cf0342a0ab19987aafd627d7e0c50bd7ff SHA512 352b286f4e456bed765ff319e16b533fc8af2daf9111aeca4228b45521820f8e71eecc7411d092b8e9bca94ef6b9a22ee371ca70019b016e95a190155de1d4ca WHIRLPOOL 108f6ad3713826dcc619e447bfe541aa40b7922fc8c01072b03e5ed6d4d09e9dbb2ae8f73934ae36064d8a6f0026ee976cd32b4d9266bd1b0d3b0b3d5bedc216
+MISC metadata.xml 620 SHA256 12b20b0e334995c2356e6d2ab9f20f6704b19bb5aba8ac1ab02fd744dd2ad7e6 SHA512 4310087f97f28aa193b9bb365612f32f6c3bd995446ce077bd099d662d1c0deda1b17418e4e2c0d89f3d53e9badd7c5aef946218fad43db1a273c7f67f444ca1 WHIRLPOOL 1a65f8de52534c3f45b01e980f278d6435d8a1561f95386a598dd5abd85ca0ad9a05e9fba5b8c2c2c804720900e2f192d05344d4a916d6e7b2e6ae1882258e58
diff --git a/app-admin/qpage/files/qpage b/app-admin/qpage/files/qpage
new file mode 100644
index 000000000000..81ffe86d9950
--- /dev/null
+++ b/app-admin/qpage/files/qpage
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ if [ ! -e /etc/qpage/qpage.cf ] ; then
+ eerror "You need a /etc/qpage/qpage.cf file first."
+ eerror "There is a sample file in /etc/qpage/."
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting qpage"
+ start-stop-daemon --start --quiet --exec /usr/bin/qpage -- -q 10
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping qpage"
+ start-stop-daemon --stop --quiet --exec /usr/bin/qpage
+ eend $?
+}
diff --git a/app-admin/qpage/files/qpage-3.3-fix-warning.patch b/app-admin/qpage/files/qpage-3.3-fix-warning.patch
new file mode 100644
index 000000000000..722677648250
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-fix-warning.patch
@@ -0,0 +1,12 @@
+diff -urN qpage-3.3.orig/srvrsnpp.c qpage-3.3/srvrsnpp.c
+--- qpage-3.3.orig/srvrsnpp.c 1998-10-25 14:55:05.000000000 -0500
++++ qpage-3.3/srvrsnpp.c 2006-01-25 15:49:57.000000000 -0500
+@@ -1061,7 +1061,7 @@
+ if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
+ p->ident = strdup(ptr);
+
+- ptr = eval_hostinfo(&request.client);
++ ptr = eval_hostinfo(&request.client[0]);
+
+ if (ptr && strcmp(ptr, STRING_UNKNOWN) != 0)
+ p->hostname = strdup(ptr);
diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch b/app-admin/qpage/files/qpage-3.3-gentoo.patch
new file mode 100644
index 000000000000..577fb8a4ff3b
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch
@@ -0,0 +1,72 @@
+--- config.input.dist 2003-04-11 14:03:36.000000000 -0700
++++ config.input 2003-04-11 14:05:47.000000000 -0700
+@@ -20,7 +20,7 @@
+ # See the QuickPage documentation for complete details about
+ # the syntax of the configuration file.
+ #
+-QPAGE_CONFIG="/etc/qpage.cf"
++QPAGE_CONFIG="/etc/qpage/qpage.cf"
+
+
+ #
+@@ -41,7 +41,7 @@
+ # copies of the configuration file. Only one filename
+ # may be specified.
+ #
+-SNPP_SERVER_FILE="/etc/qpage.servers"
++SNPP_SERVER_FILE="/etc/qpage/qpage.servers"
+
+
+ #
+--- qpage.man.dist 2003-04-18 14:43:45.000000000 -0700
++++ qpage.man 2003-04-18 14:43:55.000000000 -0700
+@@ -867,7 +867,7 @@
+ must be able to detect when it's safe to send dial commands to the modem.
+ .LP
+ .SH FILES
+-/etc/qpage.cf
++/etc/qpage/qpage.cf
+ .SH SEE ALSO
+ .B RFC-1861
+ .SH KNOWN BUGS
+--- example.cf.dist 2003-04-25 09:55:47.000000000 -0700
++++ example.cf 2003-04-25 10:55:11.000000000 -0700
+@@ -21,7 +21,7 @@
+ #
+ # modem=<modem name>
+ # text=<optional text, no whitespace allowed>
+-# device=<modem device e.g. /dev/ttya>
++# device=<modem device e.g. /dev/tts/0>
+ # initcmd=<modem initialization command>
+ # dialcmd=<modem dial command not including phone number>
+ #
+@@ -64,14 +64,15 @@
+
+ queuedir=/var/spool/qpage
+
++lockdir=/var/lock/subsys/qpage
++
+ identtimeout=5
+ snpptimeout=60
+
+-modem=ttya device=/dev/cua/a
+-modem=ttyb device=/dev/cua/b
++modem=ttyS0 device=/dev/tts/0
+
+ service=default
+- device=ttya,ttyb
++ device=ttyS0
+ baudrate=1200
+ parity=even
+ allowpid=yes
+--- ixo.c.dist 2003-04-25 11:36:30.000000000 -0700
++++ ixo.c 2003-04-25 11:37:37.000000000 -0700
+@@ -192,7 +192,7 @@
+ if ((i = read_modem(fd, seconds)) < 0)
+ return(NULL);
+
+- if (i == '\r') {
++ if (i == '\r' || i == '\n') {
+ *ptr = '\0';
+ got_full_packet++;
+ }
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml
new file mode 100644
index 000000000000..f61b7216e28c
--- /dev/null
+++ b/app-admin/qpage/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>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+</maintainer>
+<longdescription lang="en">
+QuickPage is a client/server software package that enables you to send messages
+to an alphanumeric pager. The client accepts a message from the user and
+forwards it to a server using SNPP. The server uses a modem to transmit the
+message to the recipient's paging service using the TAP protocol (also known as
+the IXO protocol).
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
new file mode 100644
index 000000000000..01cddbc87320
--- /dev/null
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol"
+HOMEPAGE="http://www.qpage.org/"
+SRC_URI="http://www.qpage.org/download/${P}.tar.Z"
+
+LICENSE="qpage"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+IUSE="tcpd"
+
+DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+ virtual/mta"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-fix-warning.patch
+}
+
+src_compile() {
+ tc-export CC
+ econf || die "econf failed"
+
+ # There doesn't seem to be a clean way to disable tcp wrappers in
+ # this package if you have it installed, but don't want to use it.
+ if ! use tcpd ; then
+ sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile
+ echo '#undef TCP_WRAPPERS' >> config.h
+ fi
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ einstall || die "einstall failed"
+
+ dodir /var/spool/qpage
+ fowners daemon:daemon /var/spool/qpage
+ fperms 770 /var/spool/qpage
+
+ dodir /var/lock/subsys/qpage
+ fowners daemon:daemon /var/lock/subsys/qpage
+ fperms 770 /var/lock/subsys/qpage
+
+ insinto /etc/qpage
+ doins example.cf || die "doins example.cf failed"
+
+ doinitd "${FILESDIR}"/qpage
+}
+
+pkg_postinst() {
+ elog
+ elog "Post-installation tasks:"
+ elog
+ elog "1. Create /etc/qpage/qpage.cf (see example.cf in that dir)."
+ elog "2. Insure that the serial port selected in qpage.cf"
+ elog " is writable by user or group daemon."
+ elog "3. Set automatic startup with rc-update add qpage default"
+ elog "4. Send mail to tomiii@qpage.org telling him how"
+ elog " you like qpage! :-)"
+ elog
+}
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
new file mode 100644
index 000000000000..4364ad6a89ba
--- /dev/null
+++ b/app-admin/qtpass/Manifest
@@ -0,0 +1,5 @@
+DIST qtpass-1.1.6.tar.gz 325329 SHA256 d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b SHA512 64d712a33df97b04ab1a9d5472aa7fa567e38e31ff7ba297e567d087a3f32b1c59097b339cdd4f568efc2bce16b93f2d2316e94d2605b6abac299d7cf7d0c3df WHIRLPOOL 931380ddc0c245cf217ce4b96b57ff4960edd504e12273e7567c1128e4c3512993dc2517d7fc10d3c059abf79843fc48538eb036ff802b46ee7ba6acdee35fb2
+EBUILD qtpass-1.1.6.ebuild 836 SHA256 9e49563b35fcccbf1483dc76a6c7b97f09373201c990a3906f5dbeacbb5a481c SHA512 b928a3be74e020b6397e78c97d7573830aaea0468329f0b410490ab3d0680a6bb717ba11ff05aaa0f603e441561f970c944a934317db8b6350cd1e36da062c05 WHIRLPOOL 64ed603d43dd2dffda4c81bd3022f34cda66843b85393e4acfee05fb9e3814ef34041d76de6c1778ad51c796648b799b13e7e9625514c025ad6873d41a35de83
+EBUILD qtpass-9999.ebuild 761 SHA256 22da3f14203fb25ca47c77241c1666e296d911cc7d9656302131a7f5517fd5c9 SHA512 351ce80ec7d8116e0f3b970d54d1ae59bcfef2ee24ba14ed61cae44e140c8b59c882b531afdb00552c3151eedb1e53052fca9f9fb1b0aa12b851ae1f09a3776b WHIRLPOOL 5ff9547bba6e26ae1ebeee544ce4b6a73dac047841b84dacf885719e73661143ae37b47f2f90a7ffc3befa5fbce5bef2d49889456655a7405269536459de3746
+MISC ChangeLog 2518 SHA256 822deb00f61e6d5cb47a7856e0ab6e49252c0d8f64602b8fbde3cdca1bb5c5de SHA512 cb55c7f24084e41dcaf9aeb7fd301a189a99d5d8542baeac3bc4848d2072fa71516072733f2e7d4178fc0c1a49f662a6338c635121fdb026822e4c4e9efd1682 WHIRLPOOL 2ce26d4539baee6389e4e29248fd95bdd4735226e8f174e9d17c2dd4307a4f02b8b8a9e33d0b6460fb0bcd7231dccdba88fba41f3f8cfb37052d0c7d592a65c9
+MISC metadata.xml 571 SHA256 65db9b76a9b2fb2391535e5c430c8fb0400f0e99baadf7ec64a366874df035a8 SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae WHIRLPOOL ecf00d79dc1e58f03b552ee44eef54e61cedaa8b369d374f5b61988a9f4e82b2c7950352200379ebba8082c4a9f9a69b47e287e0f58b4b9dbe1742ab47b5e793
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
new file mode 100644
index 000000000000..e85fad13c2a6
--- /dev/null
+++ b/app-admin/qtpass/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>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>
+ QtPass is a multi-platform GUI for pass, the standard unix password manager.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">IJHack/qtpass</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/qtpass/qtpass-1.1.6.ebuild b/app-admin/qtpass/qtpass-1.1.6.ebuild
new file mode 100644
index 000000000000..67195457fc95
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.1.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="QtPass-${PV}"
+
+inherit qmake-utils
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DOCS=( FAQ.md README.md CONTRIBUTING.md )
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="app-admin/pass
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[xcb]
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+src_configure() {
+ eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+ default
+
+ doman ${PN}.1
+
+ insinto /usr/share/applications
+ doins "${PN}.desktop"
+
+ newicon artwork/icon.svg "${PN}-icon.svg"
+}
diff --git a/app-admin/qtpass/qtpass-9999.ebuild b/app-admin/qtpass/qtpass-9999.ebuild
new file mode 100644
index 000000000000..8da3eb46f11f
--- /dev/null
+++ b/app-admin/qtpass/qtpass-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils git-r3
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+EGIT_REPO_URI="https://github.com/IJHack/${PN}.git"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+DOCS=( FAQ.md README.md CONTRIBUTING.md )
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5[xcb]
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5
+ app-admin/pass
+ net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+src_configure() {
+ eqmake5 PREFIX="${D}"/usr
+}
+
+src_install() {
+ default
+
+ doman ${PN}.1
+
+ insinto /usr/share/applications
+ doins "${PN}.desktop"
+
+ newicon artwork/icon.svg "${PN}-icon.svg"
+}
diff --git a/app-admin/quickswitch/Manifest b/app-admin/quickswitch/Manifest
new file mode 100644
index 000000000000..441d7a707465
--- /dev/null
+++ b/app-admin/quickswitch/Manifest
@@ -0,0 +1,5 @@
+DIST quickswitch-1.05.tar.gz 20218 SHA256 88dc6cff47fc9555064bd368bed8aad6d817a885743775b99ef9fe2c90b7f29e SHA512 dfb6b952e06d03834b22ad1abe415499bc3f231dcfee0b551ceadc4c020604b2574b70fff03ffb7099913d77e49c545ee44d51f9f7651c4fba113b0503c3bd26 WHIRLPOOL b3284add168e12941e78a872f27a9cae19700df6448427aa023a8f41025e97ff7a59cd95ffe97d652dc274d212b336f5dbcb9047ce2f6a52798880ef5e78238f
+EBUILD quickswitch-1.05.ebuild 1055 SHA256 a6e14b0cc4f1691e0ee807f6f3b278beef9edad415a122c6f59755c9aa9cef8d SHA512 b4e92d4b4f036148e8374e364e13b666d308a27c7146ed574b6859ab3eef103f0d615960e07390a7535ef22eacabbc93eae753bf6c865c09417a6f8cbd0fbde4 WHIRLPOOL 0a83e7c0a94dbf92d49c6228b6bd0da14374254942f01edcf2ee5eeca6067bac15197fd29982c2dbd7fc1e4e047c5f81fb59b3ef242c6231ebbde8dec218fdb6
+MISC ChangeLog 2533 SHA256 884a5955798ec8796e9911305c9ef214aa57e6bfacdc8164dcc96a0410837d6b SHA512 a7fd8cdb33bb7d2ee31c4e1513211b0ce42794e376a47ae7a4bfb6ea8e98bb5b06a2654cd499ccd16a2aca1bf7408d0cdb0f3fa57ddb68790bcaafba965b3f5f WHIRLPOOL 7de327e23d2b7c6df1364d45a9747c7423ca04ecbcb6e29dbd12bfad775ee4b2ee3ba6d80726aeeaa3e7aac9f66e754901b1d09481ef5b16f407172d155d1bcd
+MISC ChangeLog-2015 3402 SHA256 243798858b4692e7359437ea5d6cab3531516588ab06a35fb3043c3ab2a77493 SHA512 253de813eba135822024f51c2b2e17cfcbd75586a4e04cd2758ecc884e257888d9cd4c7c93dac5dff396df2bc742446ef4934367d37631d4520d82b254b45bb1 WHIRLPOOL f29bfbd5c553adb503849edac24ab5bc53195cbf43f72183b7ea0e3e578a839181e96b62c759a526e58bd78b9fe9f48fd7174d0bebc65fa7bc3b19b976dfff4d
+MISC metadata.xml 377 SHA256 96c917510f4ecdf046985096725e87142224a13adacdd406e8eefbef36418549 SHA512 05f90b3b4a18647e32f7c3f3029822fefb7aef4cbdbd2f6e74a8f2799e5a42f7f5546307c792aa4bf366536b4d7c1eeef6b4cc1a6b4d6f84d0ac16e5e77a8c88 WHIRLPOOL 619fa750f287bbb2c5f93b469a962c5143b55896fd3b8d429e6a2675baa5a1aa9684031daf5be44c0589acbad266abc57fc833f8ab53f60d72ad4181084bd737
diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
new file mode 100644
index 000000000000..5438d3107a0d
--- /dev/null
+++ b/app-admin/quickswitch/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>A utility for linux laptop users to use multiple network
+ profiles, and switch effortlessly.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">quickswitch</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
new file mode 100644
index 000000000000..ab9f3d539ebe
--- /dev/null
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE="ncurses"
+
+DESCRIPTION="Utility to switch network profiles on the fly"
+SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz"
+HOMEPAGE="http://quickswitch.sf.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc s390 amd64"
+
+DEPEND=">=dev-lang/perl-5.6.0"
+RDEPEND="ncurses? ( dev-perl/CursesWidgets )"
+
+src_install() {
+ dobin switchto
+ dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
+ /usr/bin/switchto
+ dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
+ /usr/bin/switchto
+ if use ncurses; then
+ dobin switcher
+ dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
+ /usr/bin/switcher
+ fi
+
+ dodir /etc/quickswitch
+ insinto /etc/quickswitch
+ newins switchto.conf switchto.conf.sample
+
+ dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
+ /etc/quickswitch/switchto.conf.sample
+ dosed "s:/usr/local/sbin/iwconfig:/sbin/iwconfig:" \
+ /etc/quickswitch/switchto.conf.sample
+ dodoc README
+}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
new file mode 100644
index 000000000000..73eefbda5ad3
--- /dev/null
+++ b/app-admin/r10k/Manifest
@@ -0,0 +1,7 @@
+DIST r10k-1.5.1.gem 164864 SHA256 4dd4edfb1b69400324780784bf214a80bec3d0dbd46bc94113683904d503fdb0 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd WHIRLPOOL b8a3a49857bc97e4b1529c4a8f33ace1e6c1cca270bd4be3669494568bbc9a0b85e15419103bbb63622aadd3ad1453e11ae63b85b9c86a67d013962f4d7b2761
+EBUILD r10k-1.5.1-r1.ebuild 2102 SHA256 4b5400b410c34cd117f4e7a142a82618070bf18fd00bfad66183792f8281c4e1 SHA512 2243cf8da5001705005ba71b871f10be7a4b48a535e9164ed365597a76150548057591b3c067de9c188840e26239cc4f9479394b0120f80753f983c6d2455d77 WHIRLPOOL efaad55bb5cfe02ae3bbbb4e392750df51655c13900515af7920166b303f9a486140e0c422dbebe91de635b5cd47212fb8410d2283f1bf45c71cb82375c441ac
+EBUILD r10k-1.5.1-r2.ebuild 2137 SHA256 65369f6cbbb3fbd0546a51d943e8acad7996a63c626a8d29b8c8d667da8867c5 SHA512 155b09735b2ee73219dba88d4a6ab310b0ab388fb0bc654403432d62d1342187bef43a846fdadeb75c15b28f0293cabd1823108cdbc9d4d8fea1de884680f3e3 WHIRLPOOL ac936457432933ca1a850a1b6f696272f4697b806481764181bc0218b6de4d8487db4577f9283f613e45f8a0a78f07d9b758461b42173aa8f9b9a28f432a5627
+EBUILD r10k-1.5.1.ebuild 1999 SHA256 77d0dfb1ea37716ae28ed1f114cd222f7fd5f70180d9a591990127946693c8fc SHA512 f415641c86940aea7352ecbedcf72ecc885c2dd30b55f63cea2e361bfa8d41889442576ea09434317d8f0b25cd66cc28e1d5edf1d10c55aeedfe0301632e1cc3 WHIRLPOOL e2c690fb68bdef40f0aecf0bb6be584462e64573d88a9321873f40f985aa9c788478026c77a5e944cff6fc9ee891e31f88d5d9ebe59096f83d471cc52addf82c
+MISC ChangeLog 3303 SHA256 c3b0bd2cbeaf6fc66b8a33f6b6e453cf48c493412fe75762d1a1ac5e88b880f4 SHA512 d6b492513eac975680adb347cdc8f441d5e0ecca9d8dd4b2abbb6846a61a3ba80e0a78447f499783f23ea8c9a137cfb870acd57f847d65beda351f4f1a5f41cd WHIRLPOOL ccadfcb2d7ea70d717c1ec59af85006550f9861b6cd439edc072e69bb7a3e643327779fb5de341c9544c8fe0442d1029827bda2a652d164737b2ed2538d9cf03
+MISC ChangeLog-2015 1752 SHA256 31ca2e59c9129e814718d071ac6d2a031dbe0ca9c90cec5d254156259be89418 SHA512 22623910ce2ff77aa3aef26ca33d88c83e10581699e9c398edd30500186a961d3a7ee08090c6f8ffbc87167d90c5c74be9d32245d9c553b2a3d5c7a76dc2162d WHIRLPOOL 9a786e691d852d24d0620d688bd524dda523968425c7ba38e1d200a41b18e676cec63efcb7c577d157a4c3413c337141e2baa252a5680daf1e1c5dcea5cb6848
+MISC metadata.xml 716 SHA256 750c9544b474ca3fe477aa2603721be1cebaa503efbec8d07f337834da589397 SHA512 dcb7d5bf881b671b11c531a9a79c3c930b3e3e70f45fe14a1d1cc972e632086a8206324abda1fbbeeaf363c0b6a9b9039cdc532e2e6b1482bc8a3a408012466a WHIRLPOOL 61548ec8a71d6238d0fb647858df33c7633fea8c3059aafd590ad0f0da696755fe3a04a95f42055c71c271620101529cfcc4cd2c3ebf5fe0158b7ddcd968790b
diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
new file mode 100644
index 000000000000..6a0cd60479a1
--- /dev/null
+++ b/app-admin/r10k/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>vikraman@gentoo.org</email>
+ <name>Vikraman Choudhury</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">adrienthebo/r10k</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..5d19a50800da
--- /dev/null
+++ b/app-admin/r10k/r10k-1.5.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/adrienthebo/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+ >=dev-ruby/colored-1.2
+ =dev-ruby/cri-2.7*
+ >=dev-ruby/systemu-2.5.2
+ >=dev-ruby/log4r-1.1.10
+ >=dev-ruby/faraday-0.9.0
+ >=dev-ruby/faraday_middleware-0.9.0
+ >=dev-ruby/faraday_middleware-multi_json-0.0.6
+ >=dev-ruby/multi_json-1.10
+ >=dev-ruby/semantic_puppet-0.1.1
+ >=dev-ruby/json-1.8:0"
+
+ruby_add_bdepend "test? (
+ dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+ sed -i -e 's/json_pure/json/' \
+ -e '/cri/ s/2\.6\../2.7/' \
+ -e '/systemu/ s/2.5.2/2.5/' \
+ -e '/faraday/ s/0.9.0/0.9/' \
+ -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
+ ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
+ ewarn
+ ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+ ewarn "for environments to be prefixed with the source name so that multiple sources"
+ ewarn "installed into the same directory would not overwrite each other. However"
+ ewarn "prefixing was automatically enabled and would break existing setups where"
+ ewarn "multiple sources were cloned into different directories."
+ ewarn
+ ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
+ ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
+ ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
+ ewarn "to enable prefixing on a per-source basis."
+ ewarn
+ ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+ ewarn "information."
+}
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild b/app-admin/r10k/r10k-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..4ca3d11a8025
--- /dev/null
+++ b/app-admin/r10k/r10k-1.5.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/adrienthebo/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+ >=dev-ruby/colored-1.2
+ =dev-ruby/cri-2.7*
+ >=dev-ruby/systemu-2.5.2
+ >=dev-ruby/log4r-1.1.10
+ >=dev-ruby/faraday-0.9.0
+ >=dev-ruby/faraday_middleware-0.9.0
+ >=dev-ruby/faraday_middleware-multi_json-0.0.6
+ >=dev-ruby/multi_json-1.10
+ >=dev-ruby/semantic_puppet-0.1.1
+ >=dev-ruby/json-1.8:0"
+
+ruby_add_bdepend "test? (
+ dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+ sed -i -e 's/json_pure/json/' \
+ -e '/cri/ s/2\.6\../2.7/' \
+ -e '/systemu/ s/2.5.2/2.5/' \
+ -e '/faraday/ s/0.9.0/0.9/' \
+ -e '/semantic_puppet/ s/~>/>/' \
+ -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
+ ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
+ ewarn
+ ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+ ewarn "for environments to be prefixed with the source name so that multiple sources"
+ ewarn "installed into the same directory would not overwrite each other. However"
+ ewarn "prefixing was automatically enabled and would break existing setups where"
+ ewarn "multiple sources were cloned into different directories."
+ ewarn
+ ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
+ ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
+ ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
+ ewarn "to enable prefixing on a per-source basis."
+ ewarn
+ ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+ ewarn "information."
+}
diff --git a/app-admin/r10k/r10k-1.5.1.ebuild b/app-admin/r10k/r10k-1.5.1.ebuild
new file mode 100644
index 000000000000..79ba3681ff20
--- /dev/null
+++ b/app-admin/r10k/r10k-1.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/adrienthebo/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+git"
+
+ruby_add_rdepend "
+ >=dev-ruby/colored-1.2
+ =dev-ruby/cri-2.7*
+ >=dev-ruby/systemu-2.5.2
+ >=dev-ruby/log4r-1.1.10
+ >=dev-ruby/faraday-0.9.0
+ >=dev-ruby/faraday_middleware-0.9.0
+ >=dev-ruby/faraday_middleware-multi_json-0.0.6
+ >=dev-ruby/multi_json-1.10
+ >=dev-ruby/semantic_puppet-0.1.1
+ dev-ruby/json"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+ sed -i -e 's/json_pure/json/' \
+ -e '/cri/ s/2\.6\../2.7/' \
+ -e '/systemu/ s/2.5.2/2.5/' \
+ -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
+ ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
+ ewarn
+ ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+ ewarn "for environments to be prefixed with the source name so that multiple sources"
+ ewarn "installed into the same directory would not overwrite each other. However"
+ ewarn "prefixing was automatically enabled and would break existing setups where"
+ ewarn "multiple sources were cloned into different directories."
+ ewarn
+ ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
+ ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
+ ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
+ ewarn "to enable prefixing on a per-source basis."
+ ewarn
+ ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+ ewarn "information."
+}
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
new file mode 100644
index 000000000000..f04e1368d5c6
--- /dev/null
+++ b/app-admin/radmind/Manifest
@@ -0,0 +1,8 @@
+AUX radmind-1.14.0-parallel-make.patch 1447 SHA256 53d4006c3c97e56be49d8309186747b133fd4a9449e3cfa409f48d6451f70187 SHA512 6fc839a6a626dd4a3366fc85b185f4f0e944e21a8ad3ab4763f290d15c0ed8dbba3919f19f74f7b2a9e59709b017c6ec9e9c2baab7b31b24fc4c212e3b504c4a WHIRLPOOL bef62979bb6b28fd6199e84268a87595944f9049fc9c6bd70b713b48094ac3db1a4c53902eb85b246c8b793ce3a603dbe686a81a315d6d8d45b3b0ccf859a556
+AUX radmind-1.7.0-gentoo.patch 850 SHA256 3d95b99e1356b0192a8fafa316bbcdb78316e3567c71de2eb613954a1e89ca83 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72 WHIRLPOOL 09def013235dbb83035f1d09168c9bcb073f55fc99b502e1d92e007105ea18d7b31a5873725c7d0f45c581bfe633fa585e7a9328f8cb51f8d433e521ea8d9d28
+AUX radmind-1.7.1-dnssd.patch 493 SHA256 15a25cadfad39c20b835a1675e4f839e6ed796b93c03f3a27544de1ff7dae388 SHA512 95577070b42d8abc754c1ae235a8d40bd15acbea71b560a8defd69f2becf8c89b592420d872b93409eb142731b7ea0a5180394218ed440d7d633a6e004b7aaa7 WHIRLPOOL 3155c5c90b3424d82a393234818525718b33b7f3ab6525133afe274bf6f361fb62053721602695243769adf927ab1eaeb29471ff4b110fd56b94f93d71aa228f
+DIST radmind-1.14.1.tar.gz 403553 SHA256 92ce3d586245b107bf4e412b59eb02ec3e57b4d12a0b9a16b0fadf10983ed21f SHA512 bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb WHIRLPOOL ed00a477ec5b35621a2568fba8c2c7913d6f9c18165b13d1405b5a7d5fd8fe0ce89c19f639df5bccbeee3849213d9afa4a3d2eaf58ff461ca35395c30d3a929a
+EBUILD radmind-1.14.1-r1.ebuild 761 SHA256 505d98b7ce0d6acb1f1c5fc24b61de2ab888257d1f859253c6a2de979be9bbb7 SHA512 7b96af94c6a7e7a4b2d148c2e4e9e80be1b69d920ab2f04f6ddab3e497af38068180589ce9d6d6d34af426032a8b759f95430a90b6eb898946236947265c262a WHIRLPOOL 3938296013ee0033dad4b19e33c0572797183ecc300d58dd82c847910e42a206a88ed391587546a28c1de0d94ffe61614f61fd9a94428d4436a2075323c2f28d
+MISC ChangeLog 3273 SHA256 ccf9966540aa7938710ee466941aaaaef6a75892265f4050a3ce3399ef35abdd SHA512 ed712bb536dc5b9679003d6e2ef4e85e2be883783903346f69c114391212aab600606df61eb8306f897834ed27a99b4872acb2c823a4b1cd1e8f6f96a499a2fb WHIRLPOOL 550e4f5172b68e73beba26a254a05ed44a39d376b8c3dd4a4f1401a62a17df62062719fb4e1896fd6b95bdad7fceb3d77d1eb5ce3ee1de66aff7af16f2a28394
+MISC ChangeLog-2015 2998 SHA256 54acf4e5466e9496962148c2c06700d2a6735282b13187530e57b3b0485e8014 SHA512 ea12629cbb7e0081c5bd17b47a524c8184117c09a493ac8125fd6708b45d81337677c8259c91ed5cf44f0e5245c86530c654e014a5cf12565788bfda7b6fc91b WHIRLPOOL 462291bdd15161ff73eb5766b4ea8c0864c19e723e89af5352372c415c0d3ebaba498f8a7949cfaaf7baffcbaaf5d026ef1995928d8e96ca9527a7e869fa8ea2
+MISC metadata.xml 404 SHA256 e1fe0e6d0fe6d7b98c63919c22dde4903b30c897694ab4258d63b809a5c5133e SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577 WHIRLPOOL 06889eab9879296359f90b4ffb237a19d03c32d17216a4b5ea375e9e205779f62ecdab7a144fd0e54b63dab5582ecbcc9e833db431d34f6ea3a46f27a576f14a
diff --git a/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch b/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
new file mode 100644
index 000000000000..63c52ba33066
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.14.0-parallel-make.patch
@@ -0,0 +1,50 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -204,37 +204,37 @@
+ radmind : libsnet/libsnet.la ${RADMIND_OBJ} Makefile
+ ${CC} ${CFLAGS} -o radmind ${RADMIND_OBJ} ${LDFLAGS}
+
+-fsdiff : ${FSDIFF_OBJ}
++fsdiff : libsnet/libsnet.la ${FSDIFF_OBJ}
+ ${CC} ${CFLAGS} -o fsdiff ${FSDIFF_OBJ} ${LDFLAGS}
+
+-ktcheck: ${KTCHECK_OBJ}
++ktcheck: libsnet/libsnet.la ${KTCHECK_OBJ}
+ ${CC} ${CFLAGS} -o ktcheck ${KTCHECK_OBJ} ${LDFLAGS}
+
+-lapply: ${LAPPLY_OBJ}
++lapply: libsnet/libsnet.la ${LAPPLY_OBJ}
+ ${CC} ${CFLAGS} -o lapply ${LAPPLY_OBJ} ${LDFLAGS}
+
+-lcksum: ${LCKSUM_OBJ}
++lcksum: libsnet/libsnet.la ${LCKSUM_OBJ}
+ ${CC} ${CFLAGS} -o lcksum ${LCKSUM_OBJ} ${LDFLAGS}
+
+-lcreate: ${LCREATE_OBJ}
++lcreate: libsnet/libsnet.la ${LCREATE_OBJ}
+ ${CC} ${CFLAGS} -o lcreate ${LCREATE_OBJ} ${LDFLAGS}
+
+-lmerge: ${LMERGE_OBJ}
++lmerge: libsnet/libsnet.la ${LMERGE_OBJ}
+ ${CC} ${CFLAGS} -o lmerge ${LMERGE_OBJ} ${LDFLAGS}
+
+-lfdiff: ${LFDIFF_OBJ}
++lfdiff: libsnet/libsnet.la ${LFDIFF_OBJ}
+ ${CC} ${CFLAGS} -o lfdiff ${LFDIFF_OBJ} ${LDFLAGS}
+
+-repo : ${REPO_OBJ}
++repo: libsnet/libsnet.la ${REPO_OBJ}
+ ${CC} ${CFLAGS} -o repo ${REPO_OBJ} ${LDFLAGS}
+
+ t2pkg: ${T2PKG_OBJ}
+ ${CC} ${CFLAGS} -o t2pkg ${T2PKG_OBJ} ${LDFLAGS}
+
+-twhich: ${TWHICH_OBJ}
++twhich: libsnet/libsnet.la ${TWHICH_OBJ}
+ ${CC} ${CFLAGS} -o twhich ${TWHICH_OBJ} ${LDFLAGS}
+
+-lsort: ${LSORT_OBJ}
++lsort: libsnet/libsnet.la ${LSORT_OBJ}
+ ${CC} ${CFLAGS} -o lsort ${LSORT_OBJ} ${LDFLAGS}
+
+ FRC :
diff --git a/app-admin/radmind/files/radmind-1.7.0-gentoo.patch b/app-admin/radmind/files/radmind-1.7.0-gentoo.patch
new file mode 100644
index 000000000000..1734abdb51be
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.7.0-gentoo.patch
@@ -0,0 +1,29 @@
+diff -Naur radmind-1.5.0/radmind.conf radmind-1.5.0-r1/radmind.conf
+--- radmind-1.5.0/radmind.conf 1970-01-01 01:00:00.000000000 +0100
++++ radmind-1.5.0-r1/radmind.conf 2005-02-24 23:04:12.379193384 +0100
+@@ -0,0 +1,3 @@
++# chose server dir here
++# RADMIND_PATH="/srv/radmind"
++# RADMIND_OPTS="-D ${RADMIND_PATH} -p 6666"
+diff -Naur radmind-1.5.0/rc.radmind radmind-1.5.0-r1/rc.radmind
+--- radmind-1.5.0/rc.radmind 1970-01-01 01:00:00.000000000 +0100
++++ radmind-1.5.0-r1/rc.radmind 2005-02-24 23:04:12.379193384 +0100
+@@ -0,0 +1,18 @@
++#!/sbin/openrc-run
++
++depend (){
++ need net
++}
++
++start(){
++ ebegin "Starting radmind server"
++ start-stop-daemon --start --quiet --exec /usr/sbin/radmind \
++ -- ${RADMIND_OPTS}
++ eend $?
++}
++
++stop() {
++ ebegin "Stopping radmind"
++ start-stop-daemon --stop --quiet --exec /usr/sbin/radmind
++ eend $?
++}
diff --git a/app-admin/radmind/files/radmind-1.7.1-dnssd.patch b/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
new file mode 100644
index 000000000000..fe71ee013d1b
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.7.1-dnssd.patch
@@ -0,0 +1,22 @@
+diff -ru radmind-1.7.1~/configure radmind-1.7.1/configure
+--- radmind-1.7.1~/configure 2007-02-10 19:20:01.000000000 +0100
++++ radmind-1.7.1/configure 2007-02-10 19:22:04.000000000 +0100
+@@ -5265,12 +5265,12 @@
+ echo "${ECHO_T}$ac_cv_header_dns_sd_h" >&6
+
+ fi
+-if test $ac_cv_header_dns_sd_h = yes; then
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
+-
+-fi
++#if test $ac_cv_header_dns_sd_h = yes; then
++# cat >>confdefs.h <<\_ACEOF
++##define HAVE_DNSSD 1
++#_ACEOF
++#
++#fi
+
+
+
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
new file mode 100644
index 000000000000..482e81520aa1
--- /dev/null
+++ b/app-admin/radmind/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>A suite of Unix command-line tools and a server designed to remotely administer
+the file systems of multiple Unix machines.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">radmind</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..cfc09f32cca2
--- /dev/null
+++ b/app-admin/radmind/radmind-1.14.1-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 eutils
+
+DESCRIPTION="command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="http://rsug.itd.umich.edu/software/radmind/"
+SRC_URI="mirror://sourceforge/radmind/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+ # remove dnssd as it doesn't compile
+ epatch "${FILESDIR}"/${PN}-1.7.1-dnssd.patch
+ epatch "${FILESDIR}"/${PN}-1.14.0-parallel-make.patch
+}
+
+src_install() {
+ default
+ dodoc README VERSION COPYRIGHT
+}
diff --git a/app-admin/ranpwd/Manifest b/app-admin/ranpwd/Manifest
new file mode 100644
index 000000000000..935b15c71a69
--- /dev/null
+++ b/app-admin/ranpwd/Manifest
@@ -0,0 +1,5 @@
+DIST ranpwd-1.2.tar.gz 41018 SHA256 b63cc1a621966a3bfabc83803c32617ef8caf5b7687042ac1b0eee04b8b79507 SHA512 7ae8ff593623a2102e50fbb3356889291408263100a358de14bd44b13c1d2931bf0e1e8ec972a620b8328a179a38a0d614099ffea2473079f9ed2425809a922f WHIRLPOOL d2cba9af972ee81d2758ca90c1860e61b05fd4a6c9dd8284eb7ebacfd3f2ed94e072e57092aaf35797b4ce3b9c88ca45012b9bb2606adad84d5099c71827e7e6
+EBUILD ranpwd-1.2.ebuild 587 SHA256 7ed848912c5639278195f5d4cbd257ca6c8f0201581f7dc76a29bda82bdc3df6 SHA512 bf023072d578df154a95dda6907cbe7c2967cc493206e020dac9d555c88877d90aa41f33ea8cd8ae4c9f539094724d82062011130ce9fa2336ee2a68ca5e4f44 WHIRLPOOL 8e952ea581787a630eed902cac4a7ef9d6bd5cd697d3de31925d8488472d714dcb55ee518a865cf744ccfc541bbd7225d00d55bd3d264bdecc325f240bab3bae
+MISC ChangeLog 2973 SHA256 7c3eec549641626760548ffde1a18f2d7f8b11251c91c5cac438f42228778b2a SHA512 b55217bcfc1b2b015ab546b795343f4bcac56c2da69f65beb2d0079715a1b7056c99eb9be49459806c4294a9b254d75dbd4709cc05c28194fe7cec1a0c477828 WHIRLPOOL 706492f6774972d1cc853e7facd4ddf48d2f72c52f6c4dd017dd5dfbbf7f0ca747a2ea0c48dc64cd625f0626e081908cdc941e82846d95a14d95393d20e71008
+MISC ChangeLog-2015 2008 SHA256 d9110225b79fb7e01327cbea0dc2937e2e5e63cb40df9cfc0c6a2110f1ec0ad1 SHA512 a9d0f6ed01f966c3f683507c4cf9b7dcf8f3a66b86c002ea5348da9e30328e99eacb42fdf7ca6ec166b2d8ba12aedc7ca31527e747b365e1e300087a42ebb197 WHIRLPOOL 52a9b36c45bf6e593a9946a6eef42f66e1137002417f4829bfd95867d9141b7cff7b55b2e23d44f186d181e9c03c43b2a7a69c1bb26a9328b318760975cd7a79
+MISC metadata.xml 236 SHA256 dd25b46c95b0c63da84b7ff5778479e31449a385df066e9ee14bf0d7d176f42f SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08 WHIRLPOOL b15a2dfb001c41c8de2895842148b2531b74949e89e93ff8c366519c35792996e344918eaf9144fb081fc240796e47890be356d2339bea60b1e1d41830447d31
diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-admin/ranpwd/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>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
new file mode 100644
index 000000000000..14866c580ca2
--- /dev/null
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generate random passwords using the in-kernel cryptographically"
+HOMEPAGE="https://www.kernel.org/pub/software/utils/admin/ranpwd/"
+SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_test() {
+ einfo "generating random passwords"
+ for a in 1 2 3 4 5 6 7 8 9
+ do
+ ./ranpwd $(($a * 10))
+ done
+}
+
+src_install() {
+ emake INSTALLROOT="${D}" install
+}
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
new file mode 100644
index 000000000000..760ea71164d6
--- /dev/null
+++ b/app-admin/rcm/Manifest
@@ -0,0 +1,3 @@
+DIST rcm-1.3.1.tar.gz 89437 SHA256 9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9 WHIRLPOOL a5614c0901d413ac49584234dd8fc989e5add6d8f6af6a743e76998bb4655e84596e8d564c2ef5f0b80ab3c7c729eadb7c65d3ae40c370378ae72da7205bf4bd
+EBUILD rcm-1.3.1.ebuild 392 SHA256 68676c9b8716dc39497c8f79e056ac879cc4576a035d1d05e9122f8779cf3ee5 SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba WHIRLPOOL 626d0159257c7f040b6f278563d3523e7d9cfd31b00f4dd24ccb47e4313ee4accc869fac6b46a7480fb60e124c6c1adcdb183e8726d1d84aac3f81894c133f8b
+MISC metadata.xml 600 SHA256 226ad0cf5efbc8a39427a303d9599f2bd1ce4b00944f4ce5fa42eacd0561a098 SHA512 20889a88c6b14427b562514ac25283df01f9c55e9d1ed757ea6b9efc8c217ad31f44ed387314573a0797fed9e203545d0906a69ede99dd429f10cdba8bb65de3 WHIRLPOOL d37da67b42f7082643aa9dcfa31e9f8c456b78802e1baaca842ad43ae8df13235f5c5da95cbbc498c26ac89ffe6516bde083903065bc8d50737a7465a757c918
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
new file mode 100644
index 000000000000..94e33d5d609d
--- /dev/null
+++ b/app-admin/rcm/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>fgtham@gmail.com</email>
+ <name>Florian Tham</name>
+ <description>Proxied maintainer - assign bugs to him</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">thoughtbot/rcm</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ rcm is a management suite for dotfiles.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
new file mode 100644
index 000000000000..e068009d9cee
--- /dev/null
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="rc file (dotfile) management"
+HOMEPAGE="https://github.com/thoughtbot/rcm"
+SRC_URI="https://thoughtbot.github.io/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-util/cram )"
+
+src_test() {
+ emake -j1 check
+}
diff --git a/app-admin/recursos/Manifest b/app-admin/recursos/Manifest
new file mode 100644
index 000000000000..9c4e5eb593ba
--- /dev/null
+++ b/app-admin/recursos/Manifest
@@ -0,0 +1,5 @@
+DIST recursos-2.0.tbz2 29480 SHA256 031e2b2cae9c86ce828b609c30ca24d32ddcfa13c53b15f35388ad9da6ec1520 SHA512 391bd253b62cbc2afbf054baa368bef5f7847624889188829557244f132bf484d4d4652a8c524da95ae3b39909fbdc37796eb325839bcd5e8982f7dcb6cd89e4 WHIRLPOOL 696de8f5c5d205d21630aa5ee95818d12c313d53b65e63d6b69defa41c38d0e5b63f72c067b4535690f41ead9cd4e74b12b7c89605d9b25fd487041a7fb03cf2
+EBUILD recursos-2.0-r1.ebuild 1345 SHA256 6236d5d5e32ec9fb06b958636741761e88a0f1f7ad5c5e0126915fc564d47822 SHA512 e888a9380a30d0233e5462409e150e5ef6e8ffe82f08c3c0bd5e1ae87dfabf44a32fa9171d7d5b80e524d4a2237f0587864a82ac5d68094cfc4376503e01788e WHIRLPOOL 7f47c08c310ed98179ab047c3cd9ca491f622d0497deef8970efc9bd0f535710395bbe04ccba27a89d11bfd2c0ce3abf210e6df376a049cfea5c89b9fc590cc9
+MISC ChangeLog 2522 SHA256 66fa4e863a1d2be8ca58d4821ba95d005a5e9f596afe3b372fd99ef7a9d09240 SHA512 374a5ad78a016a255530fe6e4643434fa267bc0e771054a5869cd9326cfd5026f1065fca7cfb8d6f2c993bfc516ecb76a2f827d3af1e7b8929b0aa9f2568cc2b WHIRLPOOL 3d72ed28c7de6d839a0804de216c60ea0171b2965825252b4dd243889479fb326e75e3abc85a74105217801eff1455a9a8a3c043ae81b73d6ddc6de045835a78
+MISC ChangeLog-2015 1105 SHA256 58511e5591bb044ffd540e30f9388e4090f7c9faf1c338a91b4c721a602e7031 SHA512 2c96b32f8fc7bd2396f5c94699a529a0d9ece41e9735b0fdb758a1e5da821489208ac6445d4f7429710a525d8fc4f47ed6ea5966fda884e37b222b0e0179f1ab WHIRLPOOL 505cac764b51f3d56e6350e5a4188b7987445217c4ce4e5d10915b658dbe76c808e68a0e934e59f41a8fb0cf2932c032bd5ff623ebe4743dfc57dfff8f10bd3d
+MISC metadata.xml 343 SHA256 f2257bb5f0913de9ddda3b21e4999ef057c2a4aed50dc8917dd22978c0a02e04 SHA512 c22fa6dbdbf662e83e78a9aba6a66c72e4649cb11bf0261aaef8f068e14db18b96546a7271fbab3e5ed7caf3fbde6eba2a91affa44141e26e4c7546ba37d1635 WHIRLPOOL b5cfca72ef18f42f941e5c0e61814508c7106a857ea3bc7271d90321f727a7614b0c08e8a5d0f5b1b28c44ca2b44c687e804198c83c9433dd9b4cfe005a73315
diff --git a/app-admin/recursos/metadata.xml b/app-admin/recursos/metadata.xml
new file mode 100644
index 000000000000..06396fb885b9
--- /dev/null
+++ b/app-admin/recursos/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>
+ A set of script to extrac usefull info about your system and report it
+ in plain text or html. It can generate Grpahs using rrdtools.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/recursos/recursos-2.0-r1.ebuild b/app-admin/recursos/recursos-2.0-r1.ebuild
new file mode 100644
index 000000000000..7da26bdf3a76
--- /dev/null
+++ b/app-admin/recursos/recursos-2.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Script to create html and text report about your system"
+HOMEPAGE="http://www.josealberto.org"
+SRC_URI="mirror://gentoo/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+ net-analyzer/rrdtool[graph]
+ virtual/imagemagick-tools"
+
+S=${WORKDIR}/r2
+
+src_install() {
+ WWWDIR="/var/www/localhost/htdocs/R2"
+
+ insinto /etc
+ doins recursos2.conf
+
+ dobin R2createrrd.sh R2generarrd.sh R2updaterrd.sh Recursos2.sh
+
+ dodir ${WWWDIR}
+ insinto ${WWWDIR}
+ doins R2/*.html
+
+ dodir ${WWWDIR}/common
+ insinto ${WWWDIR}/common
+ doins R2/common/*
+
+ dodir ${WWWDIR}/rrd/mini
+}
+
+pkg_postinst() {
+ elog "Fist you must configure /etc/recursos2.conf"
+ elog "Then follow these steps:"
+ elog
+ elog "1. Run R2createrrd.sh"
+ elog
+ elog "2. Add crontab jobs (this is an example):"
+ elog "*/2 * * * * root /usr/bin/R2updaterrd.sh"
+ elog "*/5 * * * * root /usr/bin/R2generarrd.sh"
+ elog "*/10 * * * * root /usr/bin/Recursos2.sh \ "
+ elog " title general system disks net \ "
+ elog " > /var/www/localhost/htdocs/recursos.html"
+ elog
+ elog "You can use Recursos2.sh to extract info about your system"
+ elog "in html or plain text and mail the file or whatever."
+ elog
+}
diff --git a/app-admin/reportmagic/Manifest b/app-admin/reportmagic/Manifest
new file mode 100644
index 000000000000..006900426206
--- /dev/null
+++ b/app-admin/reportmagic/Manifest
@@ -0,0 +1,5 @@
+DIST rmagic-2.21.tar.gz 451179 SHA256 a3e9276634e25cee08c7a309a98a61eec6a5af15ca8a75653b40b98ead35e69f SHA512 ed9f4e6f8d6160afbe138125c4cb65010a08b95390117ebf07ccde289ff42b78664b1fe677e23f46a221d153889f807c545329936829fceeae4690b00732a637 WHIRLPOOL f3c3a0e0d00deaaeae9d4c1b49aeb533838585f7596cc1ffa197da8e9762140f8b3ed73f56f226241b96c398c739a7d8410b47c27fcca59cc22a85393cf022bf
+EBUILD reportmagic-2.21.ebuild 918 SHA256 c2353f33f68050b7fe550ddeb9e2c948d7facd098ab77b61762d63897a516a1f SHA512 fc577503bb423740b65b3517c727810d2d762a6eba4b1b83e1c2dffeab3ca208d498126492ac96d459fe062f4cb197ef2dc69a0b04a87b81ae682c44529709d9 WHIRLPOOL c31a70e4aede967bb29cea2143231961ad8ca8947aa16392f3fab095e233a86ecdd4233eba1d0fbeabb813a6c72be3304095c6b47adb758031c14440f93bdd97
+MISC ChangeLog 2533 SHA256 20ee69836a158e3c5450a085a7977743dc23db7a3f64350923d8b999f65cbe0f SHA512 2fec31a166cb511888117e8f76844ee6c29ff91f27b2cf802a04fe3b0f2ac601d71fba2fca6387abd8ef513240e2c66ddab5cb8eb31cec8a0a4ac606b29a837c WHIRLPOOL 7685e9722f6d1540e3ae1bc0e612aa8606e0cdaddfd3b375bba3f66f66b4752629faf6afe56b2967378174ae5ba5d36b9a7889355af6617afa437e9a1d0b8a0e
+MISC ChangeLog-2015 2268 SHA256 08562607ca0d9637e22cde3c615a46dc38e2c8baf5703797e8a41b6b45a8077a SHA512 1e8f3523599d4cab7ddf962e948c1094c14a8136ca8815111bad85f21348d63c7589b953f6ae408a146e996801234eed46c7cc6107adada6f3011f7f9fe79034 WHIRLPOOL 2479f1003d311fe67500d972132e89a75eba69e617c7f2b2e31ab6cf1c6a534166ce9dde3651474b53080ff4c1a7ca77b33fefea262564e64a436abb271b5965
+MISC metadata.xml 275 SHA256 5aee5a9443cbc460e28a3c4ca8c13e988d11aac8353c327737bd00741bfd7c7b SHA512 8c3747aa12bd26e790ea267481292eb4ebfc2d27b7acb498547aae3d8479654ac9d13aecd61a49be21de831924ee3fb809d4da5a4c765127af10e13a9cb32fd2 WHIRLPOOL 9a225ea182ccca050602e3be4ad86fc25a4f5d11422901f95c428c21e386dca53b92f79750a3bdf027212e32c73d3179021937e19c516255728841cfab3e2a18
diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
new file mode 100644
index 000000000000..9f889449d4a0
--- /dev/null
+++ b/app-admin/reportmagic/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 -->
+ <longdescription lang="en">
+ A report generating applicaton from web site log files.
+ </longdescription>
+ </pkgmetadata>
diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
new file mode 100644
index 000000000000..4f1aae122699
--- /dev/null
+++ b/app-admin/reportmagic/reportmagic-2.21.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Makes usable statistics from your web site log file analysis"
+HOMEPAGE="http://www.reportmagic.org/"
+SRC_URI="http://www.reportmagic.org/rmagic-${PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE="truetype"
+
+DEPEND="sys-libs/zlib
+ media-libs/libpng
+ media-libs/gd
+ truetype? ( media-libs/freetype )
+ virtual/jpeg
+ dev-perl/GD
+ dev-perl/Config-IniFiles
+ virtual/perl-File-Spec
+ dev-perl/HTML-Tagset
+ dev-perl/HTML-Parser
+ dev-perl/GDGraph
+ virtual/perl-File-Temp
+ dev-perl/GD-Graph3d"
+
+S="${WORKDIR}/rmagic-${PV}"
+
+src_unpack() {
+ unpack ${A} ; cd "${S}"
+
+ sed -i \
+ -e "s:^\$DEST.*:\$DEST='${D}/usr/share/reportmagic';:g" \
+ -e "s:^\$DOC.*:\$DOC='${D}/usr/share/doc/${PF}';:g" \
+ Install.PL \
+ || die "sed failed"
+}
+
+src_install() {
+ perl Install.PL -no_modules
+}
diff --git a/app-admin/restart_services/Manifest b/app-admin/restart_services/Manifest
new file mode 100644
index 000000000000..0d34fb73e4d4
--- /dev/null
+++ b/app-admin/restart_services/Manifest
@@ -0,0 +1,7 @@
+DIST restart_services-0.13.0.tgz 20790 SHA256 b975450f24c72aa52ea9bf1a73514d7806604323ad1f29f2c03b922421a67aa2 SHA512 778139f724f0e8f5f5a4a146ea19808f1d58717e2158570e829ed15950cf4394ecce1c2d3fe7afd6c9324b255186b9d740928c973a48aafeb4df3a38faa814ba WHIRLPOOL 74309e2272ec1e7ecf51bcc83ec308b5b33ac4c0e675005e6302a7117fc38b16a2d4566a1517b6466894a3d57b5ec3f7d65959edf4dc1ebad4e751c028105d11
+DIST restart_services-0.13.1.tgz 20860 SHA256 c14759fbbbebc31500495194a749a4ef5a5d8e7049af79d8a81cb70883c7d2ce SHA512 29983382ddf217865b4e2cde62caaba4f6a54ac20223a1fe8019e39ad0fdb61c491013444a684a0a5941965417b87abf1c25f52036649205cb16a0f12bf397ef WHIRLPOOL 22ec5681e758d0a541b1d1ea47aa977260931ffb291174549213ebc534d2f25bd740e697ec5a1a368d0082597e29e3c484da2584351b61027666d3758e31a8da
+EBUILD restart_services-0.13.0-r1.ebuild 942 SHA256 05c1f2b662e1388663d992f9d06f8f8c42110a6d6f2b2b865284aaa20d4848a1 SHA512 0f8ef249b60867b71d74d8a059d187ea86461e699f7be9116e59fb0ff702841ba0c1eac1dc8ecb8e5428156a1385f83b1a32782ed79bf029da99a0c65da36fc8 WHIRLPOOL 59048e50cf1d7f100fbbfc5c76712f0cf99154edbd0faae1042626f24a08513d09fadeb5e481b03d4f7ed9b081f5be18b2c31d808d7ddda2729391560035323c
+EBUILD restart_services-0.13.1.ebuild 942 SHA256 05c1f2b662e1388663d992f9d06f8f8c42110a6d6f2b2b865284aaa20d4848a1 SHA512 0f8ef249b60867b71d74d8a059d187ea86461e699f7be9116e59fb0ff702841ba0c1eac1dc8ecb8e5428156a1385f83b1a32782ed79bf029da99a0c65da36fc8 WHIRLPOOL 59048e50cf1d7f100fbbfc5c76712f0cf99154edbd0faae1042626f24a08513d09fadeb5e481b03d4f7ed9b081f5be18b2c31d808d7ddda2729391560035323c
+MISC ChangeLog 3677 SHA256 f20bad020f8de36f6749f8fa2434763983b6ccf472739c16168765bac075b275 SHA512 ad67e9b765932327938e6bedbf56710ee6142bf378b6f421414efe88485c13046572aa046292f6129a615f617b2f10835896ba8b4ce6dbd0c5c91b9e6589ab75 WHIRLPOOL d3877109ef4cf6e33e472862cd72d5c73f8b256bb255bb475fa90c7fc8cfc6f0eb44033c002946406fd22d78a02c90a31f57cd871bc2ed9ec364bac16b2bdf5c
+MISC ChangeLog-2015 1207 SHA256 15dd8caadbe3586354ecaa8c3d66c733cbd8c5b6752bc352935a278e18ce7a19 SHA512 da08fffa39d8d8b2d691795ebd918ffcd407e8a7abe6112a32678088912a7fac4e77826ce11e89d602bdcf57bc83c96be8852bde2c6faa7cdfdc08ea95b1c887 WHIRLPOOL ef3f66f6d864cdd9ad37e0b4b80d8c5fda29879434988e36817de7721d103234ac7d1411d26081db41842f69a880f540cd28e6000fd6535510f04497641daaf9
+MISC metadata.xml 250 SHA256 dc7996b965794cc38ecefc226a6b05400ff49c69553249c3d0ac69fd277b7906 SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de WHIRLPOOL e00ced8aee67f075273a4c498a4c69671eef224f7b41ef8c194ae72404c242bb93bf31a48fcf94065ab6fe8afbfb667238deba4ea4eb9bec406ace4bfcdcdc8c
diff --git a/app-admin/restart_services/metadata.xml b/app-admin/restart_services/metadata.xml
new file mode 100644
index 000000000000..ea6b59e79026
--- /dev/null
+++ b/app-admin/restart_services/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-admin/restart_services/restart_services-0.13.0-r1.ebuild b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..02d25b888c71
--- /dev/null
+++ b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ app-admin/lib_users
+ sys-apps/openrc
+"
+
+src_install() {
+ dosbin restart_services
+ doman restart_services.1
+ keepdir /etc/restart_services.d
+ insinto /etc
+ doins restart_services.conf
+ dodoc README CHANGES
+
+ sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
+ cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
+ # You may put your local changes here or in any other *.conf file
+ # in this directory so you can leave /etc/restart_services.conf as is.
+ # Example:
+ # *extend* SV_ALWAYS to match 'myservice'
+ # SV_ALWAYS+=( myservice )
+ EOF
+}
diff --git a/app-admin/restart_services/restart_services-0.13.1.ebuild b/app-admin/restart_services/restart_services-0.13.1.ebuild
new file mode 100644
index 000000000000..02d25b888c71
--- /dev/null
+++ b/app-admin/restart_services/restart_services-0.13.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ app-admin/lib_users
+ sys-apps/openrc
+"
+
+src_install() {
+ dosbin restart_services
+ doman restart_services.1
+ keepdir /etc/restart_services.d
+ insinto /etc
+ doins restart_services.conf
+ dodoc README CHANGES
+
+ sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
+ cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
+ # You may put your local changes here or in any other *.conf file
+ # in this directory so you can leave /etc/restart_services.conf as is.
+ # Example:
+ # *extend* SV_ALWAYS to match 'myservice'
+ # SV_ALWAYS+=( myservice )
+ EOF
+}
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
new file mode 100644
index 000000000000..8f0a65b280d5
--- /dev/null
+++ b/app-admin/rex/Manifest
@@ -0,0 +1,12 @@
+DIST Rex-1.3.3.tar.gz 274725 SHA256 111e80515fc3c1846668aa4ff0731443a58f3e74d78063dfc61fea96ca49cde6 SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c WHIRLPOOL c8285e50f0259060ead8e86b120b3a16d6a1f506dec8eead33ac5e8a0af8371083a73315cf859c99433a7b8c902cbd48f383326c6ce2b0c4d900681baf623a51
+DIST Rex-1.4.0.tar.gz 289330 SHA256 b4f930044ea907aae67c18f347a33b55cd3da4efe5f5a5869db3c891d6c4e125 SHA512 d14489157860df1b32dd2b4af7ce8148a9693d66f59bc0ee228c7c4ff57f38f7b308212c18fc7c0aff7a585a76028a9de0a7a96f8eb58c2455d19bd6b2713eab WHIRLPOOL ee24b8c0770a94f84e6ae6ad5c3002f2e3be3a6e416121443c142477307674499fd631c0d72569aefcf81875365cd84fdd37666c9235c873b6adf5acb51eee3c
+DIST Rex-1.4.1.tar.gz 317358 SHA256 6898add0c9ad8b30b1ea5f70730a53cf899e4fe7228e1f8d5006d6694cfe8eb2 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e WHIRLPOOL e67b3e73c8d1337f2b91104d80132b860fb49f045bca12c15d57651204dd23811248e196962fcda41afdfdc6a2ad1123dc5829d1fd04bd17879bea812b281a47
+DIST Rex-1.5.0.tar.gz 327424 SHA256 c042a0ed4920070d4508b6e7d2c36d28b3a5691938f2e0a0d7717977b44b82d0 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73 WHIRLPOOL eca2ecd1a0bd18355cf1dcf1b20df795bd25788acf10b800d2216fb78ecc87a63556dc1d40d0da0ff7487b2540e7c33efc14f324780d6d401d068762fa6921d0
+EBUILD rex-1.3.3.ebuild 1141 SHA256 7cd0b3c95409009f4182b51db14fb7a071791ae9405aed56892dcdfd4c9a760b SHA512 f2ed11f8acf92f45b0fa649f84d4849b8cac068cfeeac93010383e2f8463f820cf50da99b9f1f7c76bc7cc268728e26800e97ae99ac28ae2e2d56da4783cb3e4 WHIRLPOOL 12b042ba80072c966cc29afe4ae4cc4c6152260da779b3b0554cc1cc57bb1bae510a0515f0dda6dd5ed91541c9f5862655a14da9e2dad46687b4fbcd5c5d820d
+EBUILD rex-1.4.0-r1.ebuild 1129 SHA256 c9f7436e4df04ae5e34dab999c340e713256c17f6dc2ff3134c2bbb8490881a2 SHA512 56e4de394eadb91801dfb686b56f4e2e84908cb4f5ef358c88e6f25f94512e6497d923a71d7ac8bfa3713ab7db26e22108f6a2260bee310c514a5e7407381be2 WHIRLPOOL 96bd6aab3bf8c68d9578ae37d3c4bd3958243cd3724f95d7c26c52e709349de1f4e9041a20c48d9ad1ca9587f9d970a4c27fa4e89df57e3ded0941d3ebdb19dd
+EBUILD rex-1.4.1.ebuild 1130 SHA256 5d76977cc9f062ced298318f17ace2bb418be8d294a4e09603be68619962a3a4 SHA512 0dc625298b996064fbfdc389fda95b7bcc6bcee7d9321da2e0c54a658e6fe741a11d345472f2d19f331bd89c0bb1d1262d694229d1f48bac6310b03202e18784 WHIRLPOOL ca9a867eb981148cb9e7b159ceabbed975a4670c6e58ffbb288bf96e78201c660c05f541529c5c389d5a208abf116d764502848059595883a309430980c5d0a3
+EBUILD rex-1.5.0.ebuild 3642 SHA256 edcfac037e8f5173108f686af14b5f350d2b8cbe31c11ffd690ce5b2bb62bb12 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a WHIRLPOOL 7d86c7c0c912ae8f3839acd1715bf2c33a9c411da1b5503eb75e1d17e45c5d9b233662c225fbd716edf48f2a21939eb18108a0778c10be4f179cbe73a449fd09
+EBUILD rex-9999.ebuild 3642 SHA256 edcfac037e8f5173108f686af14b5f350d2b8cbe31c11ffd690ce5b2bb62bb12 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a WHIRLPOOL 7d86c7c0c912ae8f3839acd1715bf2c33a9c411da1b5503eb75e1d17e45c5d9b233662c225fbd716edf48f2a21939eb18108a0778c10be4f179cbe73a449fd09
+MISC ChangeLog 3994 SHA256 ef66717839d3c8f020d111ef1106a59db4e04b2336c4258c07a0fb2ca57e1735 SHA512 260173f473c3abc544e3173f96ce72fdcb93bc263b1e45f69fadc588b12d10ef0b74524a790962e470024135a34abf349361081f603ad6d2491cdfd462a78b01 WHIRLPOOL f164f54458fc86e79a7b98bbd6f02835ee3b89070b04ea0e7349ce617d0f0c44e6f67b5126a4bbce89d87bffd2b80e6e92f64749fc24ba0388776cc3cf65c765
+MISC ChangeLog-2015 4557 SHA256 d4c552bda6dc2eea294418aba67a9e88dfd5aa959cf4b0812be241c92341ab75 SHA512 55c1fc501d736cbf27caabe68a69ab26e1e5fc7ee3d3de0fb75a8a2c16ec99f7cbd18330fb7973e44efa6205ff22c210e5180d56cab92578b618f85d1e7fc8da WHIRLPOOL 786987d2748787fa0f6742ffbe3d10a28da980cd9eed90c0e107fc1a13e68ab1fda54b3009275bc4a92a5258a72b36b8f5cee68be9c68d1f25edcabe22d4a1e2
+MISC metadata.xml 23689 SHA256 73f6457ca64acc5c42a35fa14eb28b20d329f18d76190fe745150ba88889bc70 SHA512 136db3e5b2495b8e3b08feafeb4426c7692ee13d7366bec18e56e231d30823c3e36066a70538f0c3c972ec06955f746e8400819c22751caa164e1a72331a6148 WHIRLPOOL 0ed741ca55aad4322f9d5add881e6a22988ab6f16c2665665b4f3ff61f0d52f53b1807731b727b5e463bc0f1d29ee487a96fef23dd404ae10563017c1772e487
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
new file mode 100644
index 000000000000..8ff646c52b5c
--- /dev/null
+++ b/app-admin/rex/metadata.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>erkiferenc@gmail.com</email>
+ <name>Ferenc Erki</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>kentnl@gentoo.org</email>
+ <name>Kent Fredric</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">RexOps/Rex</remote-id>
+ <remote-id type="cpan">Rex</remote-id>
+ <remote-id type="cpan-module">Rex</remote-id>
+ <remote-id type="cpan-module">Rex::Args</remote-id>
+ <remote-id type="cpan-module">Rex::Args::Integer</remote-id>
+ <remote-id type="cpan-module">Rex::Args::Single</remote-id>
+ <remote-id type="cpan-module">Rex::Args::String</remote-id>
+ <remote-id type="cpan-module">Rex::Batch</remote-id>
+ <remote-id type="cpan-module">Rex::Box</remote-id>
+ <remote-id type="cpan-module">Rex::Box::Amazon</remote-id>
+ <remote-id type="cpan-module">Rex::Box::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Box::KVM</remote-id>
+ <remote-id type="cpan-module">Rex::Box::VBox</remote-id>
+ <remote-id type="cpan-module">Rex::CLI</remote-id>
+ <remote-id type="cpan-module">Rex::CMDB</remote-id>
+ <remote-id type="cpan-module">Rex::CMDB::Base</remote-id>
+ <remote-id type="cpan-module">Rex::CMDB::YAML</remote-id>
+ <remote-id type="cpan-module">Rex::Cloud</remote-id>
+ <remote-id type="cpan-module">Rex::Cloud::Amazon</remote-id>
+ <remote-id type="cpan-module">Rex::Cloud::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Cloud::Jiffybox</remote-id>
+ <remote-id type="cpan-module">Rex::Cloud::OpenStack</remote-id>
+ <remote-id type="cpan-module">Rex::Commands</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Augeas</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Box</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Cloud</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Cron</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::DB</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Download</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::File</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Fs</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Gather</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Host</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Inventory</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Iptables</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::JobControl</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Kernel</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::LVM</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::MD5</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Mkfs</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Network</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Notify</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Partition</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Pkg</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::PkgConf</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Process</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Rsync</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Run</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::SCM</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Service</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::SimpleCheck</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Sync</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Sysctl</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Tail</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Upload</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::User</remote-id>
+ <remote-id type="cpan-module">Rex::Commands::Virtualization</remote-id>
+ <remote-id type="cpan-module">Rex::Config</remote-id>
+ <remote-id type="cpan-module">Rex::Constants</remote-id>
+ <remote-id type="cpan-module">Rex::Cron</remote-id>
+ <remote-id type="cpan-module">Rex::Cron::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Cron::FreeBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Cron::Linux</remote-id>
+ <remote-id type="cpan-module">Rex::Cron::SunOS</remote-id>
+ <remote-id type="cpan-module">Rex::Exporter</remote-id>
+ <remote-id type="cpan-module">Rex::FS::File</remote-id>
+ <remote-id type="cpan-module">Rex::File::Parser::Data</remote-id>
+ <remote-id type="cpan-module">Rex::File::Parser::Ini</remote-id>
+ <remote-id type="cpan-module">Rex::Fork::Manager</remote-id>
+ <remote-id type="cpan-module">Rex::Fork::Task</remote-id>
+ <remote-id type="cpan-module">Rex::Group</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Entry::Server</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::Command</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::DBI</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::File</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::INI</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::XML</remote-id>
+ <remote-id type="cpan-module">Rex::Group::Lookup::YAML</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Host</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Kernel</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Memory</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::Darwin</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::FreeBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::Linux</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::NetBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::OpenBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Network::Solaris</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::Swap</remote-id>
+ <remote-id type="cpan-module">Rex::Hardware::VirtInfo</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Array</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::DBI</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Encode</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::File::Spec</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::File::Stat</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::File::Stat::Unix</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::File::Stat::Win32</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Hash</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::INI</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::IP</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Misc</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Path</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Rexfile::ParamLookup</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::Run</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::SSH2</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::SSH2::Expect</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::System</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::URI</remote-id>
+ <remote-id type="cpan-module">Rex::Helper::UserAgent</remote-id>
+ <remote-id type="cpan-module">Rex::Hook</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Cache</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Cache::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Cache::YAML</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::Fake</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::HTTP</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::HTTPS</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::Local</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::OpenSSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Connection::SSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::HTTP</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::IOReader</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::Local</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::OpenSSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::SSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Exec::Sudo</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Executor</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Executor::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Executor::Default</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::HTTP</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::Local</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::OpenSSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::SSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::File::Sudo</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::HTTP</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::Local</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::OpenSSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::SSH</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Fs::Sudo</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Ash</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Bash</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Csh</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Default</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Idrac</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Ksh</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Sh</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Tcsh</remote-id>
+ <remote-id type="cpan-module">Rex::Interface::Shell::Zsh</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Bios</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::BaseBoard</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::Bios</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::CPU</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::Memory</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::MemoryArray</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::Section</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::DMIDecode::SystemInformation</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::HP::ACU</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Hal</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Hal::Object</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Hal::Object::Net</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Hal::Object::Storage</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Hal::Object::Volume</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Proc</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::Proc::Cpuinfo</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::BaseBoard</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::Bios</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::CPU</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::Memory</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::MemoryArray</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::Section</remote-id>
+ <remote-id type="cpan-module">Rex::Inventory::SMBios::SystemInformation</remote-id>
+ <remote-id type="cpan-module">Rex::Logger</remote-id>
+ <remote-id type="cpan-module">Rex::Notify</remote-id>
+ <remote-id type="cpan-module">Rex::Output</remote-id>
+ <remote-id type="cpan-module">Rex::Output::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Output::JUnit</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::ALT</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Arch</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Debian</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::FreeBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Gentoo</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Mageia</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::NetBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::OpenBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::OpenWrt</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Redhat</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::SuSE</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::SunOS</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::SunOS::OpenCSW</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::SunOS::pkg</remote-id>
+ <remote-id type="cpan-module">Rex::Pkg::Ubuntu</remote-id>
+ <remote-id type="cpan-module">Rex::PkgConf</remote-id>
+ <remote-id type="cpan-module">Rex::PkgConf::Base</remote-id>
+ <remote-id type="cpan-module">Rex::PkgConf::Debian</remote-id>
+ <remote-id type="cpan-module">Rex::Profiler</remote-id>
+ <remote-id type="cpan-module">Rex::Report</remote-id>
+ <remote-id type="cpan-module">Rex::Report::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Report::YAML</remote-id>
+ <remote-id type="cpan-module">Rex::Require</remote-id>
+ <remote-id type="cpan-module">Rex::Resource</remote-id>
+ <remote-id type="cpan-module">Rex::Resource::Common</remote-id>
+ <remote-id type="cpan-module">Rex::Resource::firewall</remote-id>
+ <remote-id type="cpan-module">Rex::Resource::firewall::Provider::base</remote-id>
+ <remote-id type="cpan-module">Rex::Resource::firewall::Provider::iptables</remote-id>
+ <remote-id type="cpan-module">Rex::Resource::firewall::Provider::ufw</remote-id>
+ <remote-id type="cpan-module">Rex::RunList</remote-id>
+ <remote-id type="cpan-module">Rex::SCM::Git</remote-id>
+ <remote-id type="cpan-module">Rex::SCM::Subversion</remote-id>
+ <remote-id type="cpan-module">Rex::Service</remote-id>
+ <remote-id type="cpan-module">Rex::Service::ALT</remote-id>
+ <remote-id type="cpan-module">Rex::Service::ALT::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Arch::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Debian</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Debian::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::FreeBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Gentoo</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Gentoo::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Mageia</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Mageia::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::NetBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Service::OpenBSD</remote-id>
+ <remote-id type="cpan-module">Rex::Service::OpenWrt</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Redhat</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Redhat::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::SuSE</remote-id>
+ <remote-id type="cpan-module">Rex::Service::SuSE::systemd</remote-id>
+ <remote-id type="cpan-module">Rex::Service::SunOS</remote-id>
+ <remote-id type="cpan-module">Rex::Service::SunOS::svcadm</remote-id>
+ <remote-id type="cpan-module">Rex::Service::Ubuntu</remote-id>
+ <remote-id type="cpan-module">Rex::Shared::Var</remote-id>
+ <remote-id type="cpan-module">Rex::Shared::Var::Array</remote-id>
+ <remote-id type="cpan-module">Rex::Shared::Var::Common</remote-id>
+ <remote-id type="cpan-module">Rex::Shared::Var::Hash</remote-id>
+ <remote-id type="cpan-module">Rex::Shared::Var::Scalar</remote-id>
+ <remote-id type="cpan-module">Rex::Sudo::File</remote-id>
+ <remote-id type="cpan-module">Rex::Task</remote-id>
+ <remote-id type="cpan-module">Rex::TaskList</remote-id>
+ <remote-id type="cpan-module">Rex::TaskList::Base</remote-id>
+ <remote-id type="cpan-module">Rex::TaskList::Parallel_ForkManager</remote-id>
+ <remote-id type="cpan-module">Rex::Template</remote-id>
+ <remote-id type="cpan-module">Rex::Template::NG</remote-id>
+ <remote-id type="cpan-module">Rex::Test</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_content</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_cron</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_cron_env</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_dir</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_file</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_file_content</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_output</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_output_matching</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_package</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_service_running</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_service_stopped</remote-id>
+ <remote-id type="cpan-module">Rex::Test::Base::has_stat</remote-id>
+ <remote-id type="cpan-module">Rex::Transaction</remote-id>
+ <remote-id type="cpan-module">Rex::User</remote-id>
+ <remote-id type="cpan-module">Rex::User::Base</remote-id>
+ <remote-id type="cpan-module">Rex::User::FreeBSD</remote-id>
+ <remote-id type="cpan-module">Rex::User::Linux</remote-id>
+ <remote-id type="cpan-module">Rex::User::NetBSD</remote-id>
+ <remote-id type="cpan-module">Rex::User::OpenBSD</remote-id>
+ <remote-id type="cpan-module">Rex::User::OpenWrt</remote-id>
+ <remote-id type="cpan-module">Rex::User::SunOS</remote-id>
+ <remote-id type="cpan-module">Rex::Value</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Base</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::create</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::daemon</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::delete</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::destroy</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::info</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::list</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::reboot</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::shutdown</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Docker::start</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::blklist</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::clone</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::create</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::delete</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::destroy</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::dumpxml</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::guestinfo</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::hypervisor</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::iflist</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::import</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::info</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::list</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::option</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::reboot</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::shutdown</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::start</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::status</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::LibVirt::vncdisplay</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::attach</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::copy</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::create</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::destroy</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::info</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::list</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::start</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::Lxc::stop</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::bridge</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::create</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::delete</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::destroy</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::forward_port</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::guestinfo</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::import</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::info</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::list</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::option</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::reboot</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::share_folder</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::shutdown</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::start</remote-id>
+ <remote-id type="cpan-module">Rex::Virtualization::VBox::status</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
new file mode 100644
index 000000000000..6081b372fac1
--- /dev/null
+++ b/app-admin/rex/rex-1.3.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MODULE_AUTHOR=FERKI
+MODULE_A=Rex-${PV}.tar.gz
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-perl/DBI
+ dev-perl/Digest-HMAC
+ dev-perl/Digest-SHA1
+ dev-perl/Expect
+ dev-perl/Hash-Merge
+ dev-perl/IO-String
+ dev-perl/IO-Tty
+ dev-perl/IPC-Shareable
+ dev-perl/JSON-XS
+ dev-perl/List-MoreUtils
+ dev-perl/Net-OpenSSH
+ dev-perl/Net-SFTP-Foreign
+ dev-perl/Parallel-ForkManager
+ dev-perl/Sort-Naturally
+ dev-perl/String-Escape
+ dev-perl/TermReadKey
+ dev-perl/Text-Glob
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl
+ dev-perl/YAML
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Digest-MD5
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-MIME-Base64
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Test-UseAllModules
+ virtual/perl-File-Temp
+ )
+"
+
+SRC_TEST="do"
+
+S="${WORKDIR}/Rex-${PV}"
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..7fdb6b904a41
--- /dev/null
+++ b/app-admin/rex/rex-1.4.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=FERKI
+DIST_NAME=Rex
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-perl/DBI
+ dev-perl/Devel-Caller
+ dev-perl/Digest-HMAC
+ dev-perl/Digest-SHA1
+ dev-perl/Expect
+ dev-perl/Hash-Merge
+ dev-perl/IO-String
+ dev-perl/IO-Tty
+ dev-perl/IPC-Shareable
+ dev-perl/JSON-XS
+ dev-perl/List-MoreUtils
+ dev-perl/Net-OpenSSH
+ dev-perl/Net-SFTP-Foreign
+ dev-perl/Parallel-ForkManager
+ dev-perl/Sort-Naturally
+ dev-perl/String-Escape
+ dev-perl/TermReadKey
+ dev-perl/Test-Deep
+ dev-perl/Text-Glob
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl
+ dev-perl/YAML
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Digest-MD5
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-MIME-Base64
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Test-UseAllModules
+ virtual/perl-File-Temp
+ )
+"
diff --git a/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
new file mode 100644
index 000000000000..acaf671c78bd
--- /dev/null
+++ b/app-admin/rex/rex-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=JFRIED
+DIST_NAME=Rex
+
+inherit perl-module
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-perl/DBI
+ dev-perl/Devel-Caller
+ dev-perl/Digest-HMAC
+ dev-perl/Digest-SHA1
+ dev-perl/Expect
+ dev-perl/Hash-Merge
+ dev-perl/IO-String
+ dev-perl/IO-Tty
+ dev-perl/IPC-Shareable
+ dev-perl/JSON-XS
+ dev-perl/List-MoreUtils
+ dev-perl/Net-OpenSSH
+ dev-perl/Net-SFTP-Foreign
+ dev-perl/Parallel-ForkManager
+ dev-perl/Sort-Naturally
+ dev-perl/String-Escape
+ dev-perl/TermReadKey
+ dev-perl/Test-Deep
+ dev-perl/Text-Glob
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl
+ dev-perl/YAML
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Digest-MD5
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-MIME-Base64
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Test-UseAllModules
+ virtual/perl-File-Temp
+ )
+"
diff --git a/app-admin/rex/rex-1.5.0.ebuild b/app-admin/rex/rex-1.5.0.ebuild
new file mode 100644
index 000000000000..d7c75b836fb6
--- /dev/null
+++ b/app-admin/rex/rex-1.5.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ GITHUB_USER=RexOps
+ GITHUB_REPO=Rex
+ EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+ EGIT_BRANCH="development-1.x"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+ VCS_ECLASS="git-r3"
+else
+ # This is intentional to stop perl-module.eclass doing magic things when it
+ # shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+ # Also prevents perl-module.eclass provisioning SRC_URI
+ DIST_AUTHOR=JFRIED
+ DIST_NAME=Rex
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+ dev-perl/Dist-Zilla
+ dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+ dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+ dev-perl/Dist-Zilla-Plugin-OSPrereqs
+ dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+ dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+ dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+ dev-perl/Data-Validate-IP
+ dev-perl/DBI
+ dev-perl/Devel-Caller
+ dev-perl/Digest-HMAC
+ dev-perl/Digest-SHA1
+ dev-perl/Expect
+ dev-perl/Hash-Merge
+ dev-perl/IO-String
+ dev-perl/IO-Tty
+ dev-perl/IPC-Shareable
+ dev-perl/JSON-XS
+ dev-perl/List-MoreUtils
+ dev-perl/Net-OpenSSH
+ dev-perl/Net-SFTP-Foreign
+ dev-perl/Parallel-ForkManager
+ dev-perl/Sort-Naturally
+ dev-perl/String-Escape
+ dev-perl/TermReadKey
+ dev-perl/Test-Deep
+ dev-perl/Text-Glob
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl
+ dev-perl/YAML
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Digest-MD5
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-MIME-Base64
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Test-UseAllModules
+ virtual/perl-File-Temp
+ )
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+ if [[ $PV == 9999 ]]; then
+ "${VCS_ECLASS}"_src_unpack
+ mkdir -p "${S}" || die "Can't make ${S}"
+ else
+ default
+ fi
+}
+
+dzil_to_distdir() {
+ local dzil_root dest has_missing modname dzil_version
+ dzil_root="$1"
+ dest="$2"
+
+ cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+ dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+ einfo "Generating CPAN dist with ${dzil_version}"
+
+ has_missing=""
+
+ einfo "Checking dzil authordeps"
+ while IFS= read -d $'\n' -r modname; do
+ if [[ -z "${has_missing}" ]]; then
+ has_missing=1
+ eerror "'dzil authordeps' indicates missing build dependencies"
+ eerror "These will prevent building, please report a bug"
+ eerror "Missing:"
+ fi
+ eerror " ${modname}"
+ done < <( dzil authordeps --missing --versions )
+
+ [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+ einfo "Checking dzil build deps"
+ while IFS= read -d $'\n' -r modname; do
+ if [[ -z "${has_missing}" ]]; then
+ has_missing=1
+ ewarn "'dzil listdeps' indicates missing build dependencies"
+ ewarn "These may prevent building, please report a bug if they do"
+ ewarn "Missing:"
+ fi
+ ewarn " ${modname}"
+ done < <( dzil listdeps --missing --versions --author )
+
+ einfo "Generating release"
+ dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+ if [[ ${PV} == 9999 ]]; then
+ # Uses git sources in WORKDIR/rex-git
+ # to generate a CPAN-style tree in ${S}
+ # before letting perl-module.eclass do the rest
+ dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+ fi
+ cd "${S}" || die "Can't enter build dir"
+ perl-module_src_prepare
+}
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
new file mode 100644
index 000000000000..d7c75b836fb6
--- /dev/null
+++ b/app-admin/rex/rex-9999.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ GITHUB_USER=RexOps
+ GITHUB_REPO=Rex
+ EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+ EGIT_BRANCH="development-1.x"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+ VCS_ECLASS="git-r3"
+else
+ # This is intentional to stop perl-module.eclass doing magic things when it
+ # shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+ # Also prevents perl-module.eclass provisioning SRC_URI
+ DIST_AUTHOR=JFRIED
+ DIST_NAME=Rex
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_DEPENDS="
+ dev-perl/Dist-Zilla
+ dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+ dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+ dev-perl/Dist-Zilla-Plugin-OSPrereqs
+ dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+ dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
+ dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+"
+
+RDEPEND="
+ dev-perl/Data-Validate-IP
+ dev-perl/DBI
+ dev-perl/Devel-Caller
+ dev-perl/Digest-HMAC
+ dev-perl/Digest-SHA1
+ dev-perl/Expect
+ dev-perl/Hash-Merge
+ dev-perl/IO-String
+ dev-perl/IO-Tty
+ dev-perl/IPC-Shareable
+ dev-perl/JSON-XS
+ dev-perl/List-MoreUtils
+ dev-perl/Net-OpenSSH
+ dev-perl/Net-SFTP-Foreign
+ dev-perl/Parallel-ForkManager
+ dev-perl/Sort-Naturally
+ dev-perl/String-Escape
+ dev-perl/TermReadKey
+ dev-perl/Test-Deep
+ dev-perl/Text-Glob
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+ dev-perl/libwww-perl
+ dev-perl/YAML
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Digest-MD5
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-MIME-Base64
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Time-HiRes
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-perl/Test-UseAllModules
+ virtual/perl-File-Temp
+ )
+"
+
+[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+ if [[ $PV == 9999 ]]; then
+ "${VCS_ECLASS}"_src_unpack
+ mkdir -p "${S}" || die "Can't make ${S}"
+ else
+ default
+ fi
+}
+
+dzil_to_distdir() {
+ local dzil_root dest has_missing modname dzil_version
+ dzil_root="$1"
+ dest="$2"
+
+ cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+ dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+ einfo "Generating CPAN dist with ${dzil_version}"
+
+ has_missing=""
+
+ einfo "Checking dzil authordeps"
+ while IFS= read -d $'\n' -r modname; do
+ if [[ -z "${has_missing}" ]]; then
+ has_missing=1
+ eerror "'dzil authordeps' indicates missing build dependencies"
+ eerror "These will prevent building, please report a bug"
+ eerror "Missing:"
+ fi
+ eerror " ${modname}"
+ done < <( dzil authordeps --missing --versions )
+
+ [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+ einfo "Checking dzil build deps"
+ while IFS= read -d $'\n' -r modname; do
+ if [[ -z "${has_missing}" ]]; then
+ has_missing=1
+ ewarn "'dzil listdeps' indicates missing build dependencies"
+ ewarn "These may prevent building, please report a bug if they do"
+ ewarn "Missing:"
+ fi
+ ewarn " ${modname}"
+ done < <( dzil listdeps --missing --versions --author )
+
+ einfo "Generating release"
+ dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+ if [[ ${PV} == 9999 ]]; then
+ # Uses git sources in WORKDIR/rex-git
+ # to generate a CPAN-style tree in ${S}
+ # before letting perl-module.eclass do the rest
+ dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+ fi
+ cd "${S}" || die "Can't enter build dir"
+ perl-module_src_prepare
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
new file mode 100644
index 000000000000..b850fbb3e21d
--- /dev/null
+++ b/app-admin/rsyslog/Manifest
@@ -0,0 +1,36 @@
+AUX 8-stable/50-default-r1.conf 1952 SHA256 2ff8a047f14e7fc259c2d09195ced208f27503ca21efba8663df8c2aa05fda1c SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 WHIRLPOOL bb6f12f9874e43702f69d1abb5c656dcbe12c8d81e936eb3d121078ebbdbfa259a45aace60e35a90b0445c9b03682faea4e1a808d3e8c55e01ed62577abeca7c
+AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
+AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256 f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512 231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378 WHIRLPOOL 88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
+AUX 8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch 1982 SHA256 abf1b264e7de3a86c2f6cec86d59496bd865fcce5e691b71c7b2c977bdf7358d SHA512 b426c3eaa2adc2de14e129125ccd630e2fa2132c6ca774f3e18ee784f0622573a95339d901a1b9c2877e8b77d00f8be9f9d17f92769136c356aaab58358d2159 WHIRLPOOL e327d0d8f5e3aab078233324359f42fd21aba2cb65927097acdbbf9dbac296a84fcfad71de228a9b2868f229d7f2260742f4180b677ef2a961a47d81db65a2bb
+AUX 8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch 990 SHA256 f6f8381300e54e5bcc3ef8e125da336996bc2bb36920b20f6062cab49c6f14cb SHA512 95d72879973c9d20c4c0c66e3e065590475d0aae96680a627b05735c8a66b69bf9b9a93888fa6a802e094bf37ac90099c7e6732699d439d44d6c39d461201351 WHIRLPOOL 7273abb4bb9a8387fe031658878c75ffe7bc6edae5ef24a72ab20d643c860238db77bdb6a4b6b04950db131cc0fd9ce168a58477e24349b85d315c84491a24da
+AUX 8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch 1556 SHA256 638f22781452c361ae4021d66bf8faf78767752a62bf16588e310d3fc855753c SHA512 374de4fb9a4e3c3b9e28ff2e5eca48b7744afc9a5ba222508661fdfa30037967b6a2497d0e82266010de27c1a540ebb300c15bf6049a1af9dcf019353c04acdc WHIRLPOOL bad8fc8d88ea42defef922b67cbf0e66706dfd71d01249dbc82e49bfba787056e1e641e58dd2ba22250073aacba8afb8445d5d8610f095a961f47286ea4a7562
+AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 SHA256 e7816064d62366166b96850cdf34d9cde8f4a77495a7f9a6aad331bcf987996a SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4 WHIRLPOOL b6dd892f7525b05aff42982b3e697767c5053b36fd9080fe8fbddb6584145bfab5e96b5260145c65f438a2025cbfce0bfcf2e88a8b6272c24661371b26d37b90
+AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
+AUX 8-stable/rsyslog.confd-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
+AUX 8-stable/rsyslog.initd-r1 1758 SHA256 93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265 WHIRLPOOL 14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
+AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
+DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 WHIRLPOOL 3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
+DIST rsyslog-8.24.0.tar.gz 2374240 SHA256 37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d WHIRLPOOL c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
+DIST rsyslog-8.25.0.tar.gz 2386720 SHA256 c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f WHIRLPOOL 2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01
+DIST rsyslog-8.26.0.tar.gz 2393148 SHA256 637d43c4384f8b96dda873a0b8384045f72cb43139808dadd9e0a94dccf25916 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 WHIRLPOOL dc267dfdbbcfe5b5354d200a2e337dada22a0aa943e71998e1462bc23d38bb8e3f2b16162108831f12cfa3eec0d462d40a5e6a598f26b2edcef7c71ad56a1c3f
+DIST rsyslog-8.27.0.tar.gz 2435123 SHA256 02aefbba59324a6d8b70036a67686bed5f0c7be4ced62c039af6ee694cb5b1fd SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 WHIRLPOOL 1ece4fa5bd453e1bcd4da9501fa93be7f3ea0eb87f7e60bb788d7c90c740566cc07351eb2d7730ac081b2564bde9a79dff7ac1b5012326cc8b0331539b2b5b01
+DIST rsyslog-8.28.0.tar.gz 2471122 SHA256 4ca5405908d612d45da700e36856430510875518eb8028d296d1ee4d2c44678e SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 WHIRLPOOL b3c07391b9730498aff9ca30a407bd18d5faea07ec37d389dc59daef595318aa11e66fa153a452f48a55df4a2c15789569b845a831266d702b4801b39856a208
+DIST rsyslog-8.29.0.tar.gz 2447907 SHA256 220ba30b5afb0f3ddb328613fea7aa3966b01e4d0c52d6de9ab27b0858f19738 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 WHIRLPOOL e82a07b18481b49a2b41ba2fc40b3d0715ebdfec7508592b09f154c10ce36cf079714683e1deb94f13ebbe20fbe242cd695d547e6dbb23ec6939ccdb67540173
+DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e WHIRLPOOL fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
+DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256 f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b WHIRLPOOL e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
+DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256 3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 WHIRLPOOL 8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
+DIST rsyslog-docs-8.26.0.tar.gz 4381345 SHA256 4d3b46e6c06fecbd4100fad118c22569e6b0d23b0f5cfb1fbcf501bfc9d115bb SHA512 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8 WHIRLPOOL a01c661bea94a38af755803d385250d8f394064c2f1450c5a8b2b0e9e6879565219c84ded70c40300d2bbf524a30bf152bc5502f65917d757b0552920f6a7cd8
+DIST rsyslog-docs-8.27.0.tar.gz 4411093 SHA256 f799eba43ff73c14865cbc3f7105d54afec021430827e6d6da7b51f45cfbedb0 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c WHIRLPOOL 1a7eeadc0667580ab14ae5857fc61f7eb5553bad00d7b59ed3e70aa3a2f75550872a110c6149b4bd69778c990ec3c57e625cc08a716792731d456d875e8a9e8b
+DIST rsyslog-docs-8.28.0.tar.gz 4424901 SHA256 f6c41f7c3fca369dd28a72133b03693ad5c37252375ecadc6184ff1a954764db SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d WHIRLPOOL f6636ba7196c689e42651ac9c847b05f3eafdbe87186fad478c47d55f2856e5b200d2871612ca046c6d9c06ad2d80838ad226510ba59a3f2cfe234626ca8c75f
+DIST rsyslog-docs-8.29.0.tar.gz 4473644 SHA256 ca3f6a11a165221b4e5e189d9b86ea146245d7ad892758ef9c543db73a914663 SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc WHIRLPOOL 74f4fccfa14e44a574590110bf3d0591555b6bb0685fd65a575b002e503d61996a593d51dbedbc9ff390d9bef1942d1b3fa55e7eb334a6bf5cabb3c2c9a2e5a1
+EBUILD rsyslog-8.19.0.ebuild 12240 SHA256 485642442ce4c0d13b1cbe56928b26d41977a579653d26bd20b9eae322a3ed64 SHA512 7363c435c65394abda4a4f576e8433d8038a6e420534f3bb0419477ab3b4e3ab179f53bae016b372522884ac12eab467d3ece7db15303b3cc33d954f963fda8b WHIRLPOOL eaea1b9de85218998c0b6f57a32bbeaa43fc66879302955f259aed4c2491d5f61c3c57c9d81f2d7503c4e43967d7b15cab45ac88319f0b1ae6390c6f6820498a
+EBUILD rsyslog-8.24.0-r2.ebuild 12396 SHA256 b49cde5ede26eeb385c416dd1975a4f881592e25b49d6f8d6d164d4038ce43ca SHA512 2acbc370ca468dcfc021b66a31b2617dc5093b518c5c486487e306548445c1bb472dd48458a3171a99f1bc82276bed39ccaff5be31603191d261d11c2cd521c9 WHIRLPOOL 1912d228665088ae3f779cd65f21ec3da77a5b07289889e9db31939add614dacd7a0f7fc5fcf28e3a03751a26fb5639cf5f64bac4c5aa7c54816437d5636ca32
+EBUILD rsyslog-8.25.0-r2.ebuild 12487 SHA256 8a65005fae63a8f3932ca2a573b2ac1e3ec57f08c99c71a7f1113c9162b4305f SHA512 1a73a37139e8af1017f7cc53bbd35238130cfa30a7e3236f304a4d079931d0304fbde4f026254a951253c4060bcb6e774b6643f42ad14ef431b697833450f521 WHIRLPOOL 5deb0ca763aafd824fadd75e880e8ec3d9d3ede11390de6ca3ac223a33f11c18fdf3393120ad377eebc860302745f76be3f9ef6d217e7a5af620168e7cab2e21
+EBUILD rsyslog-8.26.0-r1.ebuild 12480 SHA256 2022a610153a4bdadeb8507a9f2b14601add87ac09598aa8d916ecadca83d695 SHA512 8036baf097b54006d6350a52ab08a222a0896a955c48d5b984f5f284b5603ebcf732a58493cebfa1c8469b7a1f9cbf8bf42d90e44454488c206873243af3630e WHIRLPOOL 6917355060ba7743146abfc4231b64f77386f89a9261addc56cfd15cf9368bd7baa1e3b8597b647039e2ef315ed441a3ab69687b1303be3aceadb7bb8a51a46e
+EBUILD rsyslog-8.27.0-r1.ebuild 12736 SHA256 f3b51b5dc46dfffa8327975ab605e68e96436bcb87eda197a975502fd0eaf4e0 SHA512 497c4df7601980431f093bdbe9e95513374ba171565acc7fe8bb4dda40142ffea1443a4d10d79ae938c423e03879286a1a550abde5be919bb5d6032486425b13 WHIRLPOOL e0cdbd8c6b5dc9bfcb1d31067221596ee541850031cf6caee4b889a7880557585b8dcbf414917026d5cb1dbd8f901dc25d12ac6cb1bebb321d8f575a074e7ed7
+EBUILD rsyslog-8.28.0.ebuild 12505 SHA256 03d12b0598abadc10bbf23d23547e3cb9477f0adadb42c8756963adc8a2aa9a1 SHA512 d43cd51fa3448d9d58c86cc52e88ba76e595b98aaa095491900acc1d2a2a50b30b3320bcbdb26cba13ea1341db5d4667e7ba67efc6d19294fcd12c4e22e33297 WHIRLPOOL e859cbae3d6a81f72d4f1352313372edf8d2764aff72a1d62d250bc8cc9a3539bfaee025cd8944963fe8245f14d0b970c33280ef673bb14df8caa3363cdbbfcd
+EBUILD rsyslog-8.29.0.ebuild 12527 SHA256 b4f9ecf2fefe06fb87712349a4a23fe062c341552a99ce8ce0b03bb4b807aeae SHA512 8f7593cca44eaa50929e03978dd9f066cc73aa9f725ce36585d274da925e0cc9a6a8791ab199c38b496e857335b8359c8cf19cc9ea3fae2ced4267ae69b05ef8 WHIRLPOOL 3673a3205fb529194b6eb2e298583ffd88b7197afcf0f68217b81cf430f05e891e25a5a3a8b01ff470519b570f4997fbff0ea9bdc2350954d5e09a20f45b0a4b
+MISC ChangeLog 15244 SHA256 a26cf4c30cc55942a8a38d4eaebff12bd75bc5f84f5e9ee1fc25f0d58cfa2c9c SHA512 b487696f043a00785747a8c6c5e9bd70155178234dccfdb67f884f7d80bc0edc9653d0e2e731c19922c930eeebeab2857dc86fb2dfdf1c7f45b08728f8a33e7f WHIRLPOOL 371d33b0bb00b8a7f4bd0593847605fe57b9fee280b82123558e1422383a95c11deb275673d7e1647f229b4089b87cea34400d7d57388aab712df6c057ae593b
+MISC ChangeLog-2015 26836 SHA256 00f62ec24e67a62edb77fa4d17812f6d736ac8ef3a20dce29bb2b78e575ece01 SHA512 bb52b5ffdfcbe0d1fc51a05dcacc042ff876b9669a875eafdd8e4c240c28a2902ef5200c4f8d31815ca45440f602fe85933d059b55b4f940e4b624c8340a6243 WHIRLPOOL 3f9e1c0cede4a17dbe03f1873fecbf0549a863800a80938723dd86214854f0e47c8d092c1ae381ee82644869ef72dd8915f1ceac5dc4676986128dca0e583bbc
+MISC metadata.xml 3335 SHA256 e4b519c8c8cf1d559aeb5151eca28d5057174d3bfcef2d74985c0ae20ea5adc7 SHA512 bfa3a8fbb502f6fdc110e8aa6b7394449329c29a63fc71c615317c97deb4e48f6e9f952bf492cc96be15fffb514f281a0d19de697bfddab4d4c7acf3c535c6a1 WHIRLPOOL 5ef1bccf69bbc7c5fd7dc88e8850e54fac881c24abfd07b05ca69e7213914d639a6254ae583a6436dfb4d784fe27b4fbfee6f1b9aeebccc7afb276ffb0cf4f93
diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
new file mode 100644
index 000000000000..920c214ff6ca
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default-r1.conf
@@ -0,0 +1,107 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+ name="action_auth"
+ type="omfile"
+ File="/var/log/auth.log"
+ FileCreateMode="0600"
+ FileOwner="root"
+ FileGroup="adm"
+ Sync="off"
+)
+
+cron.* action(
+ name="action_cron"
+ type="omfile"
+ File="/var/log/cron.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+daemon.* action(
+ name="action_daemon"
+ type="omfile"
+ File="/var/log/daemon.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+kern.* action(
+ name="action_kern"
+ type="omfile"
+ File="/var/log/kern.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+lpr.* action(
+ name="action_lpr"
+ type="omfile"
+ File="/var/log/lpr.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+mail.* action(
+ name="action_mail"
+ type="omfile"
+ File="/var/log/mail.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+news.* action(
+ name="action_news"
+ type="omfile"
+ File="/var/log/news.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+user.* action(
+ name="action_user"
+ type="omfile"
+ File="/var/log/user.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+ name="action_debug"
+ type="omfile"
+ File="/var/log/debug.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+ name="action_messages"
+ type="omfile"
+ File="/var/log/messages"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+# name="action_syslog"
+# type="omfile"
+# File="/var/log/syslog"
+# FileOwner="root"
+# FileGroup="adm"
+#)
+
+*.emerg action(
+ name="action_emerge"
+ type="omusrmsg"
+ Users="*"
+ action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/50-default.conf b/app-admin/rsyslog/files/8-stable/50-default.conf
new file mode 100644
index 000000000000..9ae8578215bb
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default.conf
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+ type="omfile"
+ File="/var/log/auth.log"
+ FileCreateMode="0600"
+ FileOwner="root"
+ FileGroup="adm"
+ Sync="off"
+)
+
+cron.* action(
+ type="omfile"
+ File="/var/log/cron.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+daemon.* action(
+ type="omfile"
+ File="/var/log/daemon.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+kern.* action(
+ type="omfile"
+ File="/var/log/kern.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+lpr.* action(
+ type="omfile"
+ File="/var/log/lpr.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+mail.* action(
+ type="omfile"
+ File="/var/log/mail.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+news.* action(
+ type="omfile"
+ File="/var/log/news.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+user.* action(
+ type="omfile"
+ File="/var/log/user.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+ type="omfile"
+ File="/var/log/debug.log"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+ type="omfile"
+ File="/var/log/messages"
+ FileOwner="root"
+ FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+# type="omfile"
+# File="/var/log/syslog"
+# FileOwner="root"
+# FileGroup="adm"
+#)
+
+*.emerg action(
+ type="omusrmsg"
+ Users="*"
+ action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo b/app-admin/rsyslog/files/8-stable/README.gentoo
new file mode 100644
index 000000000000..9f0666c86b0a
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/README.gentoo
@@ -0,0 +1,36 @@
+Introduction
+============
+
+Since rsyslog version 7.6 we are shipping a new default Gentoo
+configuration. See bug #501982 to learn more about what we were trying to
+achieve by rewriting the entire configuration.
+
+
+Important changes
+=================
+
+1. "/var/log/syslog" log file is now deprecated
+
+ Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
+ longer being written per default. We are considering this file as
+ deprecated/obsolet for the typical user/system.
+ The content from this log file is still availble through other
+ (dedicated) log files, see
+
+ - /var/log/cron.log
+ - /var/log/daemon.log
+ - /var/log/mail.log
+ - /var/log/messages
+
+ If you really need the old "/var/log/syslog" log file, all you have to
+ do is uncommenting the corresponding configuration directive in
+ "/etc/rsyslog.d/50-default.conf".
+
+ If you do so, don't forget to re-enable log rotation in
+ "/etc/logrotate.d/rsyslog", too.
+
+
+2. An additional input socket in "/var/empty/dev/log" (default chroot
+ location) will be created per default
+
+ See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch
new file mode 100644
index 000000000000..a03a6562722a
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch
@@ -0,0 +1,160 @@
+Patch to allow building of tcpflood without librelp
+
+Cherry pick of
+https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f
+https://github.com/rsyslog/rsyslog/pull/1493
+
+
+Gentoo-Bug: https://bugs.gentoo.org/613264
+Gentoo-Bug: https://bugs.gentoo.org/614424
+
+diff -u b/tests/tcpflood.c b/tests/tcpflood.c
+--- b/tests/tcpflood.c
++++ b/tests/tcpflood.c
+@@ -96,7 +96,9 @@
+ #include <string.h>
+ #include <netinet/in.h>
+ #include <pthread.h>
++#ifdef ENABLE_RELP
+ #include <librelp.h>
++#endif
+ #include <sys/resource.h>
+ #include <sys/time.h>
+ #include <errno.h>
+@@ -149,7 +151,9 @@
+ static int numConnections = 1; /* number of connections to create */
+ static int softLimitConnections = 0; /* soft connection limit, see -c option description */
+ static int *sockArray; /* array of sockets to use */
++#ifdef ENABLE_RELP
+ static relpClt_t **relpCltArray; /* array of sockets to use */
++#endif
+ static int msgNum = 0; /* initial message number to start with */
+ static int bShowProgress = 1; /* show progress messages */
+ static int bSilent = 0; /* completely silent operation */
+@@ -216,6 +220,7 @@
+ static int sendTLS(int i, char *buf, int lenBuf);
+ static void closeTLSSess(int __attribute__((unused)) i);
+
++#ifdef ENABLE_RELP
+ /* RELP subsystem */
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wformat-security"
+@@ -235,6 +240,7 @@
+ CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog",
+ eRelpCmdState_Required));
+ }
++#endif /* #ifdef ENABLE_RELP */
+
+ /* prepare send subsystem for UDP send */
+ static int
+@@ -273,6 +279,7 @@
+ port = targetPort;
+ }
+ if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ relpRetVal relp_r;
+ relpClt_t *relpClt;
+ char relpPort[16];
+@@ -286,6 +293,7 @@
+ return(1);
+ }
+ *fd = 1; /* mimic "all ok" state */
++ #endif
+ } else { /* TCP, with or without TLS */
+ if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
+ perror("\nsocket()");
+@@ -336,8 +344,10 @@
+ sessArray = calloc(numConnections, sizeof(gnutls_session_t));
+ # endif
+ sockArray = calloc(numConnections, sizeof(int));
++ #ifdef ENABLE_RELP
+ if(transport == TP_RELP_PLAIN)
+ relpCltArray = calloc(numConnections, sizeof(relpClt_t*));
++ #endif
+ for(i = 0 ; i < numConnections ; ++i) {
+ if(i % 10 == 0) {
+ if(bShowProgress)
+@@ -356,8 +366,10 @@
+ * at least something.
+ */
+ if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ CHKRELP(relpEngineCltDestruct(pRelpEngine,
+ relpCltArray+i));
++ #endif
+ } else { /* TCP and TLS modes */
+ if(transport == TP_TLS)
+ closeTLSSess(i);
+@@ -403,14 +415,13 @@
+
+ if(bShowProgress)
+ if(write(1, " close connections", sizeof(" close connections")-1)){}
+- //if(transport == TP_RELP_PLAIN)
+- //sleep(10); /* we need to let librelp settle a bit */
+ for(i = 0 ; i < numConnections ; ++i) {
+ if(i % 10 == 0 && bShowProgress) {
+ lenMsg = sprintf(msgBuf, "\r%5.5d", i);
+ if(write(1, msgBuf, lenMsg)){}
+ }
+ if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ relpRetVal relpr;
+ if(sockArray[i] != -1) {
+ relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i);
+@@ -419,6 +430,7 @@
+ }
+ sockArray[i] = -1;
+ }
++ #endif
+ } else { /* TCP and TLS modes */
+ if(sockArray[i] != -1) {
+ /* we try to not overrun the receiver by trying to flush buffers
+@@ -610,6 +622,7 @@
+ offsSendBuf = lenBuf;
+ }
+ } else if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ relpRetVal relp_ret;
+ if(sockArray[socknum] == -1) {
+ /* connection was dropped, need to re-establish */
+@@ -627,6 +640,7 @@
+ printf("\nrelpCltSendSyslog() failed with relp error code %d\n",
+ relp_ret);
+ }
++ #endif
+ }
+ if(lenSend != lenBuf) {
+ printf("\r%5.5d\n", i);
+@@ -1106,7 +1120,9 @@
+ transport = TP_RELP_PLAIN;
+ # else
+ fprintf(stderr, "compiled without RELP support: "
+- "\"-Trelp-plain\" not supported!\n");
++ "\"-Trelp-plain\" not supported!\n"
++ "(add --enable-relp to ./configure options "
++ "if desired)\n");
+ exit(1);
+ # endif
+ } else {
+@@ -1168,7 +1184,9 @@
+ if(transport == TP_TLS) {
+ initTLS();
+ } else if(transport == TP_RELP_PLAIN) {
++ #ifdef ENABLE_RELP
+ initRELP_PLAIN();
++ #endif
+ }
+
+ if(openConnections() != 0) {
+@@ -1183,9 +1201,11 @@
+
+ closeConnections(); /* this is important so that we do not finish too early! */
+
++ #ifdef ENABLE_RELP
+ if(transport == TP_RELP_PLAIN) {
+ CHKRELP(relpEngineDestruct(&pRelpEngine));
+ }
++ #endif
+
+ if(nConnDrops > 0 && !bSilent)
+ printf("-D option initiated %ld connection closures\n", nConnDrops);
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
new file mode 100644
index 000000000000..b285798bfe45
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch
@@ -0,0 +1,39 @@
+--- a/contrib/imzmq3/imzmq3.c
++++ b/contrib/imzmq3/imzmq3.c
+@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) {
+
+ /* Do the bind/connect... */
+ if (info->action==ACTION_CONNECT) {
+- rv = zsocket_connect(*sock, info->description);
++ rv = zsocket_connect(*sock, "%s", info->description);
+ if (rv == -1) {
+ errmsg.LogError(0,
+ RS_RET_INVALID_PARAMS,
+@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) {
+ }
+ DBGPRINTF("imzmq3: connect for %s successful\n",info->description);
+ } else {
+- rv = zsocket_bind(*sock, info->description);
++ rv = zsocket_bind(*sock, "%s", info->description);
+ if (rv == -1) {
+ errmsg.LogError(0,
+ RS_RET_INVALID_PARAMS,
+--- a/contrib/omzmq3/omzmq3.c
++++ b/contrib/omzmq3/omzmq3.c
+@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) {
+ if (pData->action == ACTION_BIND) {
+ /* bind asserts, so no need to test return val here
+ which isn't the greatest api -- oh well */
+- if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) {
++ if(-1 == zsocket_bind(pData->socket, "%s", (char*)pData->description)) {
+ errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for %s: %s",
+ pData->description, zmq_strerror(errno));
+ ABORT_FINALIZE(RS_RET_NO_ERRCODE);
+ }
+ DBGPRINTF("omzmq3: bind to %s successful\n",pData->description);
+ } else {
+- if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) {
++ if(-1 == zsocket_connect(pData->socket, "%s", (char*)pData->description)) {
+ errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for %s: %s",
+ pData->description, zmq_strerror(errno));
+ ABORT_FINALIZE(RS_RET_NO_ERRCODE);
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
new file mode 100644
index 000000000000..a9470ccf4b60
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
@@ -0,0 +1,27 @@
+From 1a7d3a088969b47798bc1da712ca2772f91a7c02 Mon Sep 17 00:00:00 2001
+From: Jiri Vymazal <jvymazal@redhat.com>
+Date: Wed, 31 May 2017 16:26:56 +0200
+Subject: [PATCH] Ignoring NONAME error from getaddrinfo so we have hostname
+ set even without working network
+
+---
+ runtime/net.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/net.c b/runtime/net.c
+index 2d8de9429..edffc677a 100644
+--- a/runtime/net.c
++++ b/runtime/net.c
+@@ -1188,7 +1188,11 @@ getLocalHostname(uchar **ppName)
+ memset(&flags, 0, sizeof(flags));
+ flags.ai_flags = AI_CANONNAME;
+ int error = getaddrinfo((char*)hnbuf, NULL, &flags, &res);
+- if (error != 0) {
++ if (error != 0 &&
++ error != EAI_NONAME && error != EAI_AGAIN && error != EAI_FAIL) {
++ /* If we get one of errors above, network is probably
++ * not working yet, so we fall back to local hostname below
++ */
+ dbgprintf("getaddrinfo: %s\n", gai_strerror(error));
+ ABORT_FINALIZE(RS_RET_IO_ERROR);
+ }
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
new file mode 100644
index 000000000000..366c0afaca84
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch
@@ -0,0 +1,43 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes)
+
+ # omkafka works with older library
+ if test "x$enable_omkafka" = "xyes"; then
+- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [
++ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+@@ -1708,12 +1710,13 @@ fi
+
+ # imkafka needs newer library
+ if test "x$enable_imkafka" = "xyes"; then
+- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1)
+- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
+- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
+- LIBRDKAFKA_LIBS=-lrdkafka
+- ], [
+- AC_MSG_ERROR([could not find rdkafka library])
++ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [
++ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [
++ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka])
++ LIBRDKAFKA_LIBS=-lrdkafka
++ ], [
++ AC_MSG_ERROR([could not find rdkafka library])
++ ])
+ ])
+ AC_CHECK_HEADERS([librdkafka/rdkafka.h])
+ fi
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
new file mode 100644
index 000000000000..6ef7e6426287
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@@ -0,0 +1,23 @@
+https://github.com/rsyslog/rsyslog/pull/1791
+---
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
+ mmnormalize_processing_test2.sh \
+ mmnormalize_processing_test3.sh \
+ mmnormalize_processing_test4.sh
+-endif
+
+ if ENABLE_IMPTCP
+ TESTS += \
+@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
+ TESTS += \
+ mmnormalize_regex.sh
+ endif
++endif
+
+ if ENABLE_MMJSONPARSE
+ TESTS += \
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/8-stable/rsyslog.conf
new file mode 100644
index 000000000000..da484598a652
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.conf
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+#
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+#
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+#
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+ load="builtin:omfile"
+ Template="RSYSLOG_TraditionalFileFormat"
+ FileCreateMode="0644"
+ DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
new file mode 100644
index 000000000000..da48c01cd407
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+#RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+#RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+#RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+#RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+#RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
new file mode 100644
index 000000000000..7d7aa4bc9313
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+RSYSLOG_SSDARGS=${RSYSLOG_SSDARGS:-"--wait 1000"}
+RSYSLOG_TERMTIMEOUT=${RSYSLOG_TERMTIMEOUT:-"TERM/60/KILL/5"}
+RSYSLOG_OPTS=${RSYSLOG_OPTS:-""}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f \"${RSYSLOG_CONFIGFILE}\" -i \"${RSYSLOG_PIDFILE}\""
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files="${RSYSLOG_CONFIGFILE}"
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+ need clock hostname localmount
+ provide logger
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ if [ -f "${RSYSLOG_PIDFILE}" ]; then
+ vebegin "Removing stale PID file"
+ rm --force "${RSYSLOG_PIDFILE}"
+ veend $?
+ fi
+}
+
+configtest() {
+ local _command_args="-N 999 -f \"${RSYSLOG_CONFIGFILE}\""
+ local _retval=0
+
+ ebegin "Checking rsyslogd's configuration"
+ eval ${command} ${_command_args} >/dev/null 2>&1
+ _retval=$?
+
+ if [ ${_retval} -ne 0 ]; then
+ eval ${command} ${_command_args}
+ fi
+
+ eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+ ebegin "Re-opening rsyslogd logs"
+ start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+ eend $?
+}
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
new file mode 100644
index 000000000000..1eae30e0d741
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+# rotate 7
+# daily
+# missingok
+# notifempty
+# delaycompress
+# compress
+# postrotate
+# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+# endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+ rotate 4
+ weekly
+ missingok
+ notifempty
+ compress
+ delaycompress
+ sharedscripts
+ postrotate
+ test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+ endscript
+}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
new file mode 100644
index 000000000000..855ee265e268
--- /dev/null
+++ b/app-admin/rsyslog/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>whissi@gentoo.org</email>
+ <name>Thomas Deutschmann</name>
+ <description>Primary Maintainer</description>
+ </maintainer>
+ <use>
+ <flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
+ <flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
+ <flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
+ <flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
+ <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
+ <flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
+ <flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
+ <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag>
+ <flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
+ <flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
+ <flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
+ <flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+ <flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
+ <flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
+ <flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
+ <flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
+ <flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
+ <flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
+ <flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
+ <flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
+ <flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
+ <flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
+ <flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
+ <flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag>
+ <flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
+ <flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
+ <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-8.19.0.ebuild b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
new file mode 100644
index 000000000000..931d37209cb5
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
@@ -0,0 +1,444 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="amd64 arm ~arm64 hppa x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.2:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.1:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.5:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
new file mode 100644
index 000000000000..988544873b7a
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
@@ -0,0 +1,448 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="amd64 arm ~arm64 hppa x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.1:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.12:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
new file mode 100644
index 000000000000..d6c48ae2a638
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
@@ -0,0 +1,450 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.1:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.12:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
new file mode 100644
index 000000000000..fe40592d194f
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild
@@ -0,0 +1,452 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="amd64 ~arm ~arm64 hppa x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=(
+ "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
+ )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.12:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
new file mode 100644
index 000000000000..129f495b9e7c
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=(
+ "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch
+ )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.12:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
new file mode 100644
index 000000000000..dc74da9df9b0
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.14:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
new file mode 100644
index 000000000000..d8b4b91b0336
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
@@ -0,0 +1,451 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils linux-info systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ MY_PV=${PV%_rc*}
+ MY_FILENAME="${PN}-${PV}.tar.gz"
+ MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+
+ # Upstream URL schema:
+ # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+ # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+ # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+ MY_URL_PREFIX=
+ if [[ ${PV} = *_rc* ]]; then
+ _tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+ _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+ if [[ ${_tmp_suffix} = *rc* ]]; then
+ MY_URL_PREFIX="${_tmp_suffix}/"
+ fi
+
+ # Cleaning up temporary variables
+ unset _tmp_last_index
+ unset _tmp_suffix
+ else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ fi
+
+ SRC_URI="
+ http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+ doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+ "
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.3:=
+ >=dev-libs/libestr-0.1.9
+ >=dev-libs/liblogging-1.0.1:=[stdlog]
+ >=sys-libs/zlib-1.2.5
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+ mysql? ( virtual/mysql )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.14:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? ( >=net-libs/gnutls-2.12.23:0= )
+ systemd? ( >=sys-apps/systemd-208 )
+ uuid? ( sys-apps/util-linux:0= )
+ zeromq? (
+ >=net-libs/zeromq-4.1.1:=
+ >=net-libs/czmq-3.0.0
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? ( sys-libs/libfaketime )"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${MY_FILENAME_DOCS}
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ $(use_enable test testbench)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug rtinst)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable ssl gnutls)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq imzmq3)
+ $(use_enable zeromq omczmq)
+ $(use_enable zeromq omzmq3)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/${BRANCH}/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sagan-rules/Manifest b/app-admin/sagan-rules/Manifest
new file mode 100644
index 000000000000..ff306518dc13
--- /dev/null
+++ b/app-admin/sagan-rules/Manifest
@@ -0,0 +1,8 @@
+DIST sagan-rules-06172014.tar.gz 273531 SHA256 c20a37c8b555ff424a68120a07260bcd2ff1c90c09c0372c60149f42cfaedd4f SHA512 824e3b159fae10876f59e50b1c751e509b04e6ee347e74afb19c1a5f935fe41b8d8874d6379bea477fea5a9c5754b1917f9b78da3009203fe23a0c600e03da23 WHIRLPOOL f49e44184ee75b0f1b0ae6ca581750989faaa6da2cb107c518eb2fe550064b2d97c58d2cbcbe78fbac34292296ee870743bf8ba308030832d3a166c2c7d31e53
+DIST sagan-rules-20130430.tar.gz 240975 SHA256 58077c7ce1e47bb32965336afee3d372108325da67dc2f4a562a9850d986415c SHA512 bc31f043a0e14542665d9e1469d85427fea395bb86b833200dfa3c8f4cbd2591f6268f26a478c768ad8784aeb1a102e01e3bbfc63636a0384b2092193bbb9bdb WHIRLPOOL d460b320b415c71f48011406ee3cde1967b46249d5e09a11343fa028a2b1fe103c6775a2eaa485897d834b3727cbc41a90092471096b39e7a121db8a1de806e4
+EBUILD sagan-rules-20130430.ebuild 546 SHA256 804e04150feb992a45162bbc87534a396a0f86c5b659e9d244f8c5ce78d7e9b2 SHA512 2bbe1da5d81d9d918763cf80ff12756473a6d640d2a1aef8d9b131dec8e75e035b38f45a140273e40e1cc93e6bd5a7f98e4413081c3dbeb1b0d446ca86a3a1fa WHIRLPOOL b963d0aa2ef9a6ad731ae0a8af3512ca214feb50ba883a158a1427b335f453235c9529d2f35de882a9098648ef3136052755078766816170ec5cff08e3abb52b
+EBUILD sagan-rules-20140617.ebuild 558 SHA256 c183c6df83bfcce12317a140c057313661281063d219f055501ce7370b769ee4 SHA512 2f550cb807403e442c5406ba6e1576a45f5f635f33d2e33a7e1652b18769cdcd1348f56c42eb083172ebb0a2fdbd17e33d7331069ee18f46ef153a4f41cef892 WHIRLPOOL 8e4aa0789a60eb5f2f6cd9bef6b70bd932fa23e8af9bb7ef91d7bb54d8e970752405160b6ea688beb3b50f31a60080f68a06b0bc2c9b280ec24064a507106c7d
+EBUILD sagan-rules-99999999.ebuild 535 SHA256 681815a894fff17eb3daf3c0c7cdcf5c7b772b489e21f3a46ddbc86ab588e494 SHA512 facdce8702223ca1319ee7bf7f87b981145b9f58c440c0a1a321bcf6d218b08c46499cd6f669f15d75d19e7ea421f9fef9281596df022d5a08952c6ba9a795b3 WHIRLPOOL 024f24af82fdc695115fc2bc5a0d4a32c555943595f7961fbae5398657aa3a73efeca2270940677601fa4e930adf946b04cf0410b2166b03a5c4a2852553e57c
+MISC ChangeLog 3166 SHA256 9b60b520934df05d3c70bf083b6111f97894935737bb44933c76011efb928a52 SHA512 a582a4ccad4d951ea64674cb381f3620d79dc8bb72d06e579e05ddf8cbed739eb3bc3c838286e21d6d6bf9ed6af8699812d09ce457ecaba6b938085f96c4b85c WHIRLPOOL e235e4b38d947ed5709b4d93132e012014b4eeb49eaaadf2a11a1cd0d920b6881c45e186e63bafe9bf189d6ead37775ab9a9d59926cebe7f2185f7cd058056ed
+MISC ChangeLog-2015 3473 SHA256 8ac0443306708cb8d87864205843a92b2ead3acbe1d55fb0d29b39e7a95ff156 SHA512 037cd74b318f336542f5d9c13149249aac2eeb5079211f4ff5f71c8a9f8f18af83c40b7852a64cf0a359eabf14def7e37620f7b026b7aa2f835033b6b8b6edf9 WHIRLPOOL 983110a37ffebab4ac065c2fa4d3943cf61252e9a8df7ed7f816b029f6119c1d5f56b083632e4d9b2f2edcc02d16ab6eba119c65859e9920c1549085b8eeaadd
+MISC metadata.xml 328 SHA256 1244d3f56e7beb99ebd0ff3f5ef010394076fd1f20e49102aef85637c2311ef6 SHA512 ae3c3a6eaa10ad3bc7c9d09fbbb69ad43fc9d35a3420eaea4c3615a9b788367b43defe9015002efc525891d4ae57181f45614ef876d179e992374776df6f8f28 WHIRLPOOL 5a690ae661cf51bba6b30e5bcc3dd3f2e3038246d05d015a5c288122998a3e1f91f89d39de433f37f68de7ec221fc7c853f9360398ec0efd2b386602bdce296c
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
new file mode 100644
index 000000000000..2b45a40b3fb6
--- /dev/null
+++ b/app-admin/sagan-rules/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>maksbotan@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/sagan-rules/sagan-rules-20130430.ebuild b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
new file mode 100644
index 000000000000..e15ff4d31686
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+SRC_URI="https://dev.gentoo.org/~maksbotan/sagan/sagan-rules-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+S=${WORKDIR}/rules
+
+src_install() {
+ insinto /etc/sagan-rules
+ doins ./*.config
+ doins ./*rules
+ if use lognorm ; then
+ doins ./*normalize.rulebase
+ fi
+}
diff --git a/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
new file mode 100644
index 000000000000..b443e4c761dc
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+SRC_URI="http://sagan.quadrantsec.com/rules/sagan-rules-06172014.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+S=${WORKDIR}/rules
+
+src_install() {
+ insinto /etc/sagan-rules
+ doins ./*.config
+ doins ./*rules
+ doins ./*map
+ if use lognorm ; then
+ doins ./*normalize.rulebase
+ fi
+}
diff --git a/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
new file mode 100644
index 000000000000..c26a05f9cc11
--- /dev/null
+++ b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit git-2
+
+DESCRIPTION="Rules for Sagan log analyzer"
+HOMEPAGE="http://sagan.softwink.com/"
+EGIT_REPO_URI="https://github.com/beave/sagan-rules.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="+lognorm"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+PDEPEND="app-admin/sagan"
+
+S="${WORKDIR}"/rules
+
+src_install() {
+ insinto /etc/sagan-rules
+ doins ./*.config
+ doins ./*rules
+ if use lognorm; then
+ doins ./*normalize.rulebase
+ fi
+}
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
new file mode 100644
index 000000000000..e0eb8b2cf6e7
--- /dev/null
+++ b/app-admin/sagan/Manifest
@@ -0,0 +1,12 @@
+AUX mysql_check.patch 944 SHA256 61d570ffb48659837adaa61d76c1d7e61f4bc42910f8bf814153b911f061fde9 SHA512 5758990b9c85a73d38c00d03a0ff9812e3ffe18a8831daebc01329c2db9253d75467b341aeffe563adcbd4fc907c510991ccf2e9bd8d9c6e7b6b353e7d2a4412 WHIRLPOOL 4a76da71cdca1eb14b30823f33f56216f443b72d8d74f1271c8ec123fec3285c69e103fc7261d59abfc040ef2ecdc479c68911d3518997742d7e71dc9426ca4e
+AUX sagan-1.0.0-liblognorm-json-c.patch 2840 SHA256 5ccefeb90b357f58064f7095b7b74e63938e01d8ae235cde523e14754c9b36d8 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9 WHIRLPOOL 98eb3b5c8876fd8c4acf9cb796961125886bba400542b2555e9e73d6797c2be07d35919403c66b8903ce932128b70ab1d3fdd897e04e143ffda2a4dea72cbfb6
+AUX sagan.confd 239 SHA256 ef5a99015369648e88e32ec8325261b1bdf53900543f86b77fea5aeb6387de51 SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34 WHIRLPOOL 0c0e580d220d5abec71d888531554f9b9a4848dc6bc21bff98931082618cf4b446197ec1a6a38c83d4950d878dfd87050ba8112468ec8d361b63a77541a47d8c
+AUX sagan.init 432 SHA256 d99023e31a965434b621f00bab7f242e22c119cbdf0e5d35ba130ab0e2f602cb SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7 WHIRLPOOL 95808a41472475c660d95b6d3d437ee9a01e2b062621e622f4f7c5e8ecbc5642809196e5832946f633fa13f6661c0887354a9527b2e408897e57c4513c3e6552
+AUX sagan.init-r1 424 SHA256 8b29fca7655772b26b26237c8862acc05d9a29a502aad3a40a32e2c3d373a351 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809 WHIRLPOOL 24e770a94deca73ab422f43624dedb9a349f3818a6d02e1e88e1bec2fb8de714905b25c79333736ec602666cfcb0e8ae505cb88a7fbe7da58e61cd14bb56dc34
+DIST sagan-0.2.3.tar.gz 231774 SHA256 fc50697cf8ce0fe7c1c662a57a9526710e649c2bf8088acdef46010e06e5ddf2 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc WHIRLPOOL 417d78263a907c89a865a41228ffc6e2184e1d37d1d583ee0c42da991c411cd40e99b2d537e11a7712615643f57b406439cb5af84a1eacc12a2ef7ca96c72533
+DIST sagan-1.0.0RC3.tar.gz 285207 SHA256 527ddcb583f362c92eca5557cda2116a64200da3f868b512f42abbf78b961508 SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123 WHIRLPOOL 35e18084056d15dae578378df4c335fb98ebbb1514b0762a573e4b3507253ac00ee944f06f2f443a2e8cef44c19d312e936923f9223314d8970cec4ae332f36e
+EBUILD sagan-0.2.3.ebuild 2022 SHA256 941dfbf239cabf10d4d23e68e871cfd28f83a433a4a02bd9f176b023fe96a107 SHA512 46f78738deaceb631487177347dae35cc5c3289738f17437d78afb3a70b39b4349faf250e1ea226fcd42e0c26e3c9432aa721fccade95ea6517ad9532e9cdac8 WHIRLPOOL 9ff98252f7f41a1c224ef7078cd8530328448b14555721adcd3773917dbd11a2ccbc59f2ca8384ebd8d20b4218a01a6d23b11328e4753cc99948ea3f5aaad3c5
+EBUILD sagan-1.0.0_rc3.ebuild 2078 SHA256 b74f373f0caa423c22a4f89a98bce75356805424bb1a1db29789141d0c4970e1 SHA512 c607009d57d03ddac2cd3793dcb653f268a5bd22d9f9926384c1a2ad9b213d830528e709c7a4d919bc52e517bee12513c21ec16f63cf7b9d53c4ac01fe2af28a WHIRLPOOL 018fdd5389899b78b157a7396f5cd31100c83e1e1de97ed642058afb3afac29cab4a393251b0553d1d496c96dc0db2d8d187e4f0e3b50d893d08e3c50a4c2ac4
+MISC ChangeLog 4500 SHA256 d2f9145d32180a78c0447acb82b007125c798eaaf4b64de4b288054b6303abfe SHA512 6aa63a942d97cb7d1e2d1b6fcfdd59c345046fd12d1966e41c8c927644aaf5a8fee32bfa8e38de954069b51760401d419248288a215f3b57d292347784b420ab WHIRLPOOL 97943207512885971a8e4bc3022706a49f966f19b9272aa73fb75ad0388edc86f31ac3bf11cb3ed5a7a0ea31a4de9bd102283b821720ee0d7ba239422221baba
+MISC ChangeLog-2015 4561 SHA256 02442352cdc3e2334c6c6de92a97be3a6d9c9349d0df3330b7a95d35c01e3453 SHA512 e9e451bdd0585e26c76e877b630a6160ad8f3ffcae2dfcc34ca70e7c132f0d148421a3f3c8cd6d6eed8f55ecaaac20e005047c117af9253f599de50dc11827c4 WHIRLPOOL f60b36d66edcb4099b1a285539a85bb44d3c81b6bec7226d9c46ef1ae16b773f09b8490d39b353d0eb43b25ce732ffe1f63cf22461f230eb318850f2d665ef0b
+MISC metadata.xml 711 SHA256 ebff359dc39537473536a42dcb182a944a440af02fd3e07dbd9006c10bb22039 SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6 WHIRLPOOL 806ff18cb87653a6977e666d6f93ca8d0cd9d1a84147266282e57c2f1065cb137c09590fff9729c9e19d23f356b62c0b6e744c8a618347cfdfb443975b812d3d
diff --git a/app-admin/sagan/files/mysql_check.patch b/app-admin/sagan/files/mysql_check.patch
new file mode 100644
index 000000000000..d2247aab571e
--- /dev/null
+++ b/app-admin/sagan/files/mysql_check.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.in b/configure.ac
+rename from configure.in
+rename to configure.ac
+--- a/configure.in
++++ b/configure.ac
+@@ -215,13 +215,17 @@
+ AC_CHECK_LIB(pthread, main,,AC_MSG_ERROR(Sagan needs pthreads!))
+ AC_CHECK_LIB(m, main,,AC_MSG_ERROR(Sagan needs libm!))
+
++save_LIBS=$LIBS
+ if test "$MYSQL" = "yes"; then
+ AC_MSG_RESULT([------- MySQL support is enabled -------])
++ AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
+ AC_CHECK_HEADER([mysql/mysql.h])
+ AC_CHECK_HEADER([mysql/errmsg.h])
+- AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!
+-If you're not interested in MySQL support use the --disable-mysql flag.))
+- fi
++ LIBS=$(mysql_config --libs_r)
++ AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!))
++fi
++LIBS="$save_LIBS $LIBS"
++
+
+ if test "$POSTGRES" = "yes"; then
+ AC_MSG_RESULT([------- PostgreSQL support is enabled -------])
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
new file mode 100644
index 000000000000..f9540652717a
--- /dev/null
+++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
@@ -0,0 +1,55 @@
+diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
+--- old/sagan-1.0.0RC3/configure.ac 2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/configure.ac 2015-10-11 21:04:26.493632624 +0200
+@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
+ fi
+
+ if test "$LOGNORM" = "yes"; then
+- AC_MSG_RESULT([------- liblognorm support is enabled -------])
+- AC_CHECK_HEADER([liblognorm.h])
+- AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.])])
+- AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.)) ],)
+- fi
++ AC_MSG_RESULT([------- liblognorm support is enabled -------])
++
++ PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
++ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
++ PKG_CHECK_MODULES([JSON_C], [json-c],, [
++ PKG_CHECK_MODULES([JSON_C], [json],,)
++ ])
++ PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
++fi
+
+ if test "$LIBPCAP" = "yes"; then
+ AC_MSG_RESULT([------- libpcap support is enabled -------])
+diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am
+--- old/sagan-1.0.0RC3/src/Makefile.am 2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/src/Makefile.am 2015-10-11 21:05:28.754492699 +0200
+@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
+
+ bin_PROGRAMS = sagan
+
++sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
++sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
++
+ sagan_SOURCES = sagan.c \
+ sagan-classifications.c \
+ sagan-config.c \
diff --git a/app-admin/sagan/files/sagan.confd b/app-admin/sagan/files/sagan.confd
new file mode 100644
index 000000000000..cab6db55ccf0
--- /dev/null
+++ b/app-admin/sagan/files/sagan.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2011 Gentoo Foundation
+# # Distributed under the terms of the GNU General Public License v2
+
+# Sagan daemon configuration file
+# Make debug mode
+# SAGAN_OPTS = " --debug "
+#
+# Run as user, default sagan
+SAGAN_USER="sagan"
diff --git a/app-admin/sagan/files/sagan.init b/app-admin/sagan/files/sagan.init
new file mode 100644
index 000000000000..99f1f24e3bfa
--- /dev/null
+++ b/app-admin/sagan/files/sagan.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/sagan/sagan.pid"
+command="/usr/bin/sagan"
+command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
+
+depend() {
+ use logger mysql postgresql
+ need localmount
+}
+
+start_pre() {
+ checkpath -d -o sagan /var/run/sagan
+ checkpath -p -o sagan -m 0644 /var/run/sagan/sagan.fifo
+}
diff --git a/app-admin/sagan/files/sagan.init-r1 b/app-admin/sagan/files/sagan.init-r1
new file mode 100644
index 000000000000..f0d556583c43
--- /dev/null
+++ b/app-admin/sagan/files/sagan.init-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/sagan/sagan.pid"
+command="/usr/bin/sagan"
+command_args="-D \"${SAGAN_OPTS}\" -u \"${SAGAN_USER}\""
+
+depend() {
+ use logger mysql postgresql
+ need localmount
+}
+
+start_pre() {
+ checkpath -d -o sagan /run/sagan
+ checkpath -p -o sagan -m 0644 /run/sagan/sagan.fifo
+}
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
new file mode 100644
index 000000000000..3e12feb4a2b3
--- /dev/null
+++ b/app-admin/sagan/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>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <use>
+ <flag name="smtp">Build witch SMTP (E-Mail) support</flag>
+ <flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
+ <flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
+ <flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
+ <flag name="snort">Add support to interact with Snort IDE using <pkg>net-analyzer/snortsam</pkg>'</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
new file mode 100644
index 000000000000..2196d8eb46ff
--- /dev/null
+++ b/app-admin/sagan/sagan-0.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
+
+RDEPEND="dev-libs/libpcre
+ app-admin/sagan-rules[lognorm?]
+ smtp? ( net-libs/libesmtp )
+ pcap? ( net-libs/libpcap )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql )
+ lognorm? ( dev-libs/liblognorm )
+ libdnet? ( dev-libs/libdnet )
+ snort? ( >=net-analyzer/snortsam-2.50 )
+ "
+
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/mysql_check.patch )
+
+pkg_setup() {
+ enewgroup sagan
+ enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable mysql)
+ $(use_enable postgres postgresql)
+ $(use_enable smtp esmtp)
+ $(use_enable lognorm)
+ $(use_enable libdnet)
+ $(use_enable pcap libpcap)
+ $(use_enable snort snortsam)
+ --disable-prelude
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ diropts -g sagan -o sagan -m 775
+
+ dodir /var/log/sagan
+
+ keepdir /var/log/sagan
+
+ touch "${ED}"/var/log/sagan/sagan.log
+ chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+ newinitd "${FILESDIR}"/sagan.init sagan
+ newconfd "${FILESDIR}"/sagan.confd sagan
+
+ insinto /usr/share/doc/${PF}/examples
+ doins -r extra/*
+}
+
+pkg_postinst() {
+ if use smtp; then
+ ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+ ewarn "email, create valid writable home directory for user 'sagan'"
+ ewarn "For security reasons it was created with /dev/null home directory"
+ fi
+
+ einfo "For configuration assistance see"
+ einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
new file mode 100644
index 000000000000..d41b3e3d471b
--- /dev/null
+++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
@@ -0,0 +1,89 @@
+# 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 eutils autotools-utils user
+
+DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
+HOMEPAGE="http://sagan.quadrantsec.com/"
+SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
+
+RDEPEND="dev-libs/libpcre
+ app-admin/sagan-rules[lognorm?]
+ smtp? ( net-libs/libesmtp )
+ pcap? ( net-libs/libpcap )
+ mysql? ( virtual/mysql )
+ lognorm? (
+ dev-libs/liblognorm
+ dev-libs/json-c
+ dev-libs/libee
+ dev-libs/libestr
+ )
+ libdnet? ( dev-libs/libdnet )
+ snort? ( >=net-analyzer/snortsam-2.50 )
+ geoip? ( dev-libs/geoip )
+ "
+
+DEPEND="virtual/pkgconfig
+ ${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
+S="${WORKDIR}/sagan-1.0.0RC3/"
+
+pkg_setup() {
+ enewgroup sagan
+ enewuser sagan -1 -1 /dev/null sagan
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable smtp esmtp)
+ $(use_enable lognorm)
+ $(use_enable libdnet)
+ $(use_enable pcap libpcap)
+ $(use_enable snort snortsam)
+ $(use_enable geoip)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ diropts -g sagan -o sagan -m 775
+
+ dodir /var/log/sagan
+
+ keepdir /var/log/sagan
+
+ touch "${ED}"/var/log/sagan/sagan.log
+ chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+
+ newinitd "${FILESDIR}"/sagan.init-r1 sagan
+ newconfd "${FILESDIR}"/sagan.confd sagan
+
+ insinto /usr/share/doc/${PF}/examples
+ doins -r extra/*
+}
+
+pkg_postinst() {
+ if use smtp; then
+ ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
+ ewarn "email, create valid writable home directory for user 'sagan'"
+ ewarn "For security reasons it was created with /dev/null home directory"
+ fi
+
+ einfo "For configuration assistance see"
+ einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
new file mode 100644
index 000000000000..6d8f0b4c5ae8
--- /dev/null
+++ b/app-admin/salt/Manifest
@@ -0,0 +1,46 @@
+AUX api-confd-1 188 SHA256 9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089 SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9 WHIRLPOOL 54070ebb3fe0e2338dac12541b198ba0dd07c5a80ef0eb1c92a3d65d30276a2446cf644a37274d51ab633074e9edb0044d022b9eeab549721b181c253abd5b30
+AUX api-initd-4 302 SHA256 e673f359ff7fbb012d9eb5d6c3db841668e3692b15b07faeb6352feb5cfbb2b1 SHA512 098fb6e1ba83270abd31f9cc3afdc159149276962fcf73ce0ae943df87ec26d0883990652614cdeef48912778780731f91efc972a22a75c4b10f3bd79a251a90 WHIRLPOOL 26001aabdc7ee27c6d791b1284fb82b229cb7895733dafd14fcc6b13219f4c4ff86054bcb8b83aed901ce8c5691ff3e27cd260e52e3b728332e9349ecd0b3024
+AUX master-confd-1 188 SHA256 9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089 SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9 WHIRLPOOL 54070ebb3fe0e2338dac12541b198ba0dd07c5a80ef0eb1c92a3d65d30276a2446cf644a37274d51ab633074e9edb0044d022b9eeab549721b181c253abd5b30
+AUX master-initd-4 311 SHA256 7064f21c734313e9d9d32b77eaecf3eeb6de714eff6dcafeb79c25303e675bf9 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc WHIRLPOOL 81cbb47c9f323697da43234e74db4e7fa0faac1ffeab365c48f95f955dbe409c2bf68297ce4009f14e08b54dec119f53b6dff3b7cae1fc84662405770c94c0dd
+AUX minion-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
+AUX minion-initd-4 317 SHA256 ebe8d0fecde60b427d01022eb38a437be1ead33cd24d4afdb266ff922ab87850 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f WHIRLPOOL 21a808e2586bda4cabf22181ac37ead13fdf604f45baff1b66b10b0634742eef93a887b0e993453621f64700aeed3b068ee7058d3517d076e8157f8e8c7b1286
+AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 SHA256 0f0433f63a1b4a1a203331177c0ea46e43f74e69465f157e53f68f0d317cfdc0 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50 WHIRLPOOL e3386852207693d5f3415ef7b35297bd0fb12ba25e41adfb2b5958c51e9e4337c46871eac9823876a316c9a2357877690c741d074cdfb00314b699346eba6e2d
+AUX salt-2015.5.10-buggy-tests.patch 2034 SHA256 7e38453ab19722a68c37df5f87bd489dd303c3a8d5e57ee18115e60f5a91f63d SHA512 f848262c8ce2338cc847b5c8038eb40f6ec15f4ce07d58e9a70503fcbe2b8651edb411621697a1c5aaf663e4dd821b396ca16088846e3ec6f2a64c78ecf9ac64 WHIRLPOOL 803a743adc55ae9fe4320f8cbfbf1d86f0ef1154753f936dc35ab0e49f001591f0b3e321f2b22e3f2b3c17015f0a510748f15eb5b99a4d75c789199b3c191798
+AUX salt-2015.5.5-auth-tests.patch 1572 SHA256 38865ca68ecd24376dd9b4d8a263c0146c6a547805039d6eca9436caca4ec164 SHA512 6cab8a7c2a405420f6b2df7cd21773852ef1582f8a2f54bcbd120fa4966ac390447e907555b4b82764d8ae406cee095b5dd1dd0070d5a67a4ab10329bed39c3a WHIRLPOOL d841fbd18b32000f624330671a9c559463ede9a8cd9672b2912c79da7404e5c35a1cef2007f1b8015d9a1be65e78315e51e57e26c7034a8016633f2691701298
+AUX salt-2015.5.5-cron-tests.patch 961 SHA256 93368275ba4a1de814725ba26ed72136ce0208826b462cb25a71db55b44398c5 SHA512 d6ddb67d91ac0ec8c9256dba6e7d9efd15c892b6a8396b571b6aa849393d19e3a74e48906e1e03ddc9301b8fe7e1811eb1c88048daedcd8737e5edf0c4e62d74 WHIRLPOOL ca0df6b7a10d0f9c2649dc49d45625947b8cbe331c6342a2e899601b2c6c288c14c4d09d203fdaadd05394c17b5380390d2e131e52da1533e9cfd0a2af4ba129
+AUX salt-2015.5.5-remove-buggy-tests.patch 2114 SHA256 b65ffa86c81b02697129515a5a32c9d41ed35999bc589583ec6986318c73f526 SHA512 8669e2ffa926578e238cc8f18fbbc6e691cf9a4029e4a90c92214bfbd99c878efe749041912c7ad6ba90afee2baa8a4047318105b579babbf349186c8b9302a9 WHIRLPOOL 305927fe655cab4050a0f3e881bbd6f1dbed08af5fdf1380794d5d98a074e81dee2cd2826735535f8d48b31d1e43a232f30b9553a62200ffd5531538dbe1334c
+AUX salt-2015.5.7-tmpdir.patch 1489 SHA256 71da37574dbdc4d6ce577d71a138f7bd5b627e9a47069a0b4fdddfa17c508eec SHA512 37d2af5375384dfe1e0b5d45eb6a51576767420e0bacd13f7ea5da801c359743ac420c0d6b258aa237d4dab82290a832b3ea6c96aa7547ecc8eb8f0c0f047b4a WHIRLPOOL 39e0d49f415daf1d3537e37b9b41ca6f95d84417af1e9b83cff9b102e780ee34aa51405d2008906586e379c7cf7ede359ab5ea9897e66ce36a3a375c715eb058
+AUX salt-2015.8.0-remove-buggy-tests.patch 2552 SHA256 d38ce845b21d08bacd981b4e69986ad6e7eb3802dc634e2d80cc3e4bf57474bf SHA512 31b8509feb6262e3211263571d9a006879a136c8c0ea5202ebf314ea6aeb3279b0ac63bb3800244ddb6ba9eb9159ee3ad8e389fa3e68f4d414d89cddb792a056 WHIRLPOOL 0d836f86bf16722b021c1547efe65d3facad87118dac5493a3f1289c6518ac3fdb564e125c709b0cedf915cda7bb6399b33762c07a45a65a42de6451340b36e0
+AUX salt-2015.8.10-remove-failing-boto-test.patch 2058 SHA256 9ec6bd07ce6baab395db00a198bd7fa0d32fbc31814e5c481ebee87aff649dca SHA512 98aed5c1ba1fc2647ed4771a57b7d2fe0f66e4da7936bf013c305f014e5c9f7158e9d966b961b9d6ba4fba57a1c8101d3c053598f0ebcac023016e9dbb1e765f WHIRLPOOL a2ebec3940453f18cd02434e0748b1f2c13121dfbd64d4d077871c37fcdab5d5b306d3f68b34939260dd44e78ce940610289cdba7d115582e2fb270952b2514c
+AUX salt-2015.8.13-failing-gateway-tests.patch 3539 SHA256 f8a3e1e85525c30655ffe31b69c94222f24c1fd765423c43383eeafa0421297a SHA512 577825438e0193edc7df0234fba66dc61e56c74ae6e50b998072374a93052151d987def04d3a618c5a68b9ef2c8e84559adfcc25428b701418521d5f01a57466 WHIRLPOOL 74eee173b96e4bb88b2a84fe0736815947535c835ffbf6d45dd2993bad0a42a5578c743a27fb719046d582dc47d917221db3214731289969e56e7596f4bf8a9d
+AUX salt-2015.8.13-sanitize-minion-name.patch 1003 SHA256 0f8208d8af6997374f33cb529b3b30713923cbe8d97dc644b1d7adc7d67794e6 SHA512 04f50936896b83804cc25ca329cb32a7f388be9ec5fd6f9d0cf452e3af3f6c8c3f025c119ed29a2399e11669b9eec373d77fce17d1ea64107f9268f9741cb73c WHIRLPOOL 85e0eb087a3352891243bfe464d37db04e5b5b970818d8a6c5582fccf7bea78e797b2e9df379fcc5c2d3c3de76ee51c3f902d60ab192736e4a0466ebf6d1750a
+AUX salt-2015.8.2-tmpdir.patch 2502 SHA256 229436fe85d12bbb97e2ae6086df5bb57ee8ef9ddbe62946c111437c3eae52e4 SHA512 ed8eed9e2fa36718d7320e1ae650a990ae2d95d7c6a544ffd96f358750158231c334ab1eee6fe3e5e6a25d3b62c1fc0a149508eb3bd23f7ad152a82ec7efa1ac WHIRLPOOL 9e189171fafbb43a0ca548820efdedc582fa849521208c5a062cbd16fbbd0d26e53a69e3f40595c851ddd465c047bb92a025ca893181a60258c80ae644f3eba9
+AUX salt-2016.11.0-broken-tests.patch 1092 SHA256 651d51d6c26955d865a58fc4e28eb4c8ef8565e26ca077e91f0567be1a060791 SHA512 d23c16a5ed8c0fbd4287d73e45b700d465224c5f3b32c47bb2994703a4b4c261053b9c79444973cfaf86afa2850b8499a6b7923317fde3de43840a575ada74b4 WHIRLPOOL 7662dcdb2395588db9b83bcb9153ec58b77c79f532ad7ba5a0ae9cd5cca81e92fd33f842f76aaf26ec71c34ca61d557d2721ace18dd9be4c5ff83140f07d7a02
+AUX salt-2016.11.0-remove-file-tree-test.patch 1480 SHA256 22dc4bbfccab1e81bcd6e64b0f5101177f8cdb660b8843915cf725dacb51b4c5 SHA512 0503b4ecd16c2f67b53f1ce52b5f77cacf8de420024c5c7751d3caa06de2d1e685eef8d4021dfe86a5850ac23f58705a375e87922b3c5fbeb8c11290690624bc WHIRLPOOL 80c2ff3299c5e5536ed624db7515029819f532bf458e2d7c3aa653064aad101020f7b6681e17d25ddae661b534c9d7aca4a762e16a0969a610c36a7f3203337f
+AUX salt-2016.11.0-tmpdir.patch 1480 SHA256 d8ff166477ec5bac6e7b47a29c43d7d762457f0e99519b1302efb778e894f041 SHA512 ef654d871178618dab68ad9b4062560cfa57fa421834b142639a11d12679ebc97afc27fa572dd77b74d86ba722bb8575b64045bbf3cab9f2d0e2cefeca38c4bd WHIRLPOOL 5d8c0711cf5ee8831a0b02d227938f01fb77ceec88517c55285934ad2417cdc7cf6f06b107575ea79fe1b39405ac7a7a5e1144fdd88cea1670a5ff6949ef2bfc
+AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 SHA256 9d36162e56deebae8eec7b2a0bf350090afc8d8eb513d3419d227042de43b017 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79 WHIRLPOOL 56a9ed0d5264aecf981019e40b00718fbbf9f8ea3461a8572c7d833e1fa0720f9a9bbbdfd4cec0a37ed4ce58a289ace7e400c07f1297da4f22c95d0000b81457
+AUX salt-2016.3.4-dont-test-ordering.patch 1485 SHA256 eb6a3cb65c9584d2d3bb3be9886c184ce8e8cf38bd951078aa8d4420ebb0cc2f SHA512 4cc5a4d4380e6ae795aed7650667f1ea89315b429c495128f3e6eb311977bfb713d3d4536785ff1f087188ed14e81792daf73225cdce0fcb4ff0ffa170f1cbe3 WHIRLPOOL 7ece5cf872a57d33de26bbf9330b64175cc3a92162598326bd343b6c38ef84c088d4f31cc4ad7b14713950fa0643ae98f977dba8920c319d8ed3808b6bca4278
+AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 SHA256 c6a5ed9ce850b099e1e4295b0489e86989b67f882506dbdeeb3c948f7c4a98f3 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd WHIRLPOOL 3cc2dfe51196808bedbec152d928ac158cf89ed6f342463c83d55d5ad160c9c5750ecda7febdcee1f0175b23e224b5963f0f06f805d9b0975d8cc5ef0bd75c02
+AUX salt-2016.3.5-tmpdir.patch 1982 SHA256 4a65a02161909a934261c95347fd34849f944db9ca9e7b3374bef440d94e21b3 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859 WHIRLPOOL 0f5926c5d18f4307f2f77ce150e134a8bd3b876f1856029fc825a5c52a120151f07783bba03de4dc97448dbaebc0ff509bf3323d352bb8c5e921f439663d9291
+AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 SHA256 ec118f186c062a22eef24c3578b1173138d77205708ce2fc49098e3e8a59b26c SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 WHIRLPOOL 4a22cf9206f4bf195cb36c0ab85e974af368c34fadadba16998280ac3ee98c8625a22a0211cbf6eb0b67d20e9c3acd21f6efa3675d03b86e532f31dcf5d13782
+AUX salt-api.service 166 SHA256 b4706ebbc243e44579327b07609499a587e4023a11d3928735b3b226ff504cb7 SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 WHIRLPOOL cfba8559ffd486c5e49f3a7d54e0d03a4ae72065029cbbdd9b96403acafb304b1e687dc205960526a51f096eee58680329422e6b4a26022eed7469387a4dd763
+AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
+AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
+AUX salt-syndic.service 169 SHA256 2199cd525392b3f6615acd2ef8b9c1b31be96c69f7e26c6acd28a3c5fc0d3079 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0 WHIRLPOOL 1162d09a6b454f710823d60c559eb92320fcec7ba2216e7c3e2e670bb61371877c897a12acf014f6c97732b2aa991574569125fa91157791c25d46c4dc6a41fc
+AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
+AUX syndic-initd-4 311 SHA256 86c1af171c7b13018f089fab6d045feabd72455f9453720ef36ae2011b9cb976 SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef WHIRLPOOL 0bc115ba99507a673c387ecacce4906d42ab93bd3c29016a1fac9621f61473c1b75f6236f69d449f3e393d2c05436b3a9185840ff20ad2d006e4397280c6843c
+DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86
+DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10
+DIST salt-2016.11.7.tar.gz 9409315 SHA256 279fa5bd73b5616620f628234575140f91df28b0d40d931569f179efabf27a2d SHA512 5bb52d75fafd57cd8efebe9b94dc3b53e39b476f6289e3509f1324fc86bb57a85d0ac832270c80629c04f301a749e018789c842e90cc3f2167445854e0f0ed99 WHIRLPOOL 984f297a23d59a129feaac40debc4aecaf64b2540cf62cae503c01cbe7413fdbeb58d18ed86b33b4da6f84a167bb7fed0fd502fca737720242dad91f7afad581
+DIST salt-2016.3.7.tar.gz 8516192 SHA256 3dd65ec44ca372c91b8254b625414cd7e795fdba274a07de902c3f33e199007b SHA512 78f3e23f7f05c8940bdb0359bc323cdb94c027d8abe554cffff8504d7e978f64f25d7b1f48450aed506e58ed8cbf9c272d95741dd330617809c663451f70b8d1 WHIRLPOOL 69e72d8a15310b5c1578de8c43d4a2f71cf1bdf3ae827a6283720f17a74972fd3d3fe84a95f045df77fdde82614ac6a30f549176fc44062569f40e8969e7f6fe
+DIST salt-2017.7.1.tar.gz 11408839 SHA256 fe868415d0e1162157186f4c5263e9af902b0571870ad2da210e7edf5ff5331d SHA512 c12db2361e04ce7bf4d663fafdeebdb318f210e0669d1ae26db6daf3dd19a7549b4151cb4e53acacda24d11eec7bbd06190b01cf4962d9027783ffd4617a2e52 WHIRLPOOL 6073ec85a4797ac6cc58f475f7f3bd5fa0d61b4d1228c514326d32644e2f6d1656e46196d1ad32d5c87d2bfa18eff5e786b9a1325d5e73387c33a591d8dd61d2
+EBUILD salt-2015.5.10.ebuild 4120 SHA256 e43d362181f9daf161832757539fcfe556fdbfa62c6cb08e72ea04fe1d434409 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270 WHIRLPOOL ee70ede1d04d74884b33b5b6d7df91a46ec239060e1e449db7960df9daf5b787a4a6a0039434667cccbc6eb211a36477402ad8fa29743aded268bf05f9237e10
+EBUILD salt-2015.8.13-r1.ebuild 4539 SHA256 6b0a3e37090adc0987d9b2dd4017d3d6ca65f3f0542566902b6adc1f7f99781e SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330 WHIRLPOOL 050e08bfb759f4d11fd3a8323d7f150435f56e82e92e6bbff6a1aa17f5ecdd5130ae945f616569984071a27fcd8ccb4a21ae13174cc266c659ed12827f680b3c
+EBUILD salt-2015.8.13.ebuild 4481 SHA256 e2c5c61ccf9978ef29c9f77e71155ae90a50b87303a55c18ac1b49153b05d0e5 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586 WHIRLPOOL 1025b6ced7cbfbf4564915970a0f0d4c074b120e78b609eab2567659f647cdae5d12026ad14982d9824a1e886543b71857b45a0653943cfc6d0a6f0b2d780e1a
+EBUILD salt-2016.11.7.ebuild 4623 SHA256 b99a61c53dfa6fd905d4570e41a81cdc3c9d724418d851c263b152c452508e4a SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 WHIRLPOOL fd87ca9221dcf3772569bcbbd1e9b3de3f2ec5c4610582ca3ec8595400f0fdb5c98c0026d2b285380f22e3aeaf5ada48ba35aef9fd9bb2f25f9352f8b48c4ee7
+EBUILD salt-2016.3.7.ebuild 4480 SHA256 01c260d891ac85b05fe8ea46c504d60c4470d5fcb911f5bada765ed5f30b5bf5 SHA512 4633d977af7d07a4483af40f0722d42766c4ee2c801dfd506f9b9fbcfaaabe507af63ae7298374838a27486127b47464593e6b678c40ebf575fa2a4d40fe50bf WHIRLPOOL 235a160faeb64cd95f4cab92b8665c0692ed832db3df123490a6bce50abe311d17df53b071dc9c4a87b33fbd9eeacc2bdba626518a2a68f93e6b89292d25d3f7
+EBUILD salt-2017.7.1.ebuild 4331 SHA256 315b6d84b5a9f7cb124129332cd57e5a4f12eb8a8475cf099ba655b0034f0458 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b WHIRLPOOL 653bdb2440f423ec3545c7c30146ab79749c60ca78939044de76b7d031b1b73dd7c33a0c6633d5ec8d92e5d5a80cf29ce996aaedecbccfdd9e5416ed9982bfca
+EBUILD salt-9999.ebuild 4247 SHA256 f07619d0622068fca3c858d382532d0febcc37e397cf86af8ef44f5797995d61 SHA512 c9a3230f8a99b13cb5604dcc76be3ccbb7a5d1698e8cf3bb70b14a25dc73317eee0b30055e6c53e7fff51fe9a8a4fda6317060582e64b156d6fdbfeca0bb4943 WHIRLPOOL cbc2894ccf5d5f4bade826cbf0b17066247620e43e6cf17fabb857ea12edb58daab15dd60f050fdd7dbe2da56783aae712dfbd63dac92c9ebc0f734af6ef81e9
+MISC ChangeLog 12403 SHA256 298bea725d2152b7f69553d11f297509ed77ca25766db0bd2ef701cabf4af9cb SHA512 4d09eec2c3b202dce66d1930ac797047b5a8a62e23d9544f4b9e87b9c04f8154c2e22bb15a81d8c12d2c655b69e6caf14a3fb894091d5fcc0a0dc19ae4605a27 WHIRLPOOL 32f7fb99620f148d306f4ab71de645013ffacba2634da765c4857fbc27470a4266774bb4568d43d4c454d428c2bbf212d23d560003545463148715240343a322
+MISC ChangeLog-2015 12557 SHA256 b377310761177c31ab41e955e1a83e638d4c48ca3ab3f785a09fc7dfbcde4e6c SHA512 d364f9c749647bc9a3daa67e08ea79d09a598b35620b1971f797739fdc066a5700e5b5c8d0b412aab6766db67cc90a5ef871e1aeba61caae0496413b24d7177a WHIRLPOOL ac4da49c7b67666ba3b9b184b688a25d68ea7234d2556f9f25f34e3014b118ba743574519e93fca6447ba5450c52dd6079c91d873ccf1344cc9309c23bddacf2
+MISC metadata.xml 2288 SHA256 84db13520194dd4ed73cbf3eb01226be10f0800be4be988bac56960507bdb543 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 WHIRLPOOL 50fbf4e2c309ddf255c5b867554f8c56600a81b71cf4b7ccbe43b7d2fb15430767b11573b834f9eaed9dfd45bcd802e50865f1e42662bfeb12dd1b16387645c4
diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/api-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4
new file mode 100644
index 000000000000..a0cb8265047d
--- /dev/null
+++ b/app-admin/salt/files/api-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-api.pid"
+name="SALT API daemon"
+retry="20"
+
+depend() {
+ use net logger
+}
diff --git a/app-admin/salt/files/master-confd-1 b/app-admin/salt/files/master-confd-1
new file mode 100644
index 000000000000..c70e8e766da0
--- /dev/null
+++ b/app-admin/salt/files/master-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+
+# see man pages for salt-minion or run `salt-master --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4
new file mode 100644
index 000000000000..e07e72b0dae7
--- /dev/null
+++ b/app-admin/salt/files/master-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-master"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+retry="20"
+
+depend() {
+ use net logger
+}
diff --git a/app-admin/salt/files/minion-confd-1 b/app-admin/salt/files/minion-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/minion-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4
new file mode 100644
index 000000000000..c658ccf5c1df
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-4
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-minion"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-minion.pid"
+name="SALT minion daemon"
+retry="20"
+
+depend() {
+ need net
+ use logger
+}
diff --git a/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
new file mode 100644
index 000000000000..7c33c12f5c71
--- /dev/null
+++ b/app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch
@@ -0,0 +1,104 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 57ba81e..b26154e 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -298,99 +298,6 @@ class PyDSLRendererTestCase(TestCase):
+ finally:
+ shutil.rmtree(dirpath, ignore_errors=True)
+
+- def test_rendering_includes(self):
+- dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+- if not os.path.isdir(dirpath):
+- self.skipTest(
+- 'The temporary directory {0!r} was not created'.format(
+- dirpath
+- )
+- )
+- output = os.path.join(dirpath, 'output')
+- try:
+- write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\
+- #!pydsl|stateconf -ps
+-
+- include('xxx')
+- yyy = include('yyy')
+-
+- # ensure states in xxx are run first, then those in yyy and then those in aaa last.
+- extend(state('yyy::start').stateconf.require(stateconf='xxx::goal'))
+- extend(state('.start').stateconf.require(stateconf='yyy::goal'))
+-
+- extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}'))
+-
+- __pydsl__.set(ordered=True)
+-
+- yyy.hello('red', 1)
+- yyy.hello('green', 2)
+- yyy.hello('blue', 3)
+- '''.format(output)))
+-
+- write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\
+- #!stateconf -os yaml . jinja
+-
+- include:
+- - yyy
+-
+- extend:
+- yyy::start:
+- stateconf.set:
+- - require:
+- - stateconf: .goal
+-
+- yyy::Y1:
+- cmd.run:
+- - name: 'echo Y1 extended >> {0}'
+-
+- .X1:
+- cmd.run:
+- - name: echo X1 >> {1}
+- - cwd: /
+- .X2:
+- cmd.run:
+- - name: echo X2 >> {2}
+- - cwd: /
+- .X3:
+- cmd.run:
+- - name: echo X3 >> {3}
+- - cwd: /
+-
+- '''.format(output, output, output, output)))
+-
+- write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\
+- #!pydsl|stateconf -ps
+-
+- include('xxx')
+- __pydsl__.set(ordered=True)
+-
+- state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/')
+- state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/')
+- state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/')
+-
+- def hello(color, number):
+- state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/')
+- '''.format(output, output, output, output)))
+-
+- state_highstate({'base': ['aaa']}, dirpath)
+- expected = textwrap.dedent('''\
+- X1
+- X2
+- X3
+- Y1 extended
+- Y2 extended
+- Y3
+- hello red 1
+- hello green 2
+- hello blue 3
+- ''')
+-
+- with salt.utils.fopen(output, 'r') as f:
+- self.assertEqual(sorted(f.read()), sorted(expected))
+-
+- finally:
+- shutil.rmtree(dirpath, ignore_errors=True)
+-
+ def test_compile_time_state_execution(self):
+ if not sys.stdin.isatty():
+ self.skipTest('Not attached to a TTY')
diff --git a/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch
new file mode 100644
index 000000000000..e9330bd255b5
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.10-buggy-tests.patch
@@ -0,0 +1,38 @@
+diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py
+index 82dfe28..ced9ee5 100644
+--- a/tests/unit/modules/boto_vpc_test.py
++++ b/tests/unit/modules/boto_vpc_test.py
+@@ -441,9 +441,9 @@ class BotoVpcTestCase(BotoVpcTestCaseBase):
+ describe_vpc = boto_vpc.describe(vpc_id=vpc.id, **conn_parameters)
+
+ vpc_properties = dict(cidr_block=unicode(cidr_block),
+- is_default=None,
++ is_default=False,
+ state=u'available',
+- tags={'Name': 'test', 'test': 'testvalue'},
++ tags={u'Name': u'test', u'test': u'testvalue'},
+ dhcp_options_id=u'dopt-7a8b9c2d',
+ instance_tenancy=u'default')
+
+diff --git a/tests/unit/states/pip_test.py b/tests/unit/states/pip_test.py
+index 6e7d083..9a83951 100644
+--- a/tests/unit/states/pip_test.py
++++ b/tests/unit/states/pip_test.py
+@@ -37,17 +37,6 @@ class PipStateTest(TestCase, integration.SaltReturnAssertsMixIn):
+ def test_install_requirements_parsing(self):
+ mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
+ pip_list = MagicMock(return_value={'pep8': '1.3.3'})
+- with patch.dict(pip_state.__salt__, {'cmd.run_all': mock,
+- 'pip.list': pip_list}):
+- with patch.dict(pip_state.__opts__, {'test': True}):
+- ret = pip_state.installed('pep8=1.3.2')
+- self.assertSaltFalseReturn({'test': ret})
+- self.assertInSaltComment(
+- 'Invalid version specification in package pep8=1.3.2. '
+- '\'=\' is not supported, use \'==\' instead.',
+- {'test': ret}
+- )
+-
+ mock = MagicMock(return_value={'retcode': 0, 'stdout': ''})
+ pip_list = MagicMock(return_value={'pep8': '1.3.3'})
+ pip_install = MagicMock(return_value={'retcode': 0})
diff --git a/app-admin/salt/files/salt-2015.5.5-auth-tests.patch b/app-admin/salt/files/salt-2015.5.5-auth-tests.patch
new file mode 100644
index 000000000000..fa092d1f3eaf
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.5-auth-tests.patch
@@ -0,0 +1,34 @@
+diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py
+index 10b77e9..c40f439 100644
+--- a/tests/unit/auth_test.py
++++ b/tests/unit/auth_test.py
+@@ -38,12 +38,12 @@ class LoadAuthTestCase(TestCase):
+
+ # Test a case with valid params
+ with patch('salt.utils.format_call') as format_call_mock:
+- expected_ret = call('fake_func_str', {
++ expected_ret = [call('fake_func_str', {
+ 'username': 'test_user',
+ 'test_password': '',
+ 'show_timeout': False,
+ 'eauth': 'pam'
+- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)
++ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)]
+ ret = self.lauth.load_name(valid_eauth_load)
+ format_call_mock.assert_has_calls(expected_ret)
+
+@@ -53,12 +53,12 @@ class LoadAuthTestCase(TestCase):
+ 'test_password': '',
+ 'eauth': 'pam'}
+ with patch('salt.utils.format_call') as format_call_mock:
+- expected_ret = call('fake_groups_function_str', {
++ expected_ret = [call('fake_groups_function_str', {
+ 'username': 'test_user',
+ 'test_password': '',
+ 'show_timeout': False,
+ 'eauth': 'pam'
+- }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)
++ }, expected_extra_kws=auth.AUTH_INTERNAL_KEYWORDS)]
+ self.lauth.get_groups(valid_eauth_load)
+ format_call_mock.assert_has_calls(expected_ret)
+
diff --git a/app-admin/salt/files/salt-2015.5.5-cron-tests.patch b/app-admin/salt/files/salt-2015.5.5-cron-tests.patch
new file mode 100644
index 000000000000..d0c4ffc92df1
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.5-cron-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/tests/unit/modules/cron_test.py b/tests/unit/modules/cron_test.py
+index 017eabd..dac0122 100644
+--- a/tests/unit/modules/cron_test.py
++++ b/tests/unit/modules/cron_test.py
+@@ -573,10 +573,10 @@ class PsTestCase(TestCase):
+ @patch('salt.modules.cron._write_cron_lines')
+ @patch('salt.modules.cron.list_tab', new=MagicMock(return_value=STUB_SIMPLE_CRON_DICT))
+ def test_set_special(self, write_cron_lines_mock):
+- expected_write_call = call('DUMMY_USER',
++ expected_write_call = [call('DUMMY_USER',
+ ['5 0 * * * /tmp/no_script.sh\n',
+ '# Lines below here are managed by Salt, do not edit\n',
+- '@hourly echo Hi!\n'])
++ '@hourly echo Hi!\n'])]
+ ret = cron.set_special('DUMMY_USER', '@hourly', 'echo Hi!')
+ write_cron_lines_mock.assert_has_calls(expected_write_call)
+
diff --git a/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch
new file mode 100644
index 000000000000..b36e35fb9a58
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.5-remove-buggy-tests.patch
@@ -0,0 +1,46 @@
+diff --git a/tests/unit/modules/darwin_sysctl_test.py b/tests/unit/modules/darwin_sysctl_test.py
+index 51e8f23..36d005f 100644
+--- a/tests/unit/modules/darwin_sysctl_test.py
++++ b/tests/unit/modules/darwin_sysctl_test.py
+@@ -64,18 +64,6 @@ class DarwinSysctlTestCase(TestCase):
+ 'net.inet.icmp.icmplim', 50), ret)
+
+ @patch('os.path.isfile', MagicMock(return_value=False))
+- def test_persist_no_conf_failure(self):
+- '''
+- Tests adding of config file failure
+- '''
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- darwin_sysctl.persist,
+- 'net.inet.icmp.icmplim',
+- 50, config=None)
+-
+- @patch('os.path.isfile', MagicMock(return_value=False))
+ def test_persist_no_conf_success(self):
+ '''
+ Tests successful add of config file when previously not one
+diff --git a/tests/unit/modules/linux_sysctl_test.py b/tests/unit/modules/linux_sysctl_test.py
+index 08fc80f..c6e40b8 100644
+--- a/tests/unit/modules/linux_sysctl_test.py
++++ b/tests/unit/modules/linux_sysctl_test.py
+@@ -82,18 +82,6 @@ class LinuxSysctlTestCase(TestCase):
+ 'net.ipv4.ip_forward', 1), ret)
+
+ @patch('os.path.isfile', MagicMock(return_value=False))
+- def test_persist_no_conf_failure(self):
+- '''
+- Tests adding of config file failure
+- '''
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- linux_sysctl.persist,
+- 'net.ipv4.ip_forward',
+- 1, config=None)
+-
+- @patch('os.path.isfile', MagicMock(return_value=False))
+ def test_persist_no_conf_success(self):
+ '''
+ Tests successful add of config file when previously not one
diff --git a/app-admin/salt/files/salt-2015.5.7-tmpdir.patch b/app-admin/salt/files/salt-2015.5.7-tmpdir.patch
new file mode 100644
index 000000000000..8a19c32e0f71
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.7-tmpdir.patch
@@ -0,0 +1,37 @@
+diff --git a/tests/unit/modules/grains_test.py b/tests/unit/modules/grains_test.py
+index 3473c03..ea37d66 100644
+--- a/tests/unit/modules/grains_test.py
++++ b/tests/unit/modules/grains_test.py
+@@ -1,6 +1,8 @@
+ # -*- coding: utf-8 -*-
+
+ import copy
++import os.path
++import tempfile
+
+ # Import Salt Testing libs
+ from salttesting import TestCase, skipIf
+@@ -20,8 +22,8 @@ from salt.modules import grains as grainsmod
+ from salt.utils import dictupdate
+
+ grainsmod.__opts__ = {
+- 'conf_file': '/tmp/__salt_test_grains',
+- 'cachedir': '/tmp/__salt_test_grains_cache_dir'
++ 'conf_file': os.path.join(tempfile.gettempdir(), '__salt_test_grains'),
++ 'cachedir': os.path.join(tempfile.gettempdir(), '__salt_test_grains_cache_dir')
+ }
+
+ grainsmod.__salt__ = {}
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index 3cfb2f0..b3f3bee 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -69,7 +69,7 @@ class ArchiveTest(TestCase):
+ 'cmd.run_all': mock_run}):
+ filename = os.path.join(
+ tmp_dir,
+- 'files/test/_tmp_test_archive_.tar'
++ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
+ )
+ for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
+ ret = archive.extracted(tmp_dir,
diff --git a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
new file mode 100644
index 000000000000..92ab0624e595
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py
+index 282539d..c88a7a8 100644
+--- a/tests/unit/modules/mount_test.py
++++ b/tests/unit/modules/mount_test.py
+@@ -103,12 +103,6 @@ class MountTestCase(TestCase):
+ self.assertTrue(mount.rm_fstab('name', 'device'))
+
+ mock = MagicMock(return_value={'name': 'name'})
+- with patch.object(mount, 'fstab', mock):
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- mount.rm_fstab,
+- config=None)
+
+ def test_set_fstab(self):
+ '''
+@@ -143,12 +137,6 @@ class MountTestCase(TestCase):
+ self.assertTrue(mount.rm_automaster('name', 'device'))
+
+ mock = MagicMock(return_value={'name': 'name'})
+- with patch.object(mount, 'fstab', mock):
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- mount.rm_automaster,
+- 'name', 'device')
+
+ def test_set_automaster(self):
+ '''
+diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py
+index 6a43fd4..3be039c 100644
+--- a/tests/unit/modules/puppet_test.py
++++ b/tests/unit/modules/puppet_test.py
+@@ -91,10 +91,6 @@ class PuppetTestCase(TestCase):
+ with patch('salt.utils.fopen', mock_open()):
+ self.assertTrue(puppet.disable())
+
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- puppet.disable)
+
+ def test_status(self):
+ '''
+@@ -154,10 +150,6 @@ class PuppetTestCase(TestCase):
+ mock_open(read_data="resources: 1")):
+ self.assertDictEqual(puppet.summary(), {'resources': 1})
+
+- with patch('salt.utils.fopen', mock_open()) as m_open:
+- helper_open = m_open()
+- helper_open.write.assertRaises(CommandExecutionError,
+- puppet.summary)
+
+ def test_plugin_sync(self):
+ '''
diff --git a/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch b/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch
new file mode 100644
index 000000000000..5a4d273d7848
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.10-remove-failing-boto-test.patch
@@ -0,0 +1,35 @@
+diff --git a/tests/unit/modules/boto_secgroup_test.py b/tests/unit/modules/boto_secgroup_test.py
+index f1c6bb1..07fd8ec 100644
+--- a/tests/unit/modules/boto_secgroup_test.py
++++ b/tests/unit/modules/boto_secgroup_test.py
+@@ -192,30 +192,6 @@ class BotoSecgroupTestCase(TestCase):
+ **conn_parameters)
+ self.assertEqual(group_vpc.id, retrieved_group_id)
+
+- @mock_ec2
+- def test_get_config_single_rule_group_name(self):
+- '''
+- tests return of 'config' when given group name. get_config returns an OrderedDict.
+- '''
+- group_name = _random_group_name()
+- ip_protocol = u'tcp'
+- from_port = 22
+- to_port = 22
+- cidr_ip = u'0.0.0.0/0'
+- rules_egress = [{'to_port': -1, 'from_port': -1, 'ip_protocol': u'-1', 'cidr_ip': u'0.0.0.0/0'}]
+-
+- conn = boto.ec2.connect_to_region(region, **boto_conn_parameters)
+- group = conn.create_security_group(name=group_name, description=group_name)
+- group.authorize(ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, cidr_ip=cidr_ip)
+- # setup the expected get_config result
+- expected_get_config_result = OrderedDict([('name', group.name), ('group_id', group.id), ('owner_id', u'111122223333'),
+- ('description', group.description),
+- ('rules', [{'to_port': to_port, 'from_port': from_port,
+- 'ip_protocol': ip_protocol, 'cidr_ip': cidr_ip}]),
+- ('rules_egress', rules_egress)])
+- secgroup_get_config_result = boto_secgroup.get_config(group_id=group.id, **conn_parameters)
+- self.assertEqual(expected_get_config_result, secgroup_get_config_result)
+-
+ @skipIf(True, 'test skipped due to error in moto return - fixed in '
+ 'https://github.com/spulec/moto/commit/cc0166964371f7b5247a49d45637a8f936ccbe6f')
+ @mock_ec2
diff --git a/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch b/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch
new file mode 100644
index 000000000000..7d8512b14ef4
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.13-failing-gateway-tests.patch
@@ -0,0 +1,69 @@
+diff --git a/tests/unit/states/boto_vpc_test.py b/tests/unit/states/boto_vpc_test.py
+index 53b6a24e4d..96b5630627 100644
+--- a/tests/unit/states/boto_vpc_test.py
++++ b/tests/unit/states/boto_vpc_test.py
+@@ -179,16 +179,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
+ self.assertTrue(exists)
+
+ @mock_ec2
+- def test_present_when_resource_exists(self):
+- vpc = self._create_vpc(name='test')
+- resource = self._create_resource(vpc_id=vpc.id, name='test')
+- with patch.dict('salt.utils.boto.__salt__', funcs):
+- resource_present_result = salt_states['boto_vpc.{0}_present'.format(self.resource_type)](
+- name='test', vpc_name='test', **self.extra_kwargs)
+- self.assertTrue(resource_present_result['result'])
+- self.assertEqual(resource_present_result['changes'], {})
+-
+- @mock_ec2
+ @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
+ def test_present_with_failure(self):
+ vpc = self._create_vpc(name='test')
+@@ -210,18 +200,6 @@ class BotoVpcResourceTestCaseMixin(BotoVpcTestCaseMixin):
+ self.assertEqual(resource_absent_result['changes'], {})
+
+ @mock_ec2
+- def test_absent_when_resource_exists(self):
+- vpc = self._create_vpc(name='test')
+- self._create_resource(vpc_id=vpc.id, name='test')
+-
+- with patch.dict('salt.utils.boto.__salt__', funcs):
+- resource_absent_result = salt_states['boto_vpc.{0}_absent'.format(self.resource_type)]('test')
+- self.assertTrue(resource_absent_result['result'])
+- self.assertEqual(resource_absent_result['changes']['new'][self.resource_type], None)
+- exists = funcs['boto_vpc.resource_exists'](self.resource_type, 'test').get('exists')
+- self.assertFalse(exists)
+-
+- @mock_ec2
+ @skipIf(True, 'Disabled pending https://github.com/spulec/moto/issues/493')
+ def test_absent_with_failure(self):
+ vpc = self._create_vpc(name='test')
+@@ -293,28 +271,3 @@ class BotoVpcRouteTableTestCase(BotoVpcStateTestCaseBase, BotoVpcResourceTestCas
+
+ new_subnets = changes['new']['subnets_associations']
+ self.assertEqual(new_subnets[0]['subnet_id'], subnet2.id)
+-
+- @mock_ec2
+- def test_present_with_routes(self):
+- vpc = self._create_vpc(name='test')
+- igw = self._create_internet_gateway(name='test', vpc_id=vpc.id)
+-
+- route_table_present_result = salt_states['boto_vpc.route_table_present'](
+- name='test', vpc_name='test', routes=[{'destination_cidr_block': '0.0.0.0/0',
+- 'gateway_id': igw.id},
+- {'destination_cidr_block': '10.0.0.0/24',
+- 'gateway_id': 'local'}])
+- routes = [x['gateway_id'] for x in route_table_present_result['changes']['new']['routes']]
+-
+- self.assertEqual(set(routes), set(['local', igw.id]))
+-
+- route_table_present_result = salt_states['boto_vpc.route_table_present'](
+- name='test', vpc_name='test', routes=[{'destination_cidr_block': '10.0.0.0/24',
+- 'gateway_id': 'local'}])
+-
+- changes = route_table_present_result['changes']
+-
+- old_routes = [x['gateway_id'] for x in changes['old']['routes']]
+- self.assertEqual(set(routes), set(old_routes))
+-
+- self.assertEqual(changes['new']['routes'][0]['gateway_id'], 'local')
diff --git a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch
new file mode 100644
index 000000000000..df9e0f66d005
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch
@@ -0,0 +1,36 @@
+From aa87d67258a5b6742fc53d06c7bdac0f643bc9f1 Mon Sep 17 00:00:00 2001
+From: Ch3LL <megan.wilhite@gmail.com>
+Date: Tue, 1 Aug 2017 13:44:32 -0400
+Subject: [PATCH] Add clean_id function to salt.utils.verify.py
+
+---
+ salt/utils/verify.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/salt/utils/verify.py b/salt/utils/verify.py
+index 5cac0fa651b..a3dc67db336 100644
+--- a/salt/utils/verify.py
++++ b/salt/utils/verify.py
+@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False):
+ return ''
+
+
++def clean_id(id_):
++ '''
++ Returns if the passed id is clean.
++ '''
++ if re.search(r'\.\.{sep}'.format(sep=os.sep), id_):
++ return False
++ return True
++
++
+ def valid_id(opts, id_):
+ '''
+ Returns if the passed id is valid
+ '''
+ try:
+- return bool(clean_path(opts['pki_dir'], id_))
++ return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_)
+ except (AttributeError, KeyError) as e:
+ return False
+
diff --git a/app-admin/salt/files/salt-2015.8.2-tmpdir.patch b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
new file mode 100644
index 000000000000..871551e0e508
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.2-tmpdir.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
+index 615e6b5..fbd24aa 100644
+--- a/tests/unit/modules/qemu_nbd_test.py
++++ b/tests/unit/modules/qemu_nbd_test.py
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
+ Test if it mount the named image via qemu-nbd
+ and return the mounted roots
+ '''
++ tmpdir = os.environ.get('TMPDIR', '/tmp')
+ mock = MagicMock(return_value=True)
+ with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
+ self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
+ 'mount.mount': mock,
+ 'cmd.retcode': MagicMock(side_effect=[1, 0])}):
+ self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
+- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
++ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
+
+ # 'clear' function tests: 1
+
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index 63e4a53..20b196f 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -26,7 +26,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui
+
+ # Globals
+ archive.__salt__ = {}
+-archive.__opts__ = {"cachedir": "/tmp", "test": False}
++archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
+ archive.__env__ = 'test'
+
+
+@@ -75,7 +75,7 @@ class ArchiveTestCase(TestCase):
+ 'cmd.run_all': mock_run}):
+ filename = os.path.join(
+ tmp_dir,
+- 'files/test/_tmp_test_archive_.tar'
++ 'files/test/' + tempfile.gettempdir().replace('/', '_') + '_test_archive_.tar'
+ )
+ for test_opts, ret_opts in zip(test_tar_opts, ret_tar_opts):
+ ret = archive.extracted(tmp_dir,
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
+index 71e4330..d6f3f30 100644
+--- a/tests/unit/utils/context_test.py
++++ b/tests/unit/utils/context_test.py
+@@ -18,7 +18,7 @@ import salt.payload
+ import salt.utils
+
+ __context__ = {'a': 'b'}
+-__opts__ = {'cachedir': '/tmp'}
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
+
+
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
new file mode 100644
index 000000000000..5bb7a8e4c46b
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
@@ -0,0 +1,23 @@
+diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
+index f63a4896f7..54bf443d9a 100644
+--- a/tests/unit/utils/extend_test.py
++++ b/tests/unit/utils/extend_test.py
+@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
+ shutil.rmtree(self.out, True)
+ os.chdir(self.starting_dir)
+
+- @patch('sys.exit', MagicMock)
+- def test_run(self):
+- out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
+- self.out = out
+- year = date.today().strftime('%Y')
+- self.assertTrue(os.path.exists(out))
+- self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
+- self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
+- self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
+- with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
+- self.assertEqual(test_f.read(), year)
+-
+ if __name__ == '__main__':
+ from unit import run_tests
+ run_tests(ExtendTestCase, needs_daemon=False)
diff --git a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
new file mode 100644
index 000000000000..47d3257df671
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
@@ -0,0 +1,34 @@
+diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
+index 9105670526..e077bc3f44 100644
+--- a/tests/unit/modules/inspect_collector_test.py
++++ b/tests/unit/modules/inspect_collector_test.py
+@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
+ self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
+
+ @patch("os.mkdir", MagicMock())
+- def test_file_tree(self):
+- '''
+- Test file tree.
+-
+- :return:
+- '''
+-
+- inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
+- tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+- expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
+- ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
+- ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
+- '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
+- tree_result = []
+- for chunk in inspector._get_all_files(tree_root):
+- buff = []
+- for pth in chunk:
+- buff.append(pth.replace(tree_root, ''))
+- tree_result.append(buff)
+- tree_result = tuple(tree_result)
+- self.assertEqual(expected_tree, tree_result)
+-
+- @patch("os.mkdir", MagicMock())
+ def test_get_unmanaged_files(self):
+ '''
+ Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
new file mode 100644
index 000000000000..1cccb158aff0
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
@@ -0,0 +1,34 @@
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
+index 615e6b5670..fbd24aab86 100644
+--- a/tests/unit/modules/qemu_nbd_test.py
++++ b/tests/unit/modules/qemu_nbd_test.py
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
+ Test if it mount the named image via qemu-nbd
+ and return the mounted roots
+ '''
++ tmpdir = os.environ.get('TMPDIR', '/tmp')
+ mock = MagicMock(return_value=True)
+ with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
+ self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
+ 'mount.mount': mock,
+ 'cmd.retcode': MagicMock(side_effect=[1, 0])}):
+ self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
+- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
++ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
+
+ # 'clear' function tests: 1
+
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
+index 5249d56747..a27ee9ab61 100644
+--- a/tests/unit/utils/context_test.py
++++ b/tests/unit/utils/context_test.py
+@@ -18,7 +18,7 @@ import salt.payload
+ import salt.utils
+
+ __context__ = {'a': 'b'}
+-__opts__ = {'cachedir': '/tmp'}
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
+
+
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
new file mode 100644
index 000000000000..3e4fa31c9042
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
+index fc13bb6..6316fb5 100644
+--- a/tests/integration/__init__.py
++++ b/tests/integration/__init__.py
+@@ -77,12 +77,7 @@ if salt.utils.is_windows():
+ import win32api
+
+
+-SYS_TMP_DIR = os.path.realpath(
+- # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+- # for unix sockets: ``error: AF_UNIX path too long``
+- # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+- os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
+-)
++SYS_TMP_DIR = os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
+ TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
+ FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
+ PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
new file mode 100644
index 000000000000..c27227571ad2
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.4-dont-test-ordering.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
+index 9d2fa3ada7..710bbd75a5 100644
+--- a/tests/unit/modules/inspect_collector_test.py
++++ b/tests/unit/modules/inspect_collector_test.py
+@@ -36,28 +36,6 @@ class InspectorCollectorTestCase(TestCase):
+ self.assertEqual(inspector.dbfile, '/foo/cache/_minion_collector.db')
+ self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
+
+- def test_file_tree(self):
+- '''
+- Test file tree.
+-
+- :return:
+- '''
+-
+- inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
+- tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
+- expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
+- ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
+- ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
+- '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
+- tree_result = []
+- for chunk in inspector._get_all_files(tree_root):
+- buff = []
+- for pth in chunk:
+- buff.append(pth.replace(tree_root, ''))
+- tree_result.append(buff)
+- tree_result = tuple(tree_result)
+- self.assertEqual(expected_tree, tree_result)
+-
+ def test_get_unmanaged_files(self):
+ '''
+ Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
new file mode 100644
index 000000000000..dd542d630adf
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
@@ -0,0 +1,32 @@
+diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py
+index cce0023423..c1324f4a61 100644
+--- a/tests/unit/conf_test.py
++++ b/tests/unit/conf_test.py
+@@ -140,6 +140,8 @@ class ConfTest(TestCase):
+ commented out. This test loops through all of the files in that directory to check
+ for any lines that are not commented or blank.
+ '''
++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'):
++ return
+ cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
+ for conf_file in cloud_sample_files:
+ profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file
+@@ -158,6 +160,8 @@ class ConfTest(TestCase):
+ commented out. This test loops through all of the files in that directory to check
+ for any lines that are not commented or blank.
+ '''
++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'):
++ return
+ cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
+ for conf_file in cloud_sample_files:
+ provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file
+@@ -176,6 +180,9 @@ class ConfTest(TestCase):
+ commented out. This test loops through all of the files in that directory to check
+ for any lines that are not commented or blank.
+ '''
++ if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'):
++ return
++
+ cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
+ for conf_file in cloud_sample_files:
+ map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file
diff --git a/app-admin/salt/files/salt-2016.3.5-tmpdir.patch b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch
new file mode 100644
index 000000000000..dce4f09f2a0f
--- /dev/null
+++ b/app-admin/salt/files/salt-2016.3.5-tmpdir.patch
@@ -0,0 +1,47 @@
+diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
+index 615e6b5670..fbd24aab86 100644
+--- a/tests/unit/modules/qemu_nbd_test.py
++++ b/tests/unit/modules/qemu_nbd_test.py
+@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
+ Test if it mount the named image via qemu-nbd
+ and return the mounted roots
+ '''
++ tmpdir = os.environ.get('TMPDIR', '/tmp')
+ mock = MagicMock(return_value=True)
+ with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
+ self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
+@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
+ 'mount.mount': mock,
+ 'cmd.retcode': MagicMock(side_effect=[1, 0])}):
+ self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
+- {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
++ {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
+
+ # 'clear' function tests: 1
+
+diff --git a/tests/unit/states/archive_test.py b/tests/unit/states/archive_test.py
+index e699362d8a..c7c7e8a965 100644
+--- a/tests/unit/states/archive_test.py
++++ b/tests/unit/states/archive_test.py
+@@ -25,7 +25,7 @@ from salt.ext.six.moves import zip # pylint: disable=import-error,redefined-bui
+
+ # Globals
+ archive.__salt__ = {}
+-archive.__opts__ = {"cachedir": "/tmp", "test": False}
++archive.__opts__ = {"cachedir": os.environ.get('TMPDIR', "/tmp"), "test": False}
+ archive.__env__ = 'test'
+
+
+diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
+index 5249d56747..a27ee9ab61 100644
+--- a/tests/unit/utils/context_test.py
++++ b/tests/unit/utils/context_test.py
+@@ -18,7 +18,7 @@ import salt.payload
+ import salt.utils
+
+ __context__ = {'a': 'b'}
+-__opts__ = {'cachedir': '/tmp'}
++__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
+
+
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
new file mode 100644
index 000000000000..90a48a662998
--- /dev/null
+++ b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/support/paths.py b/tests/support/paths.py
+index da93c8e1e3..895c636fef 100644
+--- a/tests/support/paths.py
++++ b/tests/support/paths.py
+@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path:
+ if TESTS_DIR not in sys.path:
+ sys.path.insert(1, TESTS_DIR)
+
+-SYS_TMP_DIR = os.path.abspath(os.path.realpath(
++SYS_TMP_DIR = os.path.abspath(
+ # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+ # for unix sockets: ``error: AF_UNIX path too long``
+ # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+ os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp'
+-))
++)
+ TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
+ FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
+ PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-api.service b/app-admin/salt/files/salt-api.service
new file mode 100644
index 000000000000..fd9f665fff09
--- /dev/null
+++ b/app-admin/salt/files/salt-api.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-api
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-master.service b/app-admin/salt/files/salt-master.service
new file mode 100644
index 000000000000..4f3827ede6df
--- /dev/null
+++ b/app-admin/salt/files/salt-master.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-master
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-minion.service b/app-admin/salt/files/salt-minion.service
new file mode 100644
index 000000000000..2f199f998eca
--- /dev/null
+++ b/app-admin/salt/files/salt-minion.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Minion
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-minion
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/salt-syndic.service b/app-admin/salt/files/salt-syndic.service
new file mode 100644
index 000000000000..922eef35af8b
--- /dev/null
+++ b/app-admin/salt/files/salt-syndic.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=The Salt Master Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/salt-syndic
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
new file mode 100644
index 000000000000..d69d83fcd60d
--- /dev/null
+++ b/app-admin/salt/files/syndic-confd-1
@@ -0,0 +1,5 @@
+# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+
+# see man pages for salt-minion or run `salt-minion --help`
+# for valid cmdline options
+SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4
new file mode 100644
index 000000000000..8908f2cfa850
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-4
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-syndic"
+command_args="${SALT_OPTS}"
+command_background="1"
+pidfile="/var/run/salt-syndic.pid"
+name="SALT syndic daemon"
+retry="20"
+
+depend() {
+ use net logger
+}
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
new file mode 100644
index 000000000000..00b55f2c20e0
--- /dev/null
+++ b/app-admin/salt/metadata.xml
@@ -0,0 +1,44 @@
+<?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>
+ <longdescription lang="en">
+Salt is a powerful remote execution manager that can be used to administer
+servers in a fast and efficient way.
+
+Salt allows commands to be executed across large groups of servers. This means
+systems can be easily managed, but data can also be easily gathered. Quick
+introspection into running systems becomes a reality.
+
+Remote execution is usually used to set up a certain state on a remote system.
+Salt addresses this problem as well, the salt state system uses salt state
+files to define the state a server needs to be in.
+
+Between the remote execution system, and state management Salt addresses the
+backbone of cloud and data center management.
+ </longdescription>
+ <use>
+ <flag name="cherrypy">Enable support for using cherrypy.</flag>
+ <flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
+ <flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
+ <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
+ <flag name="keyring">Enable support for keyrings via python-keyring.</flag>
+ <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
+ <flag name="mongodb">Support returning data to a mongodb server.</flag>
+ <flag name="neutron">Support the OpenStack neutron network service.</flag>
+ <flag name="nova">Enable support for the OpenStack Nova API</flag>
+ <flag name="openssl">Add support for using TLS via OpenSSL.</flag>
+ <flag name="portage">Add support for package state enforcement using sys-apps/portage</flag>
+ <flag name="raet">Add support for the new RAET transport.</flag>
+ <flag name="redis">Support returning data to a redis database.</flag>
+ <flag name="timelib">Use timelib to parse english textual date descriptions.</flag>
+ <flag name="zeromq">Add support for the zeromq transport.</flag>
+ </use>
+ <upstream>
+ <remote-id type="pypi">salt</remote-id>
+ <remote-id type="github">saltstack/salt-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/salt/salt-2015.5.10.ebuild b/app-admin/salt/salt-2015.5.10.ebuild
new file mode 100644
index 000000000000..24630f9f662b
--- /dev/null
+++ b/app-admin/salt/salt-2015.5.10.ebuild
@@ -0,0 +1,133 @@
+# 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 distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
+ "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.7-tmpdir.patch"
+ "${FILESDIR}/${PN}-2015.5.10-buggy-tests.patch"
+)
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network}_test.py \
+ || die "Failed to remove broken tests"
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2015.8.13-r1.ebuild b/app-admin/salt/salt-2015.8.13-r1.ebuild
new file mode 100644
index 000000000000..ed02341af26a
--- /dev/null
+++ b/app-admin/salt/salt-2015.8.13-r1.ebuild
@@ -0,0 +1,141 @@
+# 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 distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+ "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
+ "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch"
+ "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch"
+ "${FILESDIR}/${PN}-2015.8.13-sanitize-minion-name.patch"
+)
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ if [[ -e pkg/salt-${svc}.service ]]; then
+ sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die
+ systemd_dounit pkg/salt-${svc}.service
+ elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ fi
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2015.8.13.ebuild b/app-admin/salt/salt-2015.8.13.ebuild
new file mode 100644
index 000000000000..88256a21d767
--- /dev/null
+++ b/app-admin/salt/salt-2015.8.13.ebuild
@@ -0,0 +1,140 @@
+# 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 distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+ "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+ "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
+ "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch"
+ "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch"
+)
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ if [[ -e pkg/salt-${svc}.service ]]; then
+ sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die
+ systemd_dounit pkg/salt-${svc}.service
+ elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ fi
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2016.11.7.ebuild b/app-admin/salt/salt-2016.11.7.ebuild
new file mode 100644
index 000000000000..e68adad560f9
--- /dev/null
+++ b/app-admin/salt/salt-2016.11.7.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
+ "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+ "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+ "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
+ "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
+)
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+ # https://github.com/saltstack/salt/issues/39095
+ rm tests/unit/utils/parsers_test.py
+
+ # apparently libcloud does not know about this?
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+ rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2016.3.7.ebuild b/app-admin/salt/salt-2016.3.7.ebuild
new file mode 100644
index 000000000000..4a419b1d258f
--- /dev/null
+++ b/app-admin/salt/salt-2016.3.7.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2016.3.5-tmpdir.patch"
+ "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+ "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+ "${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch"
+)
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+ # apparently libcloud does not know about this?
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+ rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2017.7.1.ebuild b/app-admin/salt/salt-2017.7.1.ebuild
new file mode 100644
index 000000000000..48c9f23243af
--- /dev/null
+++ b/app-admin/salt/salt-2017.7.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-salt[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+)
+
+python_prepare() {
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+ rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+ rm tests/unit/states/test_boto_vpc.py || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+ mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+ (
+ cleanup() {
+ rm -f "${tempdir}"
+ rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+ }
+
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
new file mode 100644
index 000000000000..00fe762b9b6d
--- /dev/null
+++ b/app-admin/salt/salt-9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:*[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ zeromq? (
+ >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/timelib[${PYTHON_USEDEP}]
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ !x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ ${RDEPEND}
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+python_prepare() {
+ # this test fails because it trys to "pip install distribute"
+ rm tests/unit/{modules,states}/zcbuildout_test.py \
+ tests/unit/modules/{rh_ip,win_network}_test.py || die
+
+ # apparently libcloud does not know about this?
+ rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+ # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+ rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -dup /tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}"; }
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose
+
+ ) || die "testing failed"
+}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
new file mode 100644
index 000000000000..7911d1f70cfc
--- /dev/null
+++ b/app-admin/serf/Manifest
@@ -0,0 +1,9 @@
+AUX serf.confd 240 SHA256 f6f7265f4dacf46171513f31ea62432497dac8e4dca78d470b90e5d2692fa03d SHA512 9bb726725a6116d23f4095a3e8f7d401d854c80ee9a5993d718c4aebef77f36a597d7a2e504e3dc95f0a177f2184d79fd253f330fb48b9c028d3bdf2db90b7d9 WHIRLPOOL 4d1a4bd1597f6963a53b14990b870c1365ceee0e6e52c30bf1421dc8248ac0a632a6401a1c7603e1881b26adb830d35b034379169304a2638ca302ebb2e4b409
+AUX serf.initd 683 SHA256 4ddf960da6a96a69490a07c41000cedfb4d9f7ed13dcd2666c65b3c041ad1b05 SHA512 a223d1e002eae3f91b941eb75a2741bb5fc22c78f4ab8ada430ee5e34f85f28410acc26e503eae672911161fab6847c6a7733b51cdad29fa4b4f67cfdc879597 WHIRLPOOL efae90b4fc882c14c8312524e955dc546783a30abd063d7a193386dcdf11653c49e15344031bfc9196897875a3f26a6f7970647b45754cc43eea1df7b1926896
+AUX serf.logrotated 81 SHA256 0d57fd24eba6da224dba64bf06faa7cabcadd0cf1daa32be4c6e41b9667c4732 SHA512 9d3664c123e846de81a2f574a9c2610e254d5ddad1c23b67ef7b8841e933c7aea93a419becaf45af9594ea98ac36d23883bebf3d344205c4756f3e1df9e87518 WHIRLPOOL 42ce8438ab8caa9723882d5a2cc98e2a99f8fe0868eddc08dbfb15a1d186a0811680c172fd7da72bcae2a1a8c78c77c937c24372091a8f9617a2c8b854d21a33
+AUX serf.service 286 SHA256 379e475320bf17f42a65f2de1fa46ae7d3727401a41d79c8b44380812377d054 SHA512 928dfca39afd79b113b299e4de25635fc9f68c64c77951d690797ed5796515d060fc36286f0dc1da63923042e3d8612ca8b1696dd511cb2fbd06550151d2a05b WHIRLPOOL c832befcd84cc595c9b1ef716276ced5ebb18025a7ccfdc166c7986aa87d01a27418e773511609b28b970cec1535fa0019f17023315fb1045dcc48395eba1480
+DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
+DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
+DIST serf-0.8.1.tar.gz 1445011 SHA256 266d38c08d7459d38ba901d7cdaf36122a3cb77049fa537f5ab17fac1747d094 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514 WHIRLPOOL 1d7a39b84b939b73dda817df3f9b98c044a93e20561ed7cb573ee68afc2742a3f7aea9cfc837b6b25cd1abdf390bc84c2460b97b27c2a0090f13f9a73b5a7779
+EBUILD serf-0.8.1-r1.ebuild 2087 SHA256 48d1963ad6b6ae45798046303936c945e49aab9ea88390bb18af443ddbf21f48 SHA512 7fa41ac143f3532bfe612492ca084aa998c072f346e9897f441f31d55d41468615673ced32ef43c01a5e9962822a3b340997fbf167c34260f7083413faa81731 WHIRLPOOL 3a5480abc3d171d3a7932e844ac7e3e2b81a928ccc48e76d6a9b32e1cc15b1ca1098af8e6e229c10c7055679d11805e0c7d4b6ac96eeae0001ac9c239af914f0
+MISC metadata.xml 297 SHA256 b90deec50778c19614f4c7ae5a6ade77a8b647a153074547900f9646a986b350 SHA512 a4e75bdd3c86842ac3de4852d00f264e877c9784754eb9b2d4d38c39123115ded6beae61628b5315d7c19bfbefd1e0360491b37656e34a87b33498b246521e76 WHIRLPOOL a560703d68e9889b50d4a3f3781a3b40bc1bee640f289f99405128fb62bca4788f0875032619f765c30b68bed7ce23b6425a68de849bd1258214b29f5d23ad6e
diff --git a/app-admin/serf/files/serf.confd b/app-admin/serf/files/serf.confd
new file mode 100644
index 000000000000..f5aeaeddf7e7
--- /dev/null
+++ b/app-admin/serf/files/serf.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: serf)
+# - pidfile (default: /run/serf/serf.pid)
+# - user (default: serf)
+
+# extra arguments for the serf agent
+command_args="-config-dir=/etc/serf.d"
diff --git a/app-admin/serf/files/serf.initd b/app-admin/serf/files/serf.initd
new file mode 100644
index 000000000000..042e4f8018a8
--- /dev/null
+++ b/app-admin/serf/files/serf.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="serf agent"
+extra_started_commands="reload"
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="agent ${command_args:-config-dir=/etc/serf.d}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
+
+depend() {
+ need net
+}
+
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ ${command} reload
+ eend $?
+}
diff --git a/app-admin/serf/files/serf.logrotated b/app-admin/serf/files/serf.logrotated
new file mode 100644
index 000000000000..e35d7331b247
--- /dev/null
+++ b/app-admin/serf/files/serf.logrotated
@@ -0,0 +1,7 @@
+/var/log/serf/serf.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/app-admin/serf/files/serf.service b/app-admin/serf/files/serf.service
new file mode 100644
index 000000000000..f2d390fe8222
--- /dev/null
+++ b/app-admin/serf/files/serf.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=serf agent
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=serf
+Environment=SERF_AGENT_OPTS="-config-dir=/etc/serf.d"
+ExecStart=/usr/bin/serf agent $SERF_AGENT_OPTS
+Restart=on-failure
+KillSignal=SIGINT
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/serf/metadata.xml b/app-admin/serf/metadata.xml
new file mode 100644
index 000000000000..213d2fe2fa81
--- /dev/null
+++ b/app-admin/serf/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/serf</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/serf/serf-0.8.1-r1.ebuild b/app-admin/serf/serf-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..963e9bcc99ef
--- /dev/null
+++ b/app-admin/serf/serf-0.8.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+ "github.com/mitchellh/gox c9740af9c6574448fd48eb30a71f964014c7a837"
+ "github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="
+ >=dev-lang/go-1.6:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup serf
+ enewuser serf -1 -1 /var/lib/${PN} serf
+}
+
+src_prepare() {
+ eapply_user
+ # Avoid the need to have a git checkout
+ sed -e 's:^GIT.*::' \
+ -e 's:-X main.GitCommit.*:" \\:' \
+ -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
+
+ # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
+ -e 's:^GIT.*::' \
+ -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+ mkdir "${S}/src/github.com/mitchellh" || die
+ mv "${S}/src/${EGO_PN}/vendor/github.com/mitchellh/"{gox,iochan} \
+ "${S}/src/github.com/mitchellh" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ PATH=${PATH}:${S}/bin \
+ emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_test() {
+ emake -C "${S}/src/${EGO_PN}" test
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/serf.d
+ insinto /etc/serf.d
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners serf:serf "${x}"
+ done
+
+ newinitd "${FILESDIR}/serf.initd" "${PN}"
+ newconfd "${FILESDIR}/serf.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
new file mode 100644
index 000000000000..b1f6443c556f
--- /dev/null
+++ b/app-admin/setools/Manifest
@@ -0,0 +1,16 @@
+AUX setools-3.3.8-no-check-file.patch 558 SHA256 ce1b798f8e1129d2b893dc7de2d9c3fed5a4785f03c55b14a1c7e2d9fec0b037 SHA512 25051dcbb94ddeed623aba598235cb1caaedbb7071dd997c58575ed3cc8266c4421cf070d8f10d5ec6804167bef969fab7227a0241daf7f92e30e1bff0d89080 WHIRLPOOL 85ac00cfac831f22a112fb8420eeaabf1c4d3653ecfb958e68079adb061f773827711ddcce89dfc77d702d8c9460c626ec7c9852cd37e1e01e4eeaa4bcddca28
+AUX setools-3.3.8-policy-max.patch 1051 SHA256 64f06c91af9be789f4e6b6db9f585d76a09670bcb9a5f56e2dd848a89b647bfb SHA512 9eacd76d450b6e68d85f14c4d38cb9370a7cd435610c209d83063b3ddc7bb45f8bd75b1aa8573991e021d4af4205646465b3c2b19ac89296bb7e43147eb0775b WHIRLPOOL 9892fdf63f5a6e27d35edda4ccd984a131c9d96efe458170b8269e2e20e72e2adad412f315fc388774004e1c6ae4af3946d5c8237bcee5c90a65b3cd4b58f854
+AUX setools-4.0.1-remove-gui.patch 1031 SHA256 7aa70f25d6c6b3e45cd5773b1d5f9d26f69535b909249a92c596642807fa3171 SHA512 982c0cd43bdf9473df5dd9584d199bbf1bc71bfee284a2f4e7e800c877bb62bbb6aca03ae3099e481c0538bf3f12d425ca23e19763b1b58c647e9749925283ef WHIRLPOOL 4263180a8ae0c8876ad6fb532e6520b614857c6731bca38169e7a06339e9c32d24d2c4fb2f6111d5573dc23d8480a7e3c3984f22e347940d37549fdeb9390a24
+AUX setools-4.1.0-remove-gui.patch 881 SHA256 383d543b29cb26cbf584f713431a0aea6c3c40ec0a5678cec6eef4754f8b4447 SHA512 b931b0cb7d33e22465c1be849990f2bef07eebdd48ad72d22e5fb2cfa853f6ad2f19a722423db72a4578676376c7d23be557c9932cfe457087a68960f04d15d0 WHIRLPOOL 0561ff8d29bc2b5439083694b5fcf889cb5e0e4de76a2d2ed626958b1b26b4fa38ca7804c397530df5a444ba31d50fa6ae006d26a4fbc28e4724f55bd276b542
+AUX setools-4.1.1-remove-gui.patch 890 SHA256 4189b0c3d7d9cc68e9b1305796c8d4b27a23dc3a1d91b4cebe82eb679cc4bc5e SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6 WHIRLPOOL 965ff603e6f3d72b247c3c5383ccd5d1b5577045d139b1bb69311229253acd279022b6adc135a94395be1db179895e58dd1cae3e30d8b6cd3a2e69b17d90749d
+DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816
+DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
+DIST setools-4.0.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442
+DIST setools-4.1.1.tar.gz 461649 SHA256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 WHIRLPOOL a2982268bb6f407f080718cf841eed097b62e09f5cdb972850d2de7da09562bf0e1b3092fbfd6770ee03aa8146c637241a9ea44618b7fd1c0d8da393c1b9d9f2
+EBUILD setools-3.3.8-r7.ebuild 3686 SHA256 42023e25980739373b010a3a57f0d75ad745c5029bdf479161649869a4024ea5 SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c WHIRLPOOL 7740c289841cdeb0a658c27f1520cc1cb2ccaf482e1f2a81b670b73a0f1619eeefbed7aca42759fbebabd8a7b708a0ec205f5f8525a01e0db2fc7731469e41a6
+EBUILD setools-4.0.1.ebuild 1245 SHA256 f4e02c54ba171978d081536d924388adb8a5b5805da2ce7466158cf90af001d3 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3 WHIRLPOOL f9fdf299061afd5dcc207e6430bdc71d345c6fc78b655c7c9420db317188121f435f38c27a5b15eb52602c0d41fcdc435d8adb5a8bff9f81064460fd266871c4
+EBUILD setools-4.1.1.ebuild 1309 SHA256 e0a042409713dfa40f0dd8d459d16494c39252c695393d19dbd12ff9c7c9657c SHA512 8013267116ab4ad01152f1b28575f96f1213670ec1de7d82ccb89ad225b1af3c828733d25e68681e00823bef429a5f8bdb270dce8be4bfd24da4397506c308ce WHIRLPOOL 2d91775a1b01391082fddd74b26ad6fdef22bab2731a177e27c7cf37ba50fb66bc2c2ca80d8303808495ec84a545e002df969f2471b5b92b0cf5f1090ae9c6a6
+EBUILD setools-9999.ebuild 1311 SHA256 06f28c36f24c9273c19c1b1640ef84a3f71314c22b60aaffacbc752f1192896e SHA512 8eaf4dc0b43c38adc6e206eccb60f52e34e1049e29a8ba51ce035f61307ee28a513867732ac8fe03f0a6e02adadc9c9b7afdd3f1edecd2f5e7918a64bbf2b9e6 WHIRLPOOL 4bc2f7776424e86e9da53349d26a8b2bbb4aaef62a6626a351753abb59bd53abb3e828f9512844b1a31afdc4beac7dd83a9e19fa68ef109e3e3b06efe09346b4
+MISC ChangeLog 5140 SHA256 8e79850635caf36462120694daa381d14b742f63a8a3cbd0ff2cc2ee132ce204 SHA512 05e8c3a148150d3f849955ecbf6ba2afe26250c0589ace0cf9747a33ff27f191af0ad5dbd83a5e1bc5aa230c9c639e8c2319ae797dd939ba5b7ac1d42cb68854 WHIRLPOOL f9ff886df693422539a6cd39265d506e3577bcaa55e9d8ef306f79d3943a9e8ec422c19ef0021dacde802a8ee8740ac9793487cd139bc1f3242f3ece8bffd7a0
+MISC ChangeLog-2015 14070 SHA256 bec7f864d78e8ce6fe5154849b5812b59997d667d135bbea4303712caba86ec1 SHA512 427cb0ec019f621f26153c1ba61da38b40d8c3de05f7a70a6361b5eab6f66a96fd9f17f01a7a2662040b7914ffb0dcf4e57272a472f81de01dda76785800202f WHIRLPOOL 9408d6ebc29caa71b2795377d710007628657cf48f895f9787d7d544eb32b8badddfd1c3014f4250729c314cd4525aada13a262689a18ed77edeadfaffb0ef99
+MISC metadata.xml 403 SHA256 dd38714f015f8ddee0a34b8d9711e68f388d63f6057e8a9b13b9152b1185297c SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6 WHIRLPOOL ed51a619b4afb53017e26d3b273463e641beb0aed9f6fcce5c6c7137e4b1b2016262cce0f0ecfa9f4072f7037f25ad50ad036dc040cb359c4fad8a50f05c75ec
diff --git a/app-admin/setools/files/setools-3.3.8-no-check-file.patch b/app-admin/setools/files/setools-3.3.8-no-check-file.patch
new file mode 100644
index 000000000000..31848e9564b8
--- /dev/null
+++ b/app-admin/setools/files/setools-3.3.8-no-check-file.patch
@@ -0,0 +1,15 @@
+there's no real need to run AC_CHECK_FILE to see if a file exists. if the
+static link fails later on, then the static lib didn't exist. this also
+breaks cross-compiling.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -448,8 +448,6 @@
+ sepol_srcdir="")
+ if test "x${sepol_srcdir}" = "x"; then
+ sepol_srcdir=${sepol_devel_libdir}
+- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
+- AC_MSG_ERROR([make sure libsepol-static is installed]))
+ else
+ AC_MSG_CHECKING([for compatible sepol source tree])
+ sepol_version=${sepol_srcdir}/VERSION
diff --git a/app-admin/setools/files/setools-3.3.8-policy-max.patch b/app-admin/setools/files/setools-3.3.8-policy-max.patch
new file mode 100644
index 000000000000..cf6917a671d1
--- /dev/null
+++ b/app-admin/setools/files/setools-3.3.8-policy-max.patch
@@ -0,0 +1,29 @@
+trying to run compiled code fails when cross-compiling.
+probe the value using the preprocessor instead.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -621,21 +621,8 @@
+ sepol_new_errcodes="yes",
+ sepol_new_errcodes="no")
+
+-AC_RUN_IFELSE(
+- [AC_LANG_SOURCE([
+-#include <sepol/policydb/policydb.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-int main(void) {
+- FILE *f = fopen("conftest.data", "w");
+- if (f != NULL && fprintf(f, "%d", POLICYDB_VERSION_MAX) > 0) {
+- fclose(f);
+- exit(EXIT_SUCCESS);
+- }
+- exit(EXIT_FAILURE);
+-}])],
+- sepol_policy_version_max=`cat conftest.data`,
+- AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
++printf "#include <sepol/policydb/policydb.h>\nPOLICYDB_VERSION_MAX\n" > conftest.c
++sepol_policy_version_max=`${CPP} -E -P ${CPPFLAGS} conftest.c | tail -1`
+ AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
+ CFLAGS="${sepol_save_CFLAGS}"
+ CPPFLAGS="${sepol_save_CPPFLAGS}"
diff --git a/app-admin/setools/files/setools-4.0.1-remove-gui.patch b/app-admin/setools/files/setools-4.0.1-remove-gui.patch
new file mode 100644
index 000000000000..bb93ff269b83
--- /dev/null
+++ b/app-admin/setools/files/setools-4.0.1-remove-gui.patch
@@ -0,0 +1,17 @@
+--- setools-4.0.1/setup.py.orig 2016-05-22 19:50:02.586000000 +0200
++++ setools-4.0.1/setup.py 2016-05-22 19:50:56.107000000 +0200
+@@ -163,11 +163,10 @@
+ 'build_lex': LexCommand,
+ 'build_ext': BuildExtCommand,
+ 'build_qhc': QtHelpCommand},
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff', 'setools.policyrep'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1") ),
+- (join(sys.prefix, 'share/setools'), glob.glob("data/*.ui") +
+- ["data/perm_map", "qhc/apol.qhc"] )],
++ (join(sys.prefix, 'share/setools'), ["data/perm_map"] ),],
+ ext_modules=ext_py_mods,
+ test_suite='tests',
+ license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/files/setools-4.1.0-remove-gui.patch b/app-admin/setools/files/setools-4.1.0-remove-gui.patch
new file mode 100644
index 000000000000..67d7fe5c6eea
--- /dev/null
+++ b/app-admin/setools/files/setools-4.1.0-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 4e7645c..aa3895a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+ 'build_lex': LexCommand,
+ 'build_ext': BuildExtCommand,
+ 'build_qhc': QtHelpCommand},
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff', 'setools.policyrep'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+- package_data={'': ['*.ui', '*.qhc'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ ext_modules=ext_py_mods,
+ test_suite='tests',
+ license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/files/setools-4.1.1-remove-gui.patch b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
new file mode 100644
index 000000000000..1bb78f5fd964
--- /dev/null
+++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2ca44c9..0c8a0d9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -180,10 +180,10 @@ setup(name='setools',
+ 'build_lex': LexCommand,
+ 'build_ext': BuildExtCommand,
+ 'build_qhc': QtHelpCommand},
+- packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
+- scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++ packages=['setools', 'setools.diff', 'setools.policyrep'],
++ scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+ data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+- package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++ package_data={'setools': ['perm_map']},
+ ext_modules=ext_py_mods,
+ test_suite='tests',
+ license='GPLv2+, LGPLv2.1+',
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
new file mode 100644
index 000000000000..8e9f11ed8b4c
--- /dev/null
+++ b/app-admin/setools/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>selinux@gentoo.org</email>
+ <name>SELinux Team</name>
+ </maintainer>
+ <longdescription>SELinux policy analysis tools.</longdescription>
+ <upstream>
+ <remote-id type="github">TresysTechnology/setools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
new file mode 100644
index 000000000000..3240c25b84d5
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit autotools java-pkg-opt-2 python-r1 eutils toolchain-funcs
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+ https://dev.gentoo.org/~perfinion/patches/setools/${P}-04-gentoo-patches.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+IUSE="X debug java python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMONDEPEND=">=sys-libs/libsepol-2.4
+ >=sys-libs/libselinux-2.4
+ >=dev-db/sqlite-3.2:3
+ dev-libs/libxml2:2
+ python? ( ${PYTHON_DEPS} )
+ X? (
+ >=dev-lang/tk-8.4.9:0=
+ >=gnome-base/libglade-2.0
+ >=x11-libs/gtk+-2.8:2
+ )"
+
+DEPEND="${COMMONDEPEND}
+ >=sys-devel/automake-1.12.1
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ java? ( dev-lang/swig
+ virtual/jdk:= )
+ python? ( dev-lang/swig )"
+
+RDEPEND="${COMMONDEPEND}
+ java? ( >=virtual/jre-1.4:= )
+ X? ( >=dev-tcltk/bwidget-1.8 )"
+
+RESTRICT="test"
+# setools dirs that contain python code to build
+PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+
+pkg_setup() {
+ if use java; then
+ java-pkg-opt-2_pkg_setup
+ fi
+}
+
+src_prepare() {
+ EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+ EPATCH_FORCE="yes" \
+ epatch
+
+ epatch "${FILESDIR}"/${PN}-3.3.8-no-check-file.patch
+ epatch "${FILESDIR}"/${PN}-3.3.8-policy-max.patch
+
+ # Fix build failure due to double __init__.py installation
+ sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+ # Disable broken check for SWIG version. Bug #542032
+ sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ # Python bindings are built/installed manually.
+ sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+ # Make PYTHON_LDFLAGS replaceable during running `make`.
+ sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+ done
+
+ epatch_user
+
+ eautoreconf
+
+ # Disable byte-compilation of Python modules.
+ echo '#!/bin/sh' > py-compile
+}
+
+src_configure() {
+ tc-ld-disable-gold #467136
+ econf \
+ --with-java-prefix=${JAVA_HOME} \
+ --disable-selinux-check \
+ --disable-bwidget-check \
+ $(use_enable python swig-python) \
+ $(use_enable java swig-java) \
+ $(use_enable X swig-tcl) \
+ $(use_enable X gui) \
+ $(use_enable debug)
+
+ # work around swig c99 issues. it does not require
+ # c99 anyway.
+ sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+ emake
+
+ if use python; then
+ building() {
+ python_export PYTHON_INCLUDEDIR
+ python_export PYTHON_SITEDIR
+ python_export PYTHON_LIBS
+ emake \
+ SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \
+ PYTHON_LDFLAGS="${PYTHON_LIBS}" \
+ pyexecdir="${PYTHON_SITEDIR}" \
+ pythondir="${PYTHON_SITEDIR}" \
+ -C "$1"
+ }
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ python_foreach_impl building ${dir}
+ done
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use python; then
+ installation() {
+ python_export PYTHON_SITEDIR
+ emake DESTDIR="${D}" \
+ pyexecdir="${PYTHON_SITEDIR}" \
+ pythondir="${PYTHON_SITEDIR}" \
+ -C "$1" install
+ }
+
+ local dir
+ for dir in ${PYTHON_DIRS}; do
+ python_foreach_impl installation "${dir}"
+ done
+ fi
+}
diff --git a/app-admin/setools/setools-4.0.1.ebuild b/app-admin/setools/setools-4.0.1.ebuild
new file mode 100644
index 000000000000..4f9175aaf823
--- /dev/null
+++ b/app-admin/setools/setools-4.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 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="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 ~arm64 ~mips x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+ >=sys-libs/libselinux-2.4:=[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ app-arch/bzip2:=
+ dev-libs/libpcre:=
+ X? (
+ dev-python/PyQt5
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.12:0
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-libs/libsepol-2.5
+ test? (
+ python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+ dev-python/tox[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.0.1-remove-gui.patch )
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
new file mode 100644
index 000000000000..f33d361a1154
--- /dev/null
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+ >=sys-libs/libsepol-2.7:=
+ >=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ dev-libs/libpcre:=
+ X? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.12:0
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-libs/libsepol-2.5
+ test? (
+ python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+ dev-python/tox[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
new file mode 100644
index 000000000000..f1e79d0d9367
--- /dev/null
+++ b/app-admin/setools/setools-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 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="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+ >=sys-libs/libsepol-2.7:=
+ >=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ dev-libs/libpcre:=
+ X? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.12:0
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-libs/libsepol-2.5
+ test? (
+ python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
+ dev-python/tox[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.0-remove-gui.patch )
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
new file mode 100644
index 000000000000..de4d0e6451d3
--- /dev/null
+++ b/app-admin/socklog/Manifest
@@ -0,0 +1,6 @@
+AUX socklog-2.1.0-headers.patch 925 SHA256 6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419 WHIRLPOOL 29d971746c61eabd4c4c3d42bb6fb76ca53a69e859d457b0820c2e316a0373e8c60aea62df9b0f210a99469543004f29215f1d6864a46e271abced9ab2ae9702
+DIST socklog-2.1.0.tar.gz 56942 SHA256 aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7 WHIRLPOOL b0dcf0eeacbd3edb0465ccbd40ec546fe293c3d293fac254e11ca8c07514b01de2a6d45a6ef0ce697e33a5d631810af62955fb66333f2606f36dc51587025806
+EBUILD socklog-2.1.0.ebuild 878 SHA256 aa1b52e185767329a1c5e82a7f1bdd2010b6ccd5cf06f9aa9b7f1acc9330b796 SHA512 a65fb7d7b8f4b7c88fedd2ef6d747abc1aa3381426066ad2ad2f980e5ab418a8ee3b5d43bafc9f8ac7d14f8d9815f8c7232bc54f1a4c278a2f22b6c25173db6d WHIRLPOOL d91150e39541d666f01a064816ddc09bc1a07fc774daf088131681a899cb27ae31b6e3697ee6b76cbd749b61adeee8a7711cfe6c4489dbb58014b51b497d110f
+MISC ChangeLog 2464 SHA256 99b9e80db47207713bc58aa8c58dd30592b57300800bf0b010143081d450a647 SHA512 352535da4552ec2d626e25e357d9843006a9c75a9353ccc05ba217e442675c2f83e8574761aff7ff95f931764ab532e57484f60a983571dee38109cbfae45adc WHIRLPOOL de6c81c08b28972d1b279f468b364384d9b3c5c37e65ba473a21aed0f5ea68f8fbfc76a93eee32fa550868ec8299e353224244b4c57247b55cea9c37e638ac41
+MISC ChangeLog-2015 1882 SHA256 8f4f22c396ce72efb1007ff9cd604b4669ac129a2689d19ced55bf24b3ff28c4 SHA512 a1f4abc4dae09ad86208933499f518e719a46bca4f5c672e5cf3cb06a32777956420befa2daac73abc649c4e36737301fe58b6ff1d36707e3e3b600492fbad6b WHIRLPOOL 2d554936dfbc6e1f648cd44b7a73b2df14b68cf6d6298b8f0398332d805d9489f25cd561dd1796695094b0a646e72b101f17cc6239aa3c5c3e1e8dfcd6c30139
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-admin/socklog/files/socklog-2.1.0-headers.patch b/app-admin/socklog/files/socklog-2.1.0-headers.patch
new file mode 100644
index 000000000000..b7c10e3da606
--- /dev/null
+++ b/app-admin/socklog/files/socklog-2.1.0-headers.patch
@@ -0,0 +1,54 @@
+add missing headers for misc funcs and types
+
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,10 +1,11 @@
+ /* Public domain. */
+
+ #include <unistd.h>
++#include <grp.h>
+
+ int main()
+ {
+- short x[4];
++ gid_t x[4];
+
+ x[0] = x[1] = 0;
+ if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+--- a/pathexec_run.c
++++ b/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+--- a/prot.c
++++ b/prot.c
+@@ -1,12 +1,15 @@
+ /* Public domain. */
+
++#include <unistd.h>
++#include <grp.h>
++
+ #include "hasshsgr.h"
+ #include "prot.h"
+
+ int prot_gid(int gid)
+ {
+ #ifdef HASSHORTSETGROUPS
+- short x[2];
++ gid_t x[2];
+ x[0] = gid; x[1] = 73; /* catch errors */
+ if (setgroups(1,x) == -1) return -1;
+ #else
+--- a/seek_set.c
++++ b/seek_set.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+
++#include <unistd.h>
+ #include <sys/types.h>
+ #include "seek.h"
+
diff --git a/app-admin/socklog/metadata.xml b/app-admin/socklog/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/socklog/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>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
new file mode 100644
index 000000000000..f7853dd9904b
--- /dev/null
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="small secure replacement for syslogd with automatic log rotation"
+HOMEPAGE="http://smarden.org/socklog/"
+SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=sys-process/runit-1.4.0"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.1.0-headers.patch
+ use static && append-ldflags -static
+ echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc
+ echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+ dobin tryto uncat socklog-check || die
+ dosbin socklog socklog-conf || die
+
+ cd ..
+ dodoc package/CHANGES
+ dohtml doc/*.html
+ doman man/*
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
new file mode 100644
index 000000000000..fcb9a5b86caa
--- /dev/null
+++ b/app-admin/sshguard/Manifest
@@ -0,0 +1,9 @@
+AUX sshguard.confd 634 SHA256 ee121f8c4c045ba1cfa67a173040358b1ea5c0561427d64dbd1092a24f068519 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50 WHIRLPOOL ff935afd4a3611610136ce117562ac6b4137a1c69b27117c51e944de5a091844de842c64e990123ccd13c8b775a8c70a6b8b9b12b93c66114a7649f90ab2394f
+AUX sshguard.initd 572 SHA256 759ef54c0f54a27023020ff8da7811b38459a194d7d75d15ea88f7609b2a013c SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7 WHIRLPOOL 855f2823d38a80c208e754e249a31b31d00a019d7adb976216720a3fb98e48e15d829466c96afcae3da1ef4872af2cc94e1305cbde2ef3dc333027cf99ea480a
+DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
+DIST sshguard-2.0.0.tar.gz 886995 SHA256 e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4 WHIRLPOOL 9ee1dc00c8f5571b3f36575e793a263dd70fa61f23c52bb446df5ffcddae981adbf7eb3c9dd6ad3894c1e434293297ab4894537a697df6282678ff5ebb5c3af9
+EBUILD sshguard-1.7.1.ebuild 1226 SHA256 ceb2f79d92f976569c597fa0be6afd77e23d2403d30abf0c5f23e723c624e5fb SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973 WHIRLPOOL c1308912e922af560269eeded9c6b267a3cb7e5788b0254060b0ac120afa0d500f036994728368fbfd0ee0b0efad122a58a6aad819ef9f6191603c126cd449ee
+EBUILD sshguard-2.0.0.ebuild 891 SHA256 2e34ac923f39347d82ee0b280d8bf60ead891ed38bc4bd14e1244a094fed7f16 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965 WHIRLPOOL 61fcebccc60c97fed4f6a57642895227bae7cd9a247870c6481c2791acbd156393121907801ee9467044ccef2a4e33616269870315115493c9dc730db3834923
+MISC ChangeLog 4254 SHA256 eaa6f2711106460318d556aef3f7f0e62dc82f10177d193f60f3a400e4ba94ca SHA512 ef97796e890fab12c8b03707a42d76759457dd1350ecbd772f40e66f39f5b1a643958fa20c8c0c2324b630ecd6ebb3ef890aad477a0457b77fd6e29172a1b296 WHIRLPOOL 109df28dadc52bdbf8d5d3d6fbbee7a0c5e34b936331a0a22284f7367ba063bb6705d65044413e40a8b87ca3568e96f73484376372d5713cabd62c928dcb6ea8
+MISC ChangeLog-2015 3411 SHA256 0b12c834f0a95041a023e9e36432da480f9ca49dd19d105865cc8d02517ed16a SHA512 5bd3f8a5f63a0dc036f5320243bb07d96953bc03d9a2ff51820778a817612f2ab9e07e59db9f2e76d68db5cdce39dfa93cb90955db18caa06a9d96407b914edd WHIRLPOOL 19d9a00d8dcfc869cf49618f20b1debb59c3cd967cbb1b8591749f5d97669084589d8af2a68a2302e7abcea8ae85526785e4ce5e0de843fa098437d7ae212de1
+MISC metadata.xml 467 SHA256 b423370fb24f542610016f009bfab7cbd668b4211c9fb0e88e4c14302f4c9993 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 WHIRLPOOL 138db6422139317a253113f2cce164cfe6d91c330ed0f6963ddd5b620fdd5b0941454276e511f9f2c8f49c1d50ec6904b15db43a67bbdcbd3a185822888780cb
diff --git a/app-admin/sshguard/files/sshguard.confd b/app-admin/sshguard/files/sshguard.confd
new file mode 100644
index 000000000000..326f8918aaa4
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.confd
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Config file for /etc/init.d/sshguard
+# See sshguard(8) for details.
+
+# Initial (empty) options.
+SSHGUARD_OPTS=""
+
+# Files to monitor
+# -l <source>
+SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/auth.log"
+
+# White listing
+# -w <addr/host/block/file>
+#SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24"
+
+# Define how long in milliseconds start-stop-daemon waits to check that
+# sshguard is still running before calling success or failure.
+# Values lower than the default of 999 are probably not useful.
+SSHGUARD_WAIT="999"
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
new file mode 100644
index 000000000000..f1360ce8610b
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ after iptables
+ use logger
+}
+
+SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
+
+start() {
+ ebegin "Starting sshguard"
+ [ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
+ start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
+ /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping sshguard"
+ start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
+ eend $?
+}
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
new file mode 100644
index 000000000000..d74b83ce78bc
--- /dev/null
+++ b/app-admin/sshguard/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>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <use>
+ <flag name="ipfilter">Enable ipfilter firewall support (only for *bsd)</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">sshguard</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/sshguard/sshguard-1.7.1.ebuild b/app-admin/sshguard/sshguard-1.7.1.ebuild
new file mode 100644
index 000000000000..a730edfc107c
--- /dev/null
+++ b/app-admin/sshguard/sshguard-1.7.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="ipfilter kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ kernel_linux? ( net-firewall/iptables )
+ kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/flex
+"
+RDEPEND="
+ ${CDEPEND}
+ virtual/logger
+"
+
+DOCS=(
+ CHANGELOG.rst
+ README.rst
+ examples/sshguard.service
+ examples/whitelistfile.example
+)
+
+src_prepare() {
+ default
+
+ sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
+}
+
+src_configure() {
+ # Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
+ append-cppflags -D_DEFAULT_SOURCE
+
+ local myconf
+ if use kernel_linux; then
+ myconf="--with-firewall=iptables"
+ elif use kernel_FreeBSD; then
+ if use ipfilter; then
+ myconf="--with-firewall=ipfw"
+ else
+ myconf="--with-firewall=pf"
+ fi
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-admin/sshguard/sshguard-2.0.0.ebuild b/app-admin/sshguard/sshguard-2.0.0.ebuild
new file mode 100644
index 000000000000..5ff11bd2529b
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="ipfilter kernel_FreeBSD kernel_linux"
+
+CDEPEND="
+ kernel_linux? ( net-firewall/iptables )
+ kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/flex
+"
+RDEPEND="
+ ${CDEPEND}
+ virtual/logger
+"
+
+DOCS=(
+ CHANGELOG.rst
+ CONTRIBUTING.rst
+ README.rst
+ examples/net.sshguard.plist
+ examples/sshguard.service
+ examples/whitelistfile.example
+)
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+ insinto /etc
+ newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
new file mode 100644
index 000000000000..ef22a76c2e53
--- /dev/null
+++ b/app-admin/stow/Manifest
@@ -0,0 +1,5 @@
+DIST stow-2.2.2.tar.gz 579324 SHA256 e2f77649301b215b9adbc2f074523bedebad366812690b9dc94457af5cf273df SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5 WHIRLPOOL 261899d7e9765e9c7de587e8084b714e6ed8ea90497fa813dbd8a309d17aa4b3edaf47436c2936c9a93d5338f32ffe8c0734b1c4c2e44ca39c8ace1da4ef0891
+EBUILD stow-2.2.2-r1.ebuild 576 SHA256 95fad90283b5178cf4bd49cebbf5c691c6b192c643d6006f26db6124c3020690 SHA512 fa5ce84c1b276d878f9b12d7850ee3fffd3f9c519c1b37c33ae27447f559f4c0ebb0999fa3f15fd7f0060bb2df84e3365c3a7bc35cc3a59c3b1d22bd5ede078f WHIRLPOOL d9f0fcf990473248448daa76876581c83f6b24e2a2b820441c955db76386c29d5057bb20331fd59240044c1d08b450347964594350675dcb5e38b6b3591bf77d
+MISC ChangeLog 3793 SHA256 52876bca7cbbe81d0b0d377f131bbe696d96b03f8518cb149972abf12c595a6a SHA512 07113ce63abc76d2c61acf678ef792e28efc33c9eddd9e57bc16d7f0c9d19b368e17f2e951d023f8ac626a0054551c5523a58242377672f3c95d1faba851ee12 WHIRLPOOL ccda6f95af89f75096db4203b02cd800643c903df21f957ead98d1a9be22622ce9800a6fe898d811b1b28f8dc929b4f3db798304b2675d8967f79ec03ed61e27
+MISC ChangeLog-2015 2790 SHA256 68638e44913b984db019e48c91050810b9d276292991735f3abe430d48904b6a SHA512 7252a36604b5034ac07520c09b0e3d46a471660d821492a09053b5aabec8ac9fdafa9b8d9934e2ffc9f6ca4988449d0b9ed641c2c833f3f72edcd05231f2d9f0 WHIRLPOOL 765ca1ed36dc8b6b7aeab0de55c507a906071e7a25aef3448d3c4326dd81d37ef630c05eac39c8b6b350ab6c1bbf0eba75fa14085dd5cb3ca6e16275b20d97fd
+MISC metadata.xml 546 SHA256 7424bea5ba34c3a52c9c9c310dd92c55e43e17ebaf371cf07b389592df9cacad SHA512 8cd24a346eeea318438e6c573f4c621c09b8d6d3e8986fc53cdf811c7198f7b00c3cd2e761db2e591325bd43d81181bf8def75f24c683fd909c009e016db01f6 WHIRLPOOL 91add53931803323e812668dfcb03993c482efa9d7268aa95d27a7639995aafa71c5d9fcd762927909c51054a6cce1121a1f7d8b8eca858f350b7a950f3468ca
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
new file mode 100644
index 000000000000..eacb94b4c4cb
--- /dev/null
+++ b/app-admin/stow/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>ewfalor@gmail.com</email>
+ <name>Erik Falor</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..d4c2355c5953
--- /dev/null
+++ b/app-admin/stow/stow-2.2.2-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 perl-functions
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/"
+SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+DEPEND="dev-lang/perl
+ test? (
+ virtual/perl-Test-Harness
+ dev-perl/Test-Output
+ )"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+ perl_set_version
+ econf "--with-pmdir=${VENDOR_LIB}"
+}
diff --git a/app-admin/sud/Manifest b/app-admin/sud/Manifest
new file mode 100644
index 000000000000..79f742f0afa8
--- /dev/null
+++ b/app-admin/sud/Manifest
@@ -0,0 +1,6 @@
+AUX sud.rc6 387 SHA256 186563f9fd6c59bbac44dcad3409eb157186d7b491d88e86dc924316528212b1 SHA512 07feba04e36df02e5cab6260f5943d4a72c3549a604d9db33a2f4734b39a60a3514899c0831bf1fe5ce073889989d42f0ae64d1f7bb0735fca7fd2584887364b WHIRLPOOL 24c977a0463a5759ce77403ca619421f828c6363f8e3ac30812afcb6cf6ccd9b0b37e0634995d0471481841877b9f56860e6926b69ed63464355c65f2971bcaf
+DIST sud-1.3.tar.gz 117542 SHA256 c4fdf9dfc7a58daf75cb37d2bc4d10d3767216e2b8e4861a87c2d274bac252a0 SHA512 54b58b54e665133dcc40f00708a929bc038df1e2ce18514d830e3f3f823110bd27a209771fc378c2bcd372692e168f55150f12893e2fbd433b51e2173dbd410e WHIRLPOOL 1a59305b9afc2d35e5bb7b9c58c3b554d8fb01748abffd2e88c79bdde24e4d7046947347b45cbdae20e62a0f4712e91b7446812ce5f5d18ed194e4b886f95f4f
+EBUILD sud-1.3-r1.ebuild 1259 SHA256 33d049bdeb61081acdf61e14b39689d2813dc1695535a2547b1260902fcf8645 SHA512 83c13836a02c45d372856a24e316af73bfd1fe50201d420309482e2a1359507a02472ae55865a737d54812cfcc4a5a07b7caaa3b2301c57c6fd887ee2d601da3 WHIRLPOOL 485e10fd2ced5613347d6140602a75a52e2d4fb24a7dbdbe47287bf5b0407f90f4d04452acb0f07312009799dda20c5e0373ff51180ad233bb4818a7e06511a8
+MISC ChangeLog 2558 SHA256 a6e8d1bf679a4ed7564d2e4c94da70ea8e9c419db2a9a2f45e791078fa5dd01f SHA512 ad3ed1766c38edcfde71bb6c2cc48e9d9160afcd066a489d210c70cd90906ba25ef2d054c4ccc4757dfd7a6baf080e2aef75b398023848e903ff49233ee93b73 WHIRLPOOL 357a6df4df9bfd09970cdb6f6037c2a1c66a03444e95b1e8843ef35817570173a72ad79101c9a08262225addcce56efdf7becf2d2e622364922c1b0d08d08f37
+MISC ChangeLog-2015 1532 SHA256 7cc687fc27889aa92b85dfe02c7c53b0e0780892db43314235ff8fe9cb308860 SHA512 755ea954ba9522fc3e60c8d82ea47921ef43319ebcf141d8b68102293d97e5bfbdfec4743580e4203a85f48c34d0ab67de0ca1b1764af8e3a9fbc940c8a84135 WHIRLPOOL 5c6859506773f31106dd0137c52fa23e51d97bcc63f4b77f9f50d99e8d92bc25d330c0c67c9fea39c2516f260f53a5811c1f62629b28357b9e80bc44c9ef8643
+MISC metadata.xml 719 SHA256 833196e2b0a3b662d97c6b29f51a1defc7d86c3bd918fc8498457c9aa03da593 SHA512 94b453b02af38033f480fa0cd38b6614f4f972a1f2f826e56eda1668db212a31bd6643146f40ba220f77e748c6ba29935527b0a363fcc3cb87e617cfc2ee5938 WHIRLPOOL 23e2c2ff7d6db92dc88f4c3dc3db9610b82e87925ee22b2418edc0cf1bebfe0260ab0cc3b9554f55d7e3601a788f2ad20661ba2a9777c2286c0d797dc2e4615a
diff --git a/app-admin/sud/files/sud.rc6 b/app-admin/sud/files/sud.rc6
new file mode 100644
index 000000000000..068acf776173
--- /dev/null
+++ b/app-admin/sud/files/sud.rc6
@@ -0,0 +1,20 @@
+#!/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 sud"
+ start-stop-daemon --start --quiet --pidfile /var/run/sud.pid \
+ --exec /usr/sbin/sud
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping sud"
+ start-stop-daemon --stop --quiet --pidfile /var/run/sud.pid
+ eend $?
+}
diff --git a/app-admin/sud/metadata.xml b/app-admin/sud/metadata.xml
new file mode 100644
index 000000000000..39516e080887
--- /dev/null
+++ b/app-admin/sud/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>lu_zero@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<longdescription>
+sud (superuser daemon) permits a user to switch to root privileges and to use a suid program in a nosuid environment. It is based on a client/server model and on the ability to pass file descriptors between processes. sud permits you to choose your authentication method, and your effective credentials will be checked by using a Unix domain socket.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
new file mode 100644
index 000000000000..ef9d6f7005de
--- /dev/null
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
+HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
+SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+src_prepare() {
+ sed -i -e \
+ 's/install-data-hook:$/& install-exec/' \
+ -e \
+ 's:chmod 500 $(sbindir)/ilogin:chmod 500 $(DESTDIR)$(sbindir)/ilogin:' \
+ "${S}"/login/Makefile.in || die "sed failed."
+ sed -i -e \
+ 's/install-data-hook:$/& install-exec/' \
+ -e \
+ 's:chmod 555 $(bindir)/suz:chmod 500 $(DESTDIR)$(bindir)/suz:' \
+ "${S}"/su/Makefile.in || die "sed failed."
+ sed -i -e \
+ 's/install-data-hook:$/& install-exec/' \
+ -e \
+ 's:chmod 500 $(sbindir)/sud:chmod 500 $(DESTDIR)$(sbindir)/sud:' \
+ "${S}"/sud/Makefile.in || die "sed failed."
+}
+
+src_configure() {
+ append-flags -D_GNU_SOURCE
+ default_src_configure
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+ dodoc AUTHORS ChangeLog* README NEWS TODO
+ doman ilogin.1 sud.1 suz.1
+ insinto /etc
+ doins miscs/sud.conf*
+ newinitd "${FILESDIR}"/sud.rc6 sud
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
new file mode 100644
index 000000000000..b776b4a19f29
--- /dev/null
+++ b/app-admin/sudo/Manifest
@@ -0,0 +1,10 @@
+DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
+DIST sudo-1.8.21p1.tar.gz 2975522 SHA256 ee50d3a249a96b1c5c8d3d21380eb96c63c6e61a888b13e3c2b941b23ab7c808 SHA512 081dff35cbc2724b0481139490601665b7e10e19c8cffcd00918cb51a914f1b7103c7d04b3361e229b63d404c68c47598ca6f59a7c3c00a5b3b7aed74bae9e45 WHIRLPOOL 13f8dba536f7e70b8025bddbe25ca73859d062f3ffe7f3137fc4393453f59863a7984cd0de250e6c6fa4a34e2a1e2f617932e506cca4327d64ae49f8913bbe92
+DIST sudo-1.8.21p2.tar.gz 2976081 SHA256 74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c WHIRLPOOL 94d9c9abdbb93f37f13179e934004b61f930978a4b0372aa0ccf0ff1aead51af272cb296554affb24e92d7f828b285f0d923fb87b19e1173e470f4b27fa1e538
+EBUILD sudo-1.8.20_p2.ebuild 5753 SHA256 068f861f7d24aa5a4660a3014e28205f3ecdc903b9f77793e51214ff9ca09e82 SHA512 dac3f07f7c4a6ad493535fa9a753424ff9bd03777cc4330eb5575cf7c0a862b5b2c60e5229a9634e80dd001f8498b4effd5c3ef5b33b4e9723d919657162904e WHIRLPOOL 5075f57c3e9d49b84e9099c6fec4298bf60848219074953b7691b8299a0c2bfa584ba57e51a346f4aff5a8fa2abd57da81551858f2cc15a5a16aabf00c6abd8a
+EBUILD sudo-1.8.21_p1.ebuild 5819 SHA256 2e0f5ac8189fd6aed30a75b87015a2fe06bde18701fe3a523f95ebae4a0a2099 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0 WHIRLPOOL 6eb1747b7172eb51d54a1f2628d9bbd16201be25de7038979eb398f8ee38a0a8945a890471ae2ce1f947fcc7a0cc74fc821a661948c5bec2cb515fff92f5887f
+EBUILD sudo-1.8.21_p2.ebuild 5819 SHA256 2e0f5ac8189fd6aed30a75b87015a2fe06bde18701fe3a523f95ebae4a0a2099 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0 WHIRLPOOL 6eb1747b7172eb51d54a1f2628d9bbd16201be25de7038979eb398f8ee38a0a8945a890471ae2ce1f947fcc7a0cc74fc821a661948c5bec2cb515fff92f5887f
+EBUILD sudo-9999.ebuild 5959 SHA256 866acbc3607c2d372d9effb1e95e888d103ed42fdc9fd7010795abe2b8cd6d25 SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c WHIRLPOOL 729ff48668dd43841091bbda92e83a31409eaf9b991879193ea4da7c9b0c7b8edf98be353c6b2b124be3133f72c2ea95d60f133ac052a1c0342e28af440c6471
+MISC ChangeLog 10568 SHA256 88c3586b178e3222f190930a0c39bbb7755261152ac866a3ab6142f9cd740fef SHA512 b06ee9dc63142e847ec5045a84baadb5e0790b63aa87f05a6c0584261648d4f2b10be30c4cf2040316d5c3ff193ce7fa3df20f3982ec8388b5998cba4798d878 WHIRLPOOL c78f7ec2b5eda9e68aaa6a0eea4d2bbb1498d43970465eaf0d5016bbd8b73a703689632a69a66d2775fa6b41d8f5dc80af8fbff0339603d5952d0edc73cea07a
+MISC ChangeLog-2015 56371 SHA256 4ffe6c477fa8f0d089b6d135501283d409b880528f21162a52f8512555a1bc39 SHA512 af41912ac5e32ced0eea056593bdfd569c16a09760d42f79be1901ae8bed2ad98dc13b75d1c82861a0ccad613434076b63853bcb7c755fa775911e9688d7562e WHIRLPOOL 79db049d5b1286721e07d170b381b4fe8ff2433781e25c55fa7e4f999caa61f68d9282d47139b274e64d2f73a325cd18b26762ea6cd128cec7a70b4cd5c3ed37
+MISC metadata.xml 1035 SHA256 56b9c0d884f41a5c5174a0324a7e3dbab3f6a23794f0feae4c36fb149a3bce3d SHA512 c68b8c6977af60d3606d0b9854298192b35d43f16db7a41c92c7c9f1439f7950f6c6af93c3c9c4f3ff7ea4fda810e0c2375c0625c44150f7c6263ac7d1f9b60c WHIRLPOOL 396f0cebd849d866db3c768d540c7bb3b4132cd92588666e041e94d1165d22f31cc9026c20ba1635a47ec8ba605cfb62cff47a60521fbaf42b019054490b3b2e
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
new file mode 100644
index 000000000000..1625b901ce32
--- /dev/null
+++ b/app-admin/sudo/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="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ <longdescription lang="en">
+ Sudo (superuser do) allows a system administrator to give certain
+ users (or groups of users) the ability to run some (or all)
+ commands as root or another user while logging the commands and
+ arguments.
+ </longdescription>
+ <use>
+ <flag name="gcrypt">
+ Use SHA2 from <pkg>dev-libs/libgcrypt</pkg>
+ instead of sudo's internal SHA2.
+ </flag>
+ <flag name="offensive">
+ Let sudo print insults when the user types the wrong password.
+ </flag>
+ <flag name="openssl">
+ Use SHA2 from <pkg>dev-libs/openssl</pkg>
+ instead of sudo's internal SHA2.
+ </flag>
+ <flag name="sendmail">
+ Allow sudo to send emails with sendmail.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/sudo/sudo-1.8.20_p2.ebuild b/app-admin/sudo/sudo-1.8.20_p2.ebuild
new file mode 100644
index 000000000000..621ff50e219c
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.20_p2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl selinux skey +sendmail"
+
+CDEPEND="
+ gcrypt? ( dev-libs/libgcrypt:= )
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ sys-libs/zlib
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sudo )
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ sendmail? ( virtual/mta )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ pam? ( !skey )
+ skey? ( !pam )
+ ?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_rootpath() {
+ # FIXME: secure_path is a compile time setting. using ROOTPATH
+ # is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+ if [[ -z ${ROOTPATH} ]] ; then
+ ewarn " Failed to find ROOTPATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ ROOTPATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${ROOTPATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ ROOTPATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local ROOTPATH
+ set_rootpath
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-secure-path="${ROOTPATH}"
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable openssl)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with ldap)
+ $(use_with pam)
+ $(use_with skey)
+ $(use_with selinux)
+ $(use_with sendmail)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+ dosbin plugins/sudoers/sudoers2ldif
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo
+ fperms 0700 /var/db/sudo
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.21_p1.ebuild b/app-admin/sudo/sudo-1.8.21_p1.ebuild
new file mode 100644
index 000000000000..0af84eaf37f1
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.21_p1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+ gcrypt? ( dev-libs/libgcrypt:= )
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ sys-libs/zlib
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sudo )
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ sendmail? ( virtual/mta )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ pam? ( !skey )
+ skey? ( !pam )
+ ?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_rootpath() {
+ # FIXME: secure_path is a compile time setting. using ROOTPATH
+ # is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+ if [[ -z ${ROOTPATH} ]] ; then
+ ewarn " Failed to find ROOTPATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ ROOTPATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${ROOTPATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ ROOTPATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local ROOTPATH
+ set_rootpath
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-secure-path="${ROOTPATH}"
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable openssl)
+ $(use_enable sasl)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with ldap)
+ $(use_with pam)
+ $(use_with skey)
+ $(use_with selinux)
+ $(use_with sendmail)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+ dosbin plugins/sudoers/sudoers2ldif
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo
+ fperms 0700 /var/db/sudo
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.21_p2.ebuild b/app-admin/sudo/sudo-1.8.21_p2.ebuild
new file mode 100644
index 000000000000..0af84eaf37f1
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.21_p2.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+ gcrypt? ( dev-libs/libgcrypt:= )
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ sys-libs/zlib
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sudo )
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ sendmail? ( virtual/mta )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ pam? ( !skey )
+ skey? ( !pam )
+ ?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_rootpath() {
+ # FIXME: secure_path is a compile time setting. using ROOTPATH
+ # is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+ if [[ -z ${ROOTPATH} ]] ; then
+ ewarn " Failed to find ROOTPATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ ROOTPATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${ROOTPATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ ROOTPATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local ROOTPATH
+ set_rootpath
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-secure-path="${ROOTPATH}"
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable openssl)
+ $(use_enable sasl)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with ldap)
+ $(use_with pam)
+ $(use_with skey)
+ $(use_with selinux)
+ $(use_with sendmail)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+ dosbin plugins/sudoers/sudoers2ldif
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo
+ fperms 0700 /var/db/sudo
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
new file mode 100644
index 000000000000..62a104c7aebc
--- /dev/null
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="http://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+ fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey"
+
+CDEPEND="
+ sys-libs/zlib
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+"
+RDEPEND="
+ ${CDEPEND}
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
+ sendmail? ( virtual/mta )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ pam? ( !skey )
+ skey? ( !pam )
+ ?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_rootpath() {
+ # FIXME: secure_path is a compile time setting. using ROOTPATH
+ # is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+ if [[ -z ${ROOTPATH} ]] ; then
+ ewarn " Failed to find ROOTPATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ ROOTPATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${ROOTPATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ ROOTPATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local ROOTPATH
+ set_rootpath
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-secure-path="${ROOTPATH}"
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable openssl)
+ $(use_enable sasl)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with ldap)
+ $(use_with pam)
+ $(use_with skey)
+ $(use_with selinux)
+ $(use_with sendmail)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+ dosbin plugins/sudoers/sudoers2ldif
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo
+ fperms 0700 /var/db/sudo
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest
new file mode 100644
index 000000000000..6b62169f82c6
--- /dev/null
+++ b/app-admin/superadduser/Manifest
@@ -0,0 +1,6 @@
+AUX 1.0.9/superadduser 13973 SHA256 0ae832ca94b2b648dc0be30e71fda02b6dc7b8259fb3bf445d0833b37b4222bf SHA512 3eac518597abf1ce6b5562137003c875df41f30df3394a2afdb3458833736c73ad47e94edcda06f71c207c203a43449b8f740e3345f853976e550657b372bdba WHIRLPOOL 9db864f894aae334be85137b23c61a095cba1d1ddf52682d9bbda4776e7b31f5d516ca6df1c5c9196610ff97832d8acd0450e3c7b383d4ba5c5135954091e0e8
+AUX superadduser.8 517 SHA256 87c423e40c11b3608c235d2fb2b6ad2505a909c83ff9b285ab59888967b9475d SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f WHIRLPOOL d49280376c39487e7d96451abbd5a3913e2063d0a102802ab21a56ee444dba6287a7451169db9a98bd5105e74044f2287902b99be9d829d9d259ae75f45a0c4d
+EBUILD superadduser-1.0.9.ebuild 474 SHA256 d002ae3db10da62703a245ac9f23850461e0d9f892d56865dc2dc119210b56e7 SHA512 ebbbbb3e0d84d670ad93f4bd3595e6e3b9c7050bdb8360da3fdd472bf8f0682c0a7057c0d8fb8c2a29a32b8fea5a28eb1deed2b7f3bae7a2810a750c7d6e1504 WHIRLPOOL a73b5820810a98d8ac5ec77a7497e5120c145294fef61b66d17dfa99e701f76b055d3178e2a4cba004ab4e168ff01f50d5efc7b423f826a2842e6d64f92f81aa
+MISC ChangeLog 2495 SHA256 87171501e61048abada67b20d8f259e2dca376287e745f478fef9d1698fc9160 SHA512 1ac0e0a2d50bd382a5d87f47dd13048418fdb8c255b34f84ab3381c78a96d6263513c2fbf22ccb9c39a2d2b8adc029fe81d39d9f852e5fb1790726eacb3afbe8 WHIRLPOOL 1346de37000d5786c154e8ec58da9be6443fa85a20f7c5ac42231b0229d9ac438470fe7b7cd2c2c4718e8ae96480c4cb09c761e939ad889ac04624d19fc51b49
+MISC ChangeLog-2015 5884 SHA256 566b8e48a39f900ff0f1125baf84d3fc39fc9dc66b702a16798cbf4060f3fd27 SHA512 419b47a12f1479d532b9325349ffcaa91cc1c5bcacc186ec90182d13a27e212139ea7734f1fab56392fee05678c561c9abdeada1ec1c421ebf3131e443d14fe3 WHIRLPOOL 80d15de6c999226bcd56f70b3cd0198dfb614529166494e15d39d0bcbd7415ce6ab2780329fb58d34dc22a4dca01cfa46add161b380084d7478190bca7ebeef0
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/app-admin/superadduser/files/1.0.9/superadduser b/app-admin/superadduser/files/1.0.9/superadduser
new file mode 100644
index 000000000000..dd5e3158ddad
--- /dev/null
+++ b/app-admin/superadduser/files/1.0.9/superadduser
@@ -0,0 +1,407 @@
+#!/bin/bash
+#
+# Copyright 1995 Hrvoje Dogan, Croatia.
+# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK.
+# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+##########################################################################
+# Program: /usr/sbin/adduser
+# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
+# Author : Stuart Winter <stuart@polplex.co.uk>
+# Based on the original Slackware adduser by Hrvoje Dogan
+# with modifications by Patrick Volkerding
+# Version: 1.09
+##########################################################################
+# Usage..: adduser [<new_user_name>]
+##########################################################################
+# History #
+###########
+# v1.09 - 07/06/04
+# * Added standard Slackware script licence to the head of this file.
+# v1.08 - 25/04/04
+# * Disallow user names that begin with a numeric because useradd
+# (from shadow v4.03) does not allow them. <sw>
+# v1.07 - 07/03/03
+# * When supplying a null string for the uid (meaning 'Choose next available'),
+# if there were file names in the range 'a-z' in the pwd then the
+# egrep command considered these files rather than the null string.
+# The egrep expression is now in quotes.
+# Reported & fixed by Vadim O. Ustiansky <sw>
+# v1.06 - 31/03/03
+# * Ask to chown user.group the home directory if it already exists.
+# This helps reduce later confusion when adding users whose home dir
+# already exists (mounted partition for example) and is owned
+# by a user other than the user to which the directory is being
+# assigned as home. Default is not to chown.
+# Brought to my attention by mRgOBLIN. <sw>
+# v1.05 - 04/01/03
+# * Advise & prevent users from creating logins with '.' characters
+# in the user name. <sw>
+# * Made pending account creation info look neater <sw>
+# v1.04 - 09/06/02
+# * Catered for shadow-4.0.3's 'useradd' binary that no longer
+# will let you create a user that has any uppercase chars in it
+# This was reported on the userlocal.org forums
+# by 'xcp' - thanks. <sw,pjv>
+# v1.03 - 20/05/02
+# * Support 'broken' (null lines in) /etc/passwd and
+# /etc/group files <sw>
+# * For recycling UIDs (default still 'off'), we now look in
+# /etc/login.defs for the UID_MIN value and use it
+# If not found then default to 1000 <sw>
+# v1.02 - 10/04/02
+# * Fix user-specified UID bug. <pjv>
+# v1.01 - 23/03/02
+# * Match Slackware indenting style, simplify. <pjv>
+# v1.00 - 22/03/02
+# * Created
+#######################################################################
+
+# Path to files
+pfile=/etc/passwd
+gfile=/etc/group
+sfile=/etc/shells
+
+# Paths to binaries
+useradd=/usr/sbin/useradd
+chfn=/usr/bin/chfn
+passwd=/usr/bin/passwd
+chmod=/bin/chmod
+
+# Defaults
+defhome=/home
+defshell=/bin/bash
+defchmod=711 # home dir permissions - may be preferable to use 701, however.
+defgroup=users
+
+# Determine what the minimum UID is (for UID recycling)
+# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
+export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
+# If we couldn't find it, set it to the default of 1000
+if [[ -z "$recycleUIDMIN" ]]; then
+ export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs
+fi
+
+
+# This setting enables the 'recycling' of older unused UIDs.
+# When you userdel a user, it removes it from passwd and shadow but it will
+# never get used again unless you specify it expliticly -- useradd (appears to) just
+# look at the last line in passwd and increment the uid. I like the idea of
+# recycling uids but you may have very good reasons not to (old forgotten
+# confidential files still on the system could then be owned by this new user).
+# We'll set this to no because this is what the original adduser shell script
+# did and it's what users expect.
+recycleuids=no
+
+# Function to read keyboard input.
+# bash1 is broken (even ash will take read -ep!), so we work around
+# it (even though bash1 is no longer supported on Slackware).
+function get_input() {
+ local output
+ if [[ "`echo $BASH_VERSION | cut -b1`" = "1" ]]; then
+ echo -n "${1} " >&2 # fudge for use with bash v1
+ read output
+ else # this should work with any other /bin/sh
+ read -ep "${1} " output
+ fi
+ echo $output
+}
+
+# Function to display the account info
+function display () {
+ local goose
+ goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs
+ echo -n "$1 "
+ # If it's null then display the 'other' information
+ if [ -z "$goose" -a ! -z "$3" ]; then
+ echo "$3"
+ else
+ echo "$goose"
+ fi
+}
+
+# Function to check whether groups exist in the /etc/group file
+function check_group () {
+ local got_error group
+ if [[ ! -z "$@" ]]; then
+ for group in $@ ; do
+ local uid_not_named="" uid_not_num=""
+ grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes
+ grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
+ if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
+ echo "- Group '$group' does not exist"
+ got_error=yes
+ fi
+ done
+ fi
+ # Return exit code of 1 if at least one of the groups didn't exist
+ if [[ ! -z "$got_error" ]]; then
+ return 1
+ fi
+}
+
+#: Read the login name for the new user :#
+#
+# Remember that most Mail Transfer Agents are case independant, so having
+# 'uSer' and 'user' may cause confusion/things to break. Because of this,
+# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
+# and we must reject them, too.
+
+# Set the login variable to the command line param
+echo
+LOGIN="$1"
+needinput=yes
+while [[ ! -z $needinput ]]; do
+ if [[ -z "$LOGIN" ]]; then
+ while [[ -z "$LOGIN" ]]; do LOGIN="$(get_input "Login name for new user []:")" ; done
+ fi
+ grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used
+ if [[ $? -eq 0 ]]; then
+ echo "- User '$LOGIN' already exists; please choose another"
+ unset LOGIN
+ elif [[ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]]; then
+ echo "- User names cannot begin with a number; please choose another"
+ unset LOGIN
+ elif [[ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]]; then # useradd does not allow uppercase
+ echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
+ unset LOGIN
+ elif [[ ! -z "$( echo $LOGIN | grep '\.' )" ]]; then
+ echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
+ unset LOGIN
+ else
+ unset needinput
+ fi
+done
+
+# Display the user name passed from the shell if it hasn't changed
+if [[ "$1" = "$LOGIN" ]]; then
+ echo "Login name for new user: $LOGIN"
+fi
+
+#: Get the UID for the user & ensure it's not already in use :#
+#
+# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
+# when you change password for the uid, it finds the first match in /etc/passwd
+# which isn't necessarily the correct user
+#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
+ grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
+ if [[ $? -eq 0 ]]; then
+ echo "- That UID is already in use; please choose another"
+ elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
+ echo "- UIDs are numerics only"
+ else
+ unset needinput
+ fi
+done
+# If we were given a UID, then syntax up the variable to pass to useradd
+if [[ ! -z "$_UID" ]]; then
+ U_ID="-u ${_UID}"
+else
+ # Will we be recycling UIDs?
+ if [[ "$recycleuids" = "yes" ]]; then
+ U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
+ fi
+fi
+
+#: Get the initial group for the user & ensure it exists :#
+#
+# We check /etc/group for both the text version and the group ID number
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ GID="$(get_input "Initial group [ ${defgroup} ]:")"
+ check_group "$GID"
+ if [[ $? -gt 0 ]]; then
+ echo "- Please choose another"
+ else
+ unset needinput
+ fi
+done
+# Syntax the variable ready for useradd
+if [[ -z "$GID" ]]; then
+ GID="-g ${defgroup}"
+else
+ GID="-g ${GID}"
+fi
+
+#: Get additional groups for the user :#
+#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ AGID="$(get_input "Additional groups (comma separated) []:")"
+ AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing
+ if [[ ! -z "$AGID" ]]; then
+ check_group "$AGID" # check all groups at once (treated as N # of params)
+ if [[ $? -gt 0 ]]; then
+ echo "- Please re-enter the group(s)"
+ else
+ unset needinput # we found all groups specified
+ AGID="-G $(echo "$AGID" | tr ' ' ,)"
+ fi
+ else
+ unset needinput # we don't *have* to have additional groups
+ fi
+done
+
+#: Get the new user's home dir :#
+#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
+ if [[ -z "$HME" ]]; then
+ HME="${defhome}/${LOGIN}"
+ fi
+ # Warn the user if the home dir already exists
+ if [[ -d "$HME" ]]; then
+ echo "- Warning: '$HME' already exists !"
+ getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")"
+ if [[ "$(echo $getyn | grep -i "n")" ]]; then
+ unset needinput
+ # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
+ getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
+ if [[ "$(echo $getyn | grep -i "y")" ]]; then
+ CHOWNHOMEDIR=$HME # set this to the home directory
+ fi
+ fi
+ else
+ unset needinput
+ fi
+done
+HME="-d ${HME}"
+
+#: Get the new user's shell :#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ unset got_error
+ SHL="$(get_input "Shell [ ${defshell} ]")"
+ if [[ -z "$SHL" ]]; then
+ SHL="${defshell}"
+ fi
+ # Warn the user if the shell doesn't exist in /etc/shells or as a file
+ if [[ -z "$(grep "^${SHL}$" $sfile)" ]]; then
+ echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
+ got_error=yes
+ fi
+ if [[ ! -f "$SHL" ]]; then
+ echo "- Warning: ${SHL} does not exist as a file"
+ got_error=yes
+ fi
+ if [[ ! -z "$got_error" ]]; then
+ getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")"
+ if [[ "$(echo $getyn | grep -i "n")" ]]; then
+ unset needinput
+ fi
+ else
+ unset needinput
+ fi
+done
+SHL="-s ${SHL}"
+
+#: Get the expiry date :#
+echo
+needinput=yes
+while [[ ! -z "$needinput" ]]; do
+ EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
+ if [[ ! -z "$EXP" ]]; then
+ # Check to see whether the expiry date is in the valid format
+ if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
+ echo "- That is not a valid expiration date"
+ else
+ unset needinput
+ EXP="-e ${EXP}"
+ fi
+ else
+ unset needinput
+ fi
+done
+
+# Display the info about the new impending account
+echo
+echo "New account will be created as follows:"
+echo
+echo "---------------------------------------"
+display "Login name.......: " "$LOGIN"
+display "UID..............: " "$_UID" "[ Next available ]"
+display "Initial group....: " "$GID"
+display "Additional groups: " "$AGID" "[ None ]"
+display "Home directory...: " "$HME"
+display "Shell............: " "$SHL"
+display "Expiry date......: " "$EXP" "[ Never ]"
+echo
+
+echo "This is it... if you want to bail out, hit Control-C. Otherwise, press"
+echo "ENTER to go ahead and make the account."
+read junk
+
+echo
+echo "Creating new account..."
+echo
+echo
+
+# Add the account to the system
+CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
+$CMD
+
+if [[ $? -gt 0 ]]; then
+ echo "- Error running useradd command -- account not created!"
+ echo "(cmd: $CMD)"
+ exit 1
+fi
+
+# chown the home dir ? We can only do this once the useradd has
+# completed otherwise the user name doesn't exist.
+if [[ ! -z "${CHOWNHOMEDIR}" ]]; then
+ chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
+fi
+
+# Set the finger information
+$chfn "$LOGIN"
+if [[ $? -gt 0 ]]; then
+ echo "- Warning: an error occurred while setting finger information"
+fi
+
+# Set a password
+$passwd "$LOGIN"
+if [[ $? -gt 0 ]]; then
+ echo "* WARNING: An error occured while setting the password for"
+ echo " this account. Please manually investigate this *"
+ exit 1
+fi
+
+# If it was created (it should have been!), set the permissions for that user's dir
+HME="$(echo "$HME" | awk '{print $2}')" # We have to remove the -g prefix
+if [[ -d "$HME" ]]; then
+ $chmod $defchmod "$HME"
+fi
+
+echo
+echo
+echo "Account setup complete."
+exit 0
+
diff --git a/app-admin/superadduser/files/superadduser.8 b/app-admin/superadduser/files/superadduser.8
new file mode 100644
index 000000000000..efefadcd14d6
--- /dev/null
+++ b/app-admin/superadduser/files/superadduser.8
@@ -0,0 +1,20 @@
+.TH superadduser "8" "April 2002" "superadduser 1.0"
+.SH NAME
+superadduser \- manual page for the superadduser program, an interactive
+version of adduser.
+.SH SYNOPSIS
+.B superadduser
+.SH DESCRIPTION
+Superadduser interactively asks the user to fill in the necessary parameters to
+the
+.I shadow
+package's useradd program.
+.PP
+.SH AUTHOR
+Man page by Karl Trygve Kalleberg <karltk@gentoo.org>
+.br
+Script by Stuart Winter <stuart@polplex.co.uk>
+.SH "SEE ALSO"
+useradd(8)
+.TP
+The \fI/usr/sbin/superadduser\fR script.
diff --git a/app-admin/superadduser/metadata.xml b/app-admin/superadduser/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-admin/superadduser/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>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
new file mode 100644
index 000000000000..2b2feb3db800
--- /dev/null
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Interactive adduser script from Slackware"
+HOMEPAGE="http://www.interlude.org.uk/unix/slackware/"
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="sys-apps/shadow"
+
+src_install() {
+ dosbin "${FILESDIR}"/${PV}/superadduser || die
+ doman "${FILESDIR}"/superadduser.8
+}
diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest
new file mode 100644
index 000000000000..063134a41eb9
--- /dev/null
+++ b/app-admin/supernova/Manifest
@@ -0,0 +1,9 @@
+DIST supernova-2.0.9.tar.gz 22877 SHA256 c90518015b5bc12809e8b6a73907773764f0f1eebd5b85cfb06048ddacbffae9 SHA512 8270f871efcf7c8741078e4658dd8413796a14bd9eb43514beb8b120462db757a5324c5c3c9e4988d8725ec9b903e7743c6ae336dd5f73536e1e0df456ba54a9 WHIRLPOOL 4baa73a956b4f85a25e1f8b7df30115389201ccf165fb21333a11ac0214fd6cbb547b29dc7040c39660890fabb869b961a6904d9ea293f1c92b8c8675ba6a4f3
+DIST supernova-2.1.0.tar.gz 23196 SHA256 e8233be47eb1ef30d326fd40fa0ebce396ad8021d950b5df2348c436411e6dd6 SHA512 fa4f6b3f0a3b5a19c309b507ce8c356a929c8a8cf805c45d58a8f4c1bc36f508a0d04477570cf79e7660e94d803df8a02e67206465e75eb3452e43cb6ca186aa WHIRLPOOL 08845b3199ecd09a2419fe379354e3a7bd286b0d617a51b15e30db5448cd44d27571881ab54bb263ec0cd6ecf9f93435774eddc7d26b74acff3c3e55e3fe32e9
+DIST supernova-2.2.0.tar.gz 24068 SHA256 d6f1ac7990400ef5490ffc38b9fcb6ca6ed8827c07e1471ec7192ae584084dfd SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063 WHIRLPOOL 3938b4c72025d29ba0ebbdc5619398b57f01751a388f48b60bbc46101b09c2481675c4bbc33d921c5a90385f5b140c05d4f35d9d9d16f66c01a90ef0d0c32ed6
+EBUILD supernova-2.0.9.ebuild 1255 SHA256 6ae6e24eecbf5eef5e07cbf1fc9d84c6a3a655637010fdcf9eddac8f2f4d0b2f SHA512 cc96e4e331c6deb1a714973d93f64d418804756fd80d27a51cbb0775d292504f96a47d038544e87bac3485f8f36cc3e2fd2a858430c22fe494b2881ec64cfcdd WHIRLPOOL df43e4070feda7ad639bf2c4ce1189b03f25cd12a6d1b79173119654d3b88451671417239840f7fe098901265fa21a271059f37c86f2d624bfb216df4bb7a9b3
+EBUILD supernova-2.1.0.ebuild 1246 SHA256 0071659ed042291e15bf9ef2ef4e15eb6fdab778fd5388b9987f5d475bfabe44 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d WHIRLPOOL 4284dc257ed2dd2fee5eb45487cd3574de41cfdc2a9fa722acef6ebe96fd70d961b6f057e0bced5f5c8aae9d830b94c775ff8c61730f488b7f51bb7694539d35
+EBUILD supernova-2.2.0.ebuild 1246 SHA256 0071659ed042291e15bf9ef2ef4e15eb6fdab778fd5388b9987f5d475bfabe44 SHA512 a0a7cf3bc5f829c04d4f06762a87239bf153e2f76d395f8b353cd30f661b8070208c8e5213d53d69af3da8fb7709a8abfa3bd2ba428625244c500b9b4892240d WHIRLPOOL 4284dc257ed2dd2fee5eb45487cd3574de41cfdc2a9fa722acef6ebe96fd70d961b6f057e0bced5f5c8aae9d830b94c775ff8c61730f488b7f51bb7694539d35
+MISC ChangeLog 3908 SHA256 282bc08b7597947f377a5a328799f48386e6ee866b627a8e6be09051cf02c913 SHA512 9f1034f7c0ce06f33d36241fcde5c41e5685c6e70b8b265c0d9ab4634b8608464a70451111eee9da1af79ce15a0598767ce80c8b1a83a2ab79e4a374350a380d WHIRLPOOL 72488c54fad60a533684c5f2c781577f941cfb9578d55351c9c94a2bb459b1b1334ee54033550151d4ba837d01295c18d11a25e83cf8756e6091165ec82fbdec
+MISC ChangeLog-2015 2024 SHA256 1164c08734c75c57ea144032a8d1557ca825c9c5da88798e1711b53e983489cd SHA512 1802cadd1f958156d41c8448af35b1264218fff99fabd4c50dcfc4a65ad27fa4690b5ce51c103ae75159f9e3abfc4013f4fcdcdb28cd17f035c220c672bde217 WHIRLPOOL 1f2b74233bf159b00f0e6ed465c26ed4fb9c1bcf31ad160022b4add3691637641f6edafa7357783ea5b49e2dcd9697456e3a2186a1b92892cf96cc4d3454e44a
+MISC metadata.xml 392 SHA256 7f0a939c91985205f4f6a79e45b3418cb0699d82a0c05623601f359977bfbcce SHA512 6dd5869a5d45116b13cffd648948305c17b0248bee5804feff4062064bf662c5e879731f5fc526320a5a28d49d290e961229085dc4e450d3a4cdf1f5fda8f158 WHIRLPOOL c9634e00efc0efcafb26d369d51a3856625709bbc8456c30610e4c69eccccd240d390d8a6c21cfcbd5e703cee92ca4e9020ea35b63baf60138377aaf519cfbab
diff --git a/app-admin/supernova/metadata.xml b/app-admin/supernova/metadata.xml
new file mode 100644
index 000000000000..a617f5068968
--- /dev/null
+++ b/app-admin/supernova/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>alunduil@gentoo.org</email>
+ <name>Alex Brandt</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rackerhacker/supernova</remote-id>
+ <remote-id type="pypi">supernova</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/supernova/supernova-2.0.9.ebuild b/app-admin/supernova/supernova-2.0.9.ebuild
new file mode 100644
index 000000000000..1ddd3b07ee06
--- /dev/null
+++ b/app-admin/supernova/supernova-2.0.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="novaclient wrapper for multiple nova environments"
+HOMEPAGE="https://github.com/rackerhacker/supernova"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ ${CDEPEND}
+ dev-python/click[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
+ dev-python/python-novaclient[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ if use doc; then
+ mkdocs build || die "docs failed to build"
+ fi
+}
+
+python_test() {
+ distutils_install_for_testing
+ cd "${TEST_DIR}"/lib || die
+ py.test || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( site/. )
+ use examples && local EXAMPLES=( example_configs/. )
+
+ distutils-r1_python_install_all
+
+ newbashcomp contrib/${PN}-completion.bash ${PN}
+}
diff --git a/app-admin/supernova/supernova-2.1.0.ebuild b/app-admin/supernova/supernova-2.1.0.ebuild
new file mode 100644
index 000000000000..148043720999
--- /dev/null
+++ b/app-admin/supernova/supernova-2.1.0.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 bash-completion-r1 distutils-r1
+
+DESCRIPTION="novaclient wrapper for multiple nova environments"
+HOMEPAGE="https://github.com/rackerhacker/supernova"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ ${CDEPEND}
+ dev-python/click[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
+ dev-python/python-novaclient[${PYTHON_USEDEP}]
+ dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ if use doc; then
+ mkdocs build || die "docs failed to build"
+ fi
+}
+
+python_test() {
+ py.test || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( site/. )
+ use examples && local EXAMPLES=( example_configs/. )
+
+ distutils-r1_python_install_all
+
+ newbashcomp contrib/${PN}-completion.bash ${PN}
+}
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
new file mode 100644
index 000000000000..148043720999
--- /dev/null
+++ b/app-admin/supernova/supernova-2.2.0.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 bash-completion-r1 distutils-r1
+
+DESCRIPTION="novaclient wrapper for multiple nova environments"
+HOMEPAGE="https://github.com/rackerhacker/supernova"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ ${CDEPEND}
+ dev-python/click[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
+ dev-python/python-novaclient[${PYTHON_USEDEP}]
+ dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ if use doc; then
+ mkdocs build || die "docs failed to build"
+ fi
+}
+
+python_test() {
+ py.test || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( site/. )
+ use examples && local EXAMPLES=( example_configs/. )
+
+ distutils-r1_python_install_all
+
+ newbashcomp contrib/${PN}-completion.bash ${PN}
+}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
new file mode 100644
index 000000000000..cfdd0bb28081
--- /dev/null
+++ b/app-admin/supervisor/Manifest
@@ -0,0 +1,10 @@
+AUX conf.d 85 SHA256 312ec20f53a96a4daf6f49c2928c4d1243a527ac8e32ecd882ec1a7a3d6b72eb SHA512 73a831b1d5b30686fa8120cbb3317ca2291da72f8217e1402791eee1dee7d232b26b9146e8eee5ce75c69a4c1c7993bb29eeb5de758cf731f1c093ecb340fcc2 WHIRLPOOL dc5cc98cecd01b5b3853782263b329651520f47399f3c9eadc88e706bb724aa17af46476111e746f8362fa9603f76acf03fbd4a902a563701c6c58337ceb4aba
+AUX init.d 630 SHA256 4dcf5e8c47e1e129c8310cae7228f6ccf2a0e095f4d8873a7a42e66d4ff7b3b4 SHA512 95f7320dc8c4de958f9b61c0d39f9fe27ee8916a23dfc2ea9af0ad46b76302e93232dc4c418739769a5c34b204e8c6cd3bad8a4dd85fc2fd854e62e99b571fc2 WHIRLPOOL d4e1d7e3c7bd57e3d06892b00386f8f709f187cf8dbedeef049b904c4a318bf6a207413a36e9561412b7d9da2c1987b2f4dc25e413919f610fdd4902d83f68cf
+AUX init.d-r1 452 SHA256 cde9257d39bc908cf16724eb0b14ea01978bb64c5ac4795acd365de26d270d0c SHA512 8490213db35c47d31ae901401673ad7ffb6a15e32abc54ac8d3ac50fe59261a0767dbd706015edfef4dfd83c9ecd2c7c9201c9cb4a04d0b2f5634280c5883959 WHIRLPOOL 6838524d34665a10d9cb00b709292dc2b174574dba0071cc1455ac296c34a6cf46e6bf92097a090d2fa76c383f870aae7e4f35c59b614bed064ea297ffb666fa
+DIST supervisor-3.1.4.tar.gz 392321 SHA256 82f75089f719a7a3ca87f35c89a03c20fd3c0912552c96eb6fa40274ced6604e SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07 WHIRLPOOL 64a3b7c46b6c2a2c5d67ebfc44fef0f3382ff98a2468b3c210f03b205a3cbf6d7604788b985c98b093c20a1950b4a343a86cf914713072fa2f28f50f0478f63e
+DIST supervisor-3.3.3.tar.gz 418354 SHA256 96287ebfabf9a6923f74123b056c4da39c617fef367980f007cac02fba6527ad SHA512 8285445da8a0ed790fbdf75d988304ab8fcefd9c36975ae6526ec58f511c73cd8707f22b7cff40c3aed5e63f3665d096ed4b5dbc2cc456fe0c5b4547149dbb4a WHIRLPOOL e7d880f76fb6a3eabe6d4c78c19464e1f4880d195e58bdd10d829beb8962f9d8bd39ac5274ec96c6d47ac9478f5f3b80a36131cbbda275bc23b33bd664ca9d2a
+EBUILD supervisor-3.1.4.ebuild 1193 SHA256 c5bb5e2667d8065510c068cf8bc0150c31d48dec4b5a68878ec7858107980e7a SHA512 a1be2bc91dea3bf91e0b3507345805e924d52fc1c61e85c1474349aee595cbf27f1fc14e945be2d428240ffad95a0594951360c7cca6664e53d00cdfca3d6637 WHIRLPOOL 1f5c4905f1cbb8c8823635eb8aa15f56e4b8f0c5be55ec7adb5122b9edf9471225adf6dd905f2bfc97203566beeb14339a669daf84305ed7e14bb874bc4bad87
+EBUILD supervisor-3.3.3.ebuild 1078 SHA256 c6856a8259d9a6db77f347f75fa0858755d4c2aca814be2f578c25dbcb6550a6 SHA512 718292f6c63fb0508ccb8db825115dc2d688df4f2abab4a2a42974208c3cde932d3be350a0fd32a1be7f70dc86db8f027f7e78dbac72b901a5b064f7c919dba1 WHIRLPOOL ccdf1a49f5447c76b8986b730535109ddb16a457db5bf9ee117acc5138e86bb549fa2e02a9c8e7bb6c28ddc49d4d781ed25af7ac21a745841101c9e8e1a867b8
+MISC ChangeLog 4217 SHA256 3bcbf84dd2752198f84acee9f899e61eb7a542213b957bb49ec1da346e361297 SHA512 1a716e1980ab9613da9d4f73a9302fcfbaff32b73bd6b7c2b2f17f16be9d22b7d57fbe039b98899db18d2965d97e85b5fbb38ed0b0694195ca565bb679b0934b WHIRLPOOL 2705a654e2ddbda5632327399dd46b931324dcc0a666ac9f1a98e225dafff9c89f0cd20cac1fcd3315641c7cc78ba409e241b4f15aa733f93e66ca57ef2c6350
+MISC ChangeLog-2015 3726 SHA256 bfc99e69bd2c8a71be081e5e4d1473449a6197eeb500fb398dad219329575fab SHA512 cd70990f3382fc32617a11c64ec3afddde4aeda8c8e886ea814bf3e279e8c67fc9fb2d67373cca7817ebd036ba290852b232a590d3d1133371900218557a97bd WHIRLPOOL ae542edc4cc0eec1d123af5f6ff21a11182c0b2360ae6b7c524c91be89511b037280b0253d69e928c21ac9bede7a09ffeb0e44a353899fbc79b49d5c2e42fe69
+MISC metadata.xml 747 SHA256 7240f879becb428b3b5c96cb92cf4bb7e3313136d8178b08d227d99bd324384d SHA512 420e1cc33360e66c4d45c4ed7bd535615669b073bd7f5f7e5fd2c21f561b6246e19fe01bdc93809068f923f2025a5ef9fbfb133da6b451af7780dc514586037b WHIRLPOOL 14434358fee58e87727e80b7bccf6c00009380c7d974a8faae4a4aab867801f4c4e27223bc30b2c5b521018daf1c871ec73d323e578b63be15d1346f4a43bce9
diff --git a/app-admin/supervisor/files/conf.d b/app-admin/supervisor/files/conf.d
new file mode 100644
index 000000000000..922f4ce4132f
--- /dev/null
+++ b/app-admin/supervisor/files/conf.d
@@ -0,0 +1,4 @@
+# /etc/conf.d/supervisord
+
+# Options to pass to the supervisord process
+SUPD_OPTS=""
diff --git a/app-admin/supervisor/files/init.d b/app-admin/supervisor/files/init.d
new file mode 100644
index 000000000000..bf8d00c9517d
--- /dev/null
+++ b/app-admin/supervisor/files/init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+ if [ ! -f /etc/supervisord.conf ] ; then
+ eerror "Please create /etc/supervisord.conf:"
+ eerror "echo_supervisord_conf >> /etc/supervisord.conf"
+ return 1
+ fi
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+ ebegin "Starting supervisord"
+ start-stop-daemon --start \
+ --exec /usr/bin/supervisord -b --pidfile /var/run/supervisord.pid \
+ -- -n ${SUPD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping supervisord"
+ start-stop-daemon --stop --pidfile /var/run/supervisord.pid
+ eend $?
+}
diff --git a/app-admin/supervisor/files/init.d-r1 b/app-admin/supervisor/files/init.d-r1
new file mode 100644
index 000000000000..f22f49d54947
--- /dev/null
+++ b/app-admin/supervisor/files/init.d-r1
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems"
+
+command="/usr/bin/supervisord"
+pidfile="/var/run/supervisord.pid"
+command_args="--nodaemon --pidfile ${pidfile} ${SUPD_OPTS}"
+command_background="yes"
+
+required_files="/etc/supervisord.conf"
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
new file mode 100644
index 000000000000..c1f55481525e
--- /dev/null
+++ b/app-admin/supervisor/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>sautier.louis@gmail.com</email>
+ <name>Louis Sautier</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">supervisor</remote-id>
+ <remote-id type="github">Supervisor/supervisor</remote-id>
+ <bugs-to>https://github.com/Supervisor/supervisor/issues</bugs-to>
+ </upstream>
+ <longdescription lang="en">
+ Supervisor is a client/server system that allows its users to control a number of processes on UNIX-like operating systems.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
new file mode 100644
index 000000000000..1f774d43fdcd
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 ) # py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+
+# ALL versions of meld3 match to >=meld3-0.6.5
+RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+ # Somehow the test phase is called and run on invoking a doc build; harmless
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ newinitd "${FILESDIR}/init.d-r1" supervisord
+ newconfd "${FILESDIR}/conf.d" supervisord
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
new file mode 100644
index 000000000000..7297e311db18
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.3.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 ) # py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/meld3[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ newinitd "${FILESDIR}/init.d-r1" supervisord
+ newconfd "${FILESDIR}/conf.d" supervisord
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/swatchdog/Manifest b/app-admin/swatchdog/Manifest
new file mode 100644
index 000000000000..caef2af4dab0
--- /dev/null
+++ b/app-admin/swatchdog/Manifest
@@ -0,0 +1,8 @@
+AUX swatchdog-confd 678 SHA256 8dfa6bf1768d75cc23555df58d45cb8c52ae467a83e61acb0cfe18ecd9a0b875 SHA512 ca294509dd2d2f6622ec16760e32c44972c9ac99761bb743607dd5f7dab44a10f17183e736589111c3124e68f783f9ef9c0c28c5acbf1e39f3fae7cb9c4db238 WHIRLPOOL fdaf9467ee03205353a9ee407dd9227a9f13f64daadb827f6b593f907a011680847ed54351b9fc3de869f326e70bbfff7415fecf82abc9fe5b4aa798d25f995d
+AUX swatchdog-init 1502 SHA256 b48c46f349520bebef1187524856434acc609ec79360230ccf72c41dfc2cd0bd SHA512 30d5451cd871c15d2e50a3d5f32f4ea986971e2aa9a0b06ce5e383643aacd72a29c1574ec03bc3c0c994ebb13287f5870e8987971bcb73821f3ee744c7c574a3 WHIRLPOOL c5e312cac327a6433f9f17195ab64db4d94dd00615c9b392c2658e79d37f1d3409b7127a098558b1455160e3cecd52d12eb173b51445ada1a042aba1700d3a57
+AUX swatchdogrc 299 SHA256 67c35bbd4d0abb51fcf42cb50c1f25bac3ec5d1cc4b1da09e66a08d6cc719c92 SHA512 64dfe179ccab5674742b8198f15b5439c324c7e9648fa0064a36010f7160303abd09c5af4efdb422628827ff8f327a8db312c4fdfbf02aab29c772d82f1d5b44 WHIRLPOOL 2800da2a3960b2edcddd8ffc45c9a03b75adb4b105d53ddc7f15b72dc42b7c847785e540cce2ceb94c5863144d84c795368791771f0d357e168431ce88d6ae2f
+DIST swatchdog-3.2.4.tar.gz 30122 SHA256 5bb644d3750ee89b9aecab797df66b28b9fd174a5f0f96cd62367af8975b4f63 SHA512 4e0a4e3feed00df0f0d04f94cc090e53e71fa9b20d46236ec41d63b98b5733d80a5941b491cffcbb0b655a9c7d2b5c9423ca7ae043346dbe1b05ee6ab24b9489 WHIRLPOOL 1681139e54e5f665c2573983e8488859f907b3083f3ca1106faca137fb0b978cb0b90218899728ae8775334360b28ec4572f78415bca47a6d8a1a72be9f86ef5
+EBUILD swatchdog-3.2.4-r1.ebuild 769 SHA256 844022933dbc4fd374aa60aee671a12c6846b05e5d08d1b1f8efaf3bf25338e1 SHA512 950e0e763168922672877cd3c74e5e15173faa0036db9ddb7b9bfa66c18144f760b7343d494c2a848562dcdf78a6ae875404ad9b94e66dfe138e745c7d6d0849 WHIRLPOOL a444d7a6a9073ccc66db993bbb99a24082167fe36eb04bf4590f23035ad5b4693c1dbd9b6b7e972e6e45c92cb74e081ac3901ad2942c2d677af111c8d540afc1
+EBUILD swatchdog-3.2.4.ebuild 672 SHA256 3597d1fb44d080886bf5c0f952ca4bce7982cc93bde8bba29c676ebc40591d7c SHA512 706a131392c669be2747ff0a600abda92515e2e2427419df5c28217da9480585a09a137a20ed3536a0e2147e57e9dc3a6c9ed0ec0e0abe2e56cfa62b761ef2e2 WHIRLPOOL 2646079d3b1ba4b57311489a774ca7cb1f225c013cc63d13e6e04c7430540e50c3f2635d126a39bb3fa4e43b6437fc2d2d2655abd46d022334e238eb8dd2b376
+MISC ChangeLog 482 SHA256 c57bf04f2abe00401de876ba006cbe6e5806916879070296618b203c8abd881d SHA512 24cefa0bd960cabfeb193e240174ffc59448f64231dc4c5bc1f02b68fb6aa18926ac8318bb9c9e965adfa58d2fe34dfe7153eb08a82af364b313959d5f518265 WHIRLPOOL 5949c24050ede359d85ebf3a9649ee35342ccc051b673c1f7400965d336bbf70d7c97141acdb38bf28aef60e1a463e043c8412e956a0ff415b54b663e954a22b
+MISC metadata.xml 1137 SHA256 f231977c3ac1e7d0c13d1dbf8dafe073a2a58419ab3494e0af3d013d2ca0d2e6 SHA512 3a4efd76ee1a609c59a84ec43482982c27d9cf0ba4e4f42cb162c8dc39acbe89ffb146735d04aa111c404e546311df40cd9da782d76c766ac37e14aedb5f4884 WHIRLPOOL b2b6e317a183fe29c41ddfa53d3ddf462a0437d4f8a2f4e46e2d4b6db15c6d727a82d7675deefb2288c208b67e4281f3604c7e63fcab2d96e89eb0e69b01f774
diff --git a/app-admin/swatchdog/files/swatchdog-confd b/app-admin/swatchdog/files/swatchdog-confd
new file mode 100644
index 000000000000..13f8a0aed79e
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdog-confd
@@ -0,0 +1,25 @@
+# /etc/conf.d/swatchdog: config file for /etc/init.d/swatchdog
+
+# Path to the swatchdog program.
+#SWATCHDOG_BINARY="/usr/bin/swatchdog"
+
+# Swatchrc to read patterns and actions from.
+#SWATCHDOGRC="/etc/swatchdogrc"
+
+# File to monitor
+#SWATCHDOG_TAILFILE="/var/log/syslog"
+
+# Arguments to tail program
+#SWATCHDOG_TAILARGS=""
+
+# Swatch log file
+#SWATCHDOG_LOGFILE="/var/log/swatchdog.log"
+
+# Swatch error file
+#SWATCHDOG_ERRFILE="/var/log/swatchdog-err.log"
+
+# Where to output the generated script to. Should not be writable by others.
+#SWATCHDOG_SCRIPT="/run/swatchdog/swatchdog_script.pl"
+
+# Whether to parse the complete file once at startup. Defaults to "NO".
+PARSE_FULL="NO"
diff --git a/app-admin/swatchdog/files/swatchdog-init b/app-admin/swatchdog/files/swatchdog-init
new file mode 100644
index 000000000000..d623070073f7
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdog-init
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# This script is based on the one created by Phil (bug #255329).
+
+depend() {
+ need logger
+}
+
+SWATCHDOG_BINARY=${SWATCHDOG_BINARY:-/usr/bin/swatchdog}
+SWATCHDOGRC=${SWATCHDOGRC:-/etc/swatchdogrc}
+SWATCHDOG_TAILFILE=${SWATCHDOG_TAILFILE:-/var/log/syslog}
+SWATCHDOG_LOGFILE=${SWATCHDOG_LOGFILE:-/var/log/swatchdog.log}
+SWATCHDOG_ERRFILE=${SWATCHDOG_ERRFILE:-/var/log/swatchdog-err.log}
+SWATCHDOG_SCRIPT=${SWATCHDOG_SCRIPT:-/run/swatchdog/swatchdog_script.pl}
+
+gen_script() {
+ local tailargs=""
+ if [ "${SWATCHDOG_TAILARGS}" ]; then
+ tailargs="--tail-args=\"${SWATCHDOG_TAILARGS}\""
+ fi
+ ebegin "Generating swatchdog script from config"
+ ${SWATCHDOG_BINARY} --dump-script="${SWATCHDOG_SCRIPT}" \
+ --use-cpan-file-tail ${tailargs} \
+ --config-file "${SWATCHDOGRC}" $1 "${SWATCHDOG_TAILFILE}"
+ eend $?
+}
+
+parse_full() {
+ gen_script --examine
+ ebegin "Parsing complete file once"
+ /usr/bin/perl ${SWATCHDOG_SCRIPT} 1>/dev/null
+ eend $?
+}
+
+start() {
+ checkpath -d -q -m 0750 -o root:root /run/swatchdog
+ if [ "${PARSE_FULL}" = "YES" ]; then
+ parse_full
+ fi
+ gen_script --tail-file
+ ebegin "Starting swatchdog"
+ start-stop-daemon --start --quiet --background \
+ --make-pidfile --pidfile /run/swatchdog/swatchdog.pid \
+ --stdout ${SWATCHDOG_LOGFILE} --stderr ${SWATCHDOG_ERRFILE} \
+ --exec /usr/bin/perl -- ${SWATCHDOG_SCRIPT}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping swatchdog"
+ start-stop-daemon --stop --exec /usr/bin/perl \
+ --pidfile /run/swatchdog/swatchdog.pid --quiet
+ eend $?
+}
diff --git a/app-admin/swatchdog/files/swatchdogrc b/app-admin/swatchdog/files/swatchdogrc
new file mode 100644
index 000000000000..5132f855852b
--- /dev/null
+++ b/app-admin/swatchdog/files/swatchdogrc
@@ -0,0 +1,10 @@
+#
+# A sample configuration file for swatchdog.
+#
+# See "man swatchdog" for details.
+
+# Mails root when invalid remote login attempted.
+watchfor /(.*) (.*) (.*) (.*) (.*):( [iI]nvalid [uU]ser )(.*)( from )(.*)$/
+ threshold track_by=$9,type=limit,count=3,seconds=30
+ mail root,subject="Invalid user"
+
diff --git a/app-admin/swatchdog/metadata.xml b/app-admin/swatchdog/metadata.xml
new file mode 100644
index 000000000000..e0a3fdd952e8
--- /dev/null
+++ b/app-admin/swatchdog/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>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+ </maintainer>
+ <longdescription lang="en">
+ swatchdog.pl started out as swatch, the "simple watchdog"
+ for activity monitoring log files produced by UNIX's syslog
+ facility. It has since been evolving into a utility that can
+ monitor just about any type of log. The name has been changed
+ to satisfy a request made by the old Swiss watch company.
+ </longdescription>
+ <longdescription lang="es">
+ swatchdog.pl comenzó como swatch, el "simple perro guardián"
+ para monitorizar la actividad en los ficheros de registro
+ producidos por la característica syslog de los sistemas UNIX.
+ Desde entonces ha evolucionado hacia una utilidad que puede
+ monitorizar cualquier tipo de registro. Se ha cambiado el
+ nombre del proyecto para satisfacer una petición realizada
+ por la empresa de relojes suiza.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">swatch</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
new file mode 100644
index 000000000000..c6fee4d4f147
--- /dev/null
+++ b/app-admin/swatchdog/swatchdog-3.2.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+DESCRIPTION="Simple log watcher"
+HOMEPAGE="https://sourceforge.net/projects/swatch/"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Date-Manip
+ dev-perl/Date-Calc
+ dev-perl/File-Tail
+ dev-perl/TimeDate
+ >=virtual/perl-Time-HiRes-1.12
+ !app-admin/swatch"
+
+src_install() {
+ emake install
+ newinitd "${FILESDIR}/${PN}-init" "${PN}"
+ newconfd "${FILESDIR}/${PN}-confd" "${PN}"
+ insinto /etc
+ doins "${FILESDIR}/${PN}rc"
+
+ # Clean up perl localpod and packlist (bug #620886)
+ perl_delete_localpod
+ perl_fix_packlist
+}
diff --git a/app-admin/swatchdog/swatchdog-3.2.4.ebuild b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
new file mode 100644
index 000000000000..0dcfd1b80623
--- /dev/null
+++ b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+DESCRIPTION="Simple log watcher"
+HOMEPAGE="https://sourceforge.net/projects/swatch/"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Date-Manip
+ dev-perl/Date-Calc
+ dev-perl/File-Tail
+ dev-perl/TimeDate
+ >=virtual/perl-Time-HiRes-1.12
+ !app-admin/swatch"
+
+src_install() {
+ emake install
+ newinitd "${FILESDIR}/${PN}-init" "${PN}"
+ newconfd "${FILESDIR}/${PN}-confd" "${PN}"
+ insinto /etc
+ doins "${FILESDIR}/${PN}rc"
+}
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
new file mode 100644
index 000000000000..cb2704357454
--- /dev/null
+++ b/app-admin/sxid/Manifest
@@ -0,0 +1,6 @@
+DIST sxid-4.2.tar.gz 41827 SHA256 f335286261474cb77ef4f89a5c4b452edabdbaf19b6b789f195c6a769cd32765 SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69 WHIRLPOOL 634e26f9c578796c5d5c92829c2416192a72486fca1d1f5cf74de23b627fb591fbc11ef0f32f183f20530ecca4fb000e7070c92024c47dbf3e533572eb8395b4
+EBUILD sxid-4.2-r1.ebuild 739 SHA256 9828921c578b5a38126cd4ac4582587eed45afb6b746f3921743c72da978a1de SHA512 cc0118b764ca45567a04920b8263b2f10596f18fa458b007b5648094b254307dd440cbe33b5e441496a1f0669e235d11fe732d6ea2e59e91f4a3c72e094cff3c WHIRLPOOL 601b21dce838c256d72b91fe7758128c224d7f192ce01c22479612c768c738d15cb52d53768c50990f0bb62d278935fe084d3e9b853ca7155971c8f9c69f1d16
+EBUILD sxid-4.2-r2.ebuild 745 SHA256 c2bb298df0ff1f25cb531b8727b1941a58fe9dcef00ea4c4659741a07c8f5e22 SHA512 dc137ac9c5f2ba7559c04dca8d3dbb1e1565605d4cea9e581f7ffd106108a66d98383ce4cad2dcc5bb1f5ecc12eb658f339cfc69ae3ecd1bbb074cb34abe6329 WHIRLPOOL bccff4d6e16320f71505baa202331592bdd975b2ebff6b7a2eb38ee107c3e016975e8e06608e22761d39410f562c1a148015146c89f7285ebd21137c2768c2ff
+MISC ChangeLog 2516 SHA256 9c92096a21800e263dfe68eb5e91349c8cc7586d3f8a1f42282d3fb959fa1c63 SHA512 e071eb3e5fa581fa3adced0ec876beb5d4494f154092e071c03928c604051a17a4193f1254a517defcf4b52f8eb662292305ff2442006a38a9de0fa62b11359d WHIRLPOOL 024a9ee0ea7775b2338fbd25a21d4e6f0905d2d3ae4cbabbb18d3f4b7715de037df1ad8b82ef9d24e6548bb7f62d73a1b2a4be1443145fd76667ab8b09646d65
+MISC ChangeLog-2015 4044 SHA256 4512b1099a749b836ee22bb3ce719db280eaf011898a28beac28feba8e52e2d2 SHA512 ae40f09d91bd8fe42c324a2e66dc6707cc88849260d673666c2dd4a8a446b33f97ae0c68b8db1d08d1b3682191f56e47da5b3f094bfb850eabe86b87740f08ee WHIRLPOOL a40a6e94256c381176ecd31674f4d407961288723719a5f1a3ca47d809fc78eaff0f87f8abb0a7a61bf6b0c509d773e4fcc8e401ab27bc653f25133305abef4b
+MISC metadata.xml 239 SHA256 2086fd0431d07ae9eaf292c0bf19ffba3e4f8b003d65f44b4e7b5ccc0075e0cc SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323 WHIRLPOOL 136d08dd2f66128033fe2bfbfde1ca3c6540a722db8988dc22389861a303fee3723bd29fc9546b9d5349373bc8f4b82224ad8a069f9b5db441d3adb13b0dccb2
diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
new file mode 100644
index 000000000000..28ab88d96ca0
--- /dev/null
+++ b/app-admin/sxid/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">sxid</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/sxid/sxid-4.2-r1.ebuild b/app-admin/sxid/sxid-4.2-r1.ebuild
new file mode 100644
index 000000000000..da19f4b987ae
--- /dev/null
+++ b/app-admin/sxid/sxid-4.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="suid, sgid file and directory checking"
+HOMEPAGE="http://freshmeat.net/projects/sxid"
+SRC_URI="http://linukz.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="virtual/mailx"
+DEPEND=""
+
+DOCS=( docs/sxid.{conf,cron}.example )
+
+src_prepare() {
+ # this is an admin application and really requires root to run correctly
+ # we need to move the binary to the sbin directory
+ sed -i s/bindir/sbindir/g source/Makefile.in || die
+ eautoreconf
+}
+
+pkg_postinst() {
+ elog "You will need to configure sxid.conf for your system using the manpage and example"
+}
diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
new file mode 100644
index 000000000000..1dd3cef652d9
--- /dev/null
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="suid, sgid file and directory checking"
+HOMEPAGE="http://freshmeat.net/projects/sxid"
+SRC_URI="http://linukz.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/mailx"
+
+DOCS=( docs/sxid.{conf,cron}.example )
+
+src_prepare() {
+ default
+ # this is an admin application and really requires root to run correctly
+ # we need to move the binary to the sbin directory
+ sed -i s/bindir/sbindir/g source/Makefile.in || die
+ eautoreconf
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to configure sxid.conf for your system using the manpage and example"
+ elog
+}
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
new file mode 100644
index 000000000000..20479d48da93
--- /dev/null
+++ b/app-admin/sysklogd/Manifest
@@ -0,0 +1,17 @@
+AUX sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 4315 SHA256 f316586561ec40eb185bb83b6e785185b9e33b8290767336cdab626767f88060 SHA512 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a WHIRLPOOL 39768749718213a0e7ff923a0d94a729b4686e543fc1c3d8b32d0c8b125f8d4e03ca5e95c21c4dcfcc05ba57878d7a8deca534b4cc8b152c07e5b98b409824cf
+AUX sysklogd-1.4.2-caen-owl-syslogd-bind.diff 3242 SHA256 1818aee4cb0d501542721468199e376b73c71d8635b178b6a8d7bd6aff49aa9d SHA512 995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d WHIRLPOOL c750d7ebb851a92a03c2530d5d47aa4fd51f8c759a97a2ca684d8a64416423b13eeb6f014cabea5125892b6ed48ba1f0f6e90baf6e88af21f659829803dadaa6
+AUX sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff 3245 SHA256 0105d924d9451531645a9957ec7d40228cf2a1cb4ccdf3d89ff255dfec0841b9 SHA512 87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852 WHIRLPOOL 288286a3cef3312eb26ced30f6ecc2b8821bfd1042b08b8cd6af3ab82e8f6ff2a638eb55c51e78fb874b12ed3834ebeccf0fe7ba5f65b01233660781732f7165
+AUX sysklogd-1.5-build.patch 626 SHA256 1395e48418e0790cec2a8af9a3821b5d2c0bafe11cd599e181f90f4e720835f6 SHA512 aa8ce937733bb24f6b4bc4a47e40df99697c554276a29a21201b76354b902875bbeb7387520f3b7f8e05a76b16d3c4431bf775c85480fd9e31b78d499b5605fa WHIRLPOOL 6a60b497629dd7396e9b6eb36e3abcb399b981b35c08ee55922f45104e3292d8d437bc7319032f28dbad6251bad142380b071c64188fe58628697abb5152f20a
+AUX sysklogd-1.5-debian-cron.patch 913 SHA256 7667df1da0af05120d80f5622b830748b4831c4d555c28d38f3cad266a865b3f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0 WHIRLPOOL 3ef686ef93a068a98ef609a362d87c2bc1bf8d202ec08ffe25627417dd4972bd0d26bd20a13a8193fb8a72f5558ee09e53c30a063e3b3e59ca522f2db0f5c9d5
+AUX sysklogd-1.5-glibc-2.24.patch 279 SHA256 e9f9a0a29934a183ad1ad6266d0b3022843f1327125e09d5982fe367cdffffa3 SHA512 35d92a0f1665d38201bdb2f4d4c0e5f17a6086f7a38e489ac4820cdff166419992253fa6c73e321c73e209e4b41a6e2363e19060ef48f18fef8c5ea65ac2664e WHIRLPOOL 334e278121f988c0dcec23c7e9ccff32aace1719b62764659e48ce8493e921859af728c4467586f250a0cf25d9d10a3f6e6f2f3081eb9b33e6e9a85508ddf228
+AUX sysklogd-1.5-syslog-func-collision.patch 2273 SHA256 e035765eb6d7f013d42d872dc0561deac52dccaf00fa26e21504891b3e0ae14a SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc WHIRLPOOL 2d1e25a2cc1ca3154d831db080036ca4c4de7a4c7958fd65cb4c246a313bd81076b95d8195f2448c7728daacb133983bff1da81a8138e7509d6a56e0ee0717ad
+AUX sysklogd.confd 113 SHA256 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c WHIRLPOOL 4785cb1036e25a15a11de75b68e46138563ed0a610ccc70454807e8c0b22235e40779910157ad5dce67d98d661b9a614a22cbf7c4f76db9df15cbafdb9733bfa
+AUX sysklogd.logrotate 402 SHA256 2e864ce0e5a2ca2c7964f7dff0fe1a76a5dcb90d237c0df7c19fa9cc6b5cb5e4 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7 WHIRLPOOL b03ff6ecdf95fc164e161389e51bcf6c38760815dbafab711f7e2a5720d939fb54dbef930d97c7d752262d5dcf840c2b9296c2f02190730083947bf682a958d9
+AUX sysklogd.rc7 1447 SHA256 704c5a7eb81023a8de4f5e0b2aee7f6701ffec2e5a49f62093e68c60864adb47 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e WHIRLPOOL b9a481d43e57288e08d3aa0bce58efb7dd4418759d15ed24aff6246da340736ff95dfe9392abbd235231d4dc7536c14098d6284e831394f09ff8a48022e6bdaf
+DIST sysklogd-1.5.1.tar.gz 90011 SHA256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7 WHIRLPOOL a9be298553e89d1b61f3ac4d5cfc6bd5662ab84d9120adfcdd6b8aaf5fe4d54d9e34ac19dab5c1738578af302597e424e95fc68345a1855e3be2760b093037ea
+DIST sysklogd_1.5-6.diff.gz 25677 SHA256 1c5366865bd058530071a6071c317ab3562f33f4b0f3a934878cb97059fde20a SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e WHIRLPOOL 0c330ed79b5a688ddec0a80e6333c181cfa297350ec9559166e5828d715a305b5b52eee5f7cc95f7b4ebccf03f21de594d428fa2b2ef117bd0a1630684c71364
+EBUILD sysklogd-1.5.1-r1.ebuild 1712 SHA256 e74362cbac8a71c7314362da8b11c5b74ff53493ce1060fe861114a7c636d503 SHA512 55596c949870980f4138387d382b51aefc37d53c03e61e75c50424bbd1049c0098dd26f039038252b2fb794f96ac1646da2054763d0965dc66c30064479b06ef WHIRLPOOL 47fff401109a4d1c1355fba66cad2aec19d4a30f3f11b6fb39c3ff4476f9bb5212d11f84f6626de785776fa4a0a3e6769b7f331280744e736208fe423b634097
+EBUILD sysklogd-1.5.1.ebuild 1640 SHA256 9a6b736f61db6b68bee7e91ce87a89ec5926553b4e5561f7de32c8e381e94fcd SHA512 7608dbe2f695a63775e89022088cb4f191f3100475f90c6d5194568661b7b9171c16ff6499a8b7344de7da4499127c41c442261ba5955e60f39468b6e4452248 WHIRLPOOL 6b7cd1b21fade85a28edb637eb9f5792ba992925d73b39bbd291a3a6988993b84ef24794fb35ee3911c6373fa098b6e3c60cddb63176646a1ff9655a842d8aa2
+MISC ChangeLog 3315 SHA256 4441e6ba58fddb02cd7f9822fc9358815aa787e77128cad32da43bd4cd41e350 SHA512 43cb2daa243d6b1df40b72fe86d1828aebc1ec4173335a50a08291dfbbd9dc7189aea26b9a7c7c7dd53741965dbb8acb93b4863bce696346866c00a85a0d49eb WHIRLPOOL d232d2a8d1a22ccfb315e5bcf06a122797a01655ab9cf5889a848cea90243466a52cbdaffbd3decc17d67c9c4022f87843aa8ffff91f4311e328ee5aee0b548b
+MISC ChangeLog-2015 15635 SHA256 cfccc77a19c2729be872db0550b7e0f67c97a659803f2c82edf724c4622a9dd8 SHA512 51b47993682d6e95eccb280d1287f434c0571b92d81bfb12fa27bac13fd44d5736b3c895725ab7787b1a1701bd4ceb373e7a85483518c5f365c2910309694d73 WHIRLPOOL efd9b53f4b75b728f913efbf91e8921618bf85cb59c0bf7eb0db726fc4645740c75b30e89305aa090efabd74109fd1aa69fc1688f21d1b3b3efad7e7cd02c108
+MISC metadata.xml 378 SHA256 7f01137a34aaabb7e8b3acd0583f460cad4363610b52a0d83425454207da07f1 SHA512 9d7311cf197ebeec7e989d97d08a35360242ee0aa467e38e1715c6a425e1e279ddd75da8e2856c1238f357741d67bd67d07841425d7dcc3f8f964def8f02d15c WHIRLPOOL d2c6d06721d0b4df25114f1ef75f25999bfcdd3076f31cec2203075bf4215acabf5c31df9d71b8b5fa010d6b643a0fd064ba9d728cc2548133df2c1cbc573f2e
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
new file mode 100644
index 000000000000..40b8817d4e28
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
@@ -0,0 +1,162 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff?rev=1.2;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/klogd.8 sysklogd-1.4.2/klogd.8
+--- sysklogd-1.4.2.orig/klogd.8 2005-03-11 16:12:09 +0000
++++ sysklogd-1.4.2/klogd.8 2005-08-18 14:37:47 +0000
+@@ -18,6 +19,12 @@ klogd \- Kernel Log Daemon
+ .RB [ " \-f "
+ .I fname
+ ]
++.RB [ " \-u "
++.I username
++]
++.RB [ " \-j "
++.I chroot_dir
++]
+ .RB [ " \-iI " ]
+ .RB [ " \-n " ]
+ .RB [ " \-o " ]
+@@ -53,6 +60,20 @@ stderr.
+ .BI "\-f " file
+ Log messages to the specified filename rather than to the syslog facility.
+ .TP
++.BI "\-u " username
++Tells klogd to become the specified user and drop root privileges before
++starting logging.
++.TP
++.BI "\-j " chroot_dir
++Tells klogd to
++.BR chroot (2)
++into this directory after initializing.
++This option is only valid if the \-u option is also used to run klogd
++without root privileges.
++Note that the use of this option will prevent \-i and \-I from working
++unless you set up the chroot directory in such a way that klogd can still
++read the kernel module symbols.
++.TP
+ .BI "\-i \-I"
+ Signal the currently executing klogd daemon. Both of these switches control
+ the loading/reloading of symbol information. The \-i switch signals the
+diff -upk.orig sysklogd-1.4.2.orig/klogd.c sysklogd-1.4.2/klogd.c
+--- sysklogd-1.4.2.orig/klogd.c 2005-08-18 12:29:52 +0000
++++ sysklogd-1.4.2/klogd.c 2005-08-18 14:37:47 +0000
+@@ -261,6 +261,8 @@
+ #include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
++#include <pwd.h>
++#include <grp.h>
+ #include "klogd.h"
+ #include "ksyms.h"
+ #ifndef TESTING
+@@ -315,6 +317,9 @@ static enum LOGSRC {none, proc, kernel}
+ int debugging = 0;
+ int symbols_twice = 0;
+
++char *server_user = NULL;
++char *chroot_dir = NULL;
++int log_flags = 0;
+
+ /* Function prototypes. */
+ extern int ksyslog(int type, char *buf, int len);
+@@ -535,8 +540,9 @@ static enum LOGSRC GetKernelLogSrc(void)
+ * First do a stat to determine whether or not the proc based
+ * file system is available to get kernel messages from.
+ */
+- if ( use_syscall ||
+- ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT)) )
++ if (!server_user &&
++ (use_syscall ||
++ ((stat(_PATH_KLOG, &sb) < 0) && (errno == ENOENT))))
+ {
+ /* Initialize kernel logging. */
+ ksyslog(1, NULL, 0);
+@@ -983,6 +989,27 @@ static void LogProcLine(void)
+ }
+
+
++static int drop_root(void)
++{
++ struct passwd *pw;
++
++ if (!(pw = getpwnam(server_user))) return -1;
++
++ if (!pw->pw_uid) return -1;
++
++ if (chroot_dir) {
++ if (chdir(chroot_dir)) return -1;
++ if (chroot(".")) return -1;
++ }
++
++ if (setgroups(0, NULL)) return -1;
++ if (setgid(pw->pw_gid)) return -1;
++ if (setuid(pw->pw_uid)) return -1;
++
++ return 0;
++}
++
++
+ int main(argc, argv)
+
+ int argc;
+@@ -1000,7 +1027,7 @@ int main(argc, argv)
+ chdir ("/");
+ #endif
+ /* Parse the command-line. */
+- while ((ch = getopt(argc, argv, "c:df:iIk:nopsvx2")) != EOF)
++ while ((ch = getopt(argc, argv, "c:df:u:j:iIk:nopsvx2")) != EOF)
+ switch((char)ch)
+ {
+ case '2': /* Print lines with symbols twice. */
+@@ -1022,6 +1049,10 @@ int main(argc, argv)
+ case 'I':
+ SignalDaemon(SIGUSR2);
+ return(0);
++ case 'j': /* chroot 'j'ail */
++ chroot_dir = optarg;
++ log_flags |= LOG_NDELAY;
++ break;
+ case 'k': /* Kernel symbol file. */
+ symfile = optarg;
+ break;
+@@ -1037,6 +1068,9 @@ int main(argc, argv)
+ case 's': /* Use syscall interface. */
+ use_syscall = 1;
+ break;
++ case 'u': /* Run as this user */
++ server_user = optarg;
++ break;
+ case 'v':
+ printf("klogd %s.%s\n", VERSION, PATCHLEVEL);
+ exit (1);
+@@ -1045,6 +1079,10 @@ int main(argc, argv)
+ break;
+ }
+
++ if (chroot_dir && !server_user) {
++ fputs("'-j' is only valid with '-u'\n", stderr);
++ exit(1);
++ }
+
+ /* Set console logging level. */
+ if ( log_level != (char *) 0 )
+@@ -1158,7 +1196,7 @@ int main(argc, argv)
+ }
+ }
+ else
+- openlog("kernel", 0, LOG_KERN);
++ openlog("kernel", log_flags, LOG_KERN);
+
+
+ /* Handle one-shot logging. */
+@@ -1191,6 +1229,11 @@ int main(argc, argv)
+ }
+ }
+
++ if (server_user && drop_root()) {
++ syslog(LOG_ALERT, "klogd: failed to drop root");
++ Terminate();
++ }
++
+ /* The main loop. */
+ while (1)
+ {
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
new file mode 100644
index 000000000000..ad311a512c0f
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
@@ -0,0 +1,103 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8 2004-07-09 17:33:32 +0000
++++ sysklogd-1.4.2/sysklogd.8 2005-08-18 14:40:25 +0000
+@@ -15,6 +15,9 @@ sysklogd \- Linux system logging utiliti
+ .I config file
+ ]
+ .RB [ " \-h " ]
++.RB [ " \-i "
++.I IP address
++]
+ .RB [ " \-l "
+ .I hostlist
+ ]
+@@ -104,6 +107,13 @@ Specifying this switch on the command li
+ This can cause syslog loops that fill up hard disks quite fast and
+ thus needs to be used with caution.
+ .TP
++.BI "\-i " "IP address"
++If
++.B syslogd
++is configured to accept log input from a UDP port, specify an IP address
++to bind to, rather than the default of INADDR_ANY. The address must be in
++dotted quad notation, DNS host names are not allowed.
++.TP
+ .BI "\-l " "hostlist"
+ Specify a hostname that should be logged only with its simple hostname
+ and not the fqdn. Multiple hosts may be specified using the colon
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c 2005-08-18 14:33:22 +0000
++++ sysklogd-1.4.2/syslogd.c 2005-08-18 14:40:25 +0000
+@@ -774,6 +774,8 @@ char **LocalHosts = NULL; /* these hosts
+ int NoHops = 1; /* Can we bounce syslog messages through an
+ intermediate host. */
+
++char *bind_addr = NULL; /* bind UDP port to this interface only */
++
+ extern int errno;
+
+ /* Function prototypes. */
+@@ -878,7 +880,7 @@ int main(argc, argv)
+ funix[i] = -1;
+ }
+
+- while ((ch = getopt(argc, argv, "a:dhf:l:m:np:rs:v")) != EOF)
++ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
+ switch((char)ch) {
+ case 'a':
+ if (nfunix < MAXFUNIX)
+@@ -895,9 +897,17 @@ int main(argc, argv)
+ case 'h':
+ NoHops = 0;
+ break;
++ case 'i':
++ if (bind_addr) {
++ fprintf(stderr, "Only one -i argument allowed, "
++ "the first one is taken.\n");
++ break;
++ }
++ bind_addr = optarg;
++ break;
+ case 'l':
+ if (LocalHosts) {
+- fprintf (stderr, "Only one -l argument allowed," \
++ fprintf(stderr, "Only one -l argument allowed, "
+ "the first one is taken.\n");
+ break;
+ }
+@@ -1244,7 +1254,7 @@ int main(argc, argv)
+ int usage()
+ {
+ fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+- " [-s domainlist] [-f conffile]\n");
++ " [-s domainlist] [-f conffile] [-i IP address]\n");
+ exit(1);
+ }
+
+@@ -1286,15 +1296,22 @@ static int create_inet_socket()
+ int fd, on = 1;
+ struct sockaddr_in sin;
+
++ memset(&sin, 0, sizeof(sin));
++ sin.sin_family = AF_INET;
++ sin.sin_port = LogPort;
++ if (bind_addr) {
++ if (!inet_aton(bind_addr, &sin.sin_addr)) {
++ logerror("syslog: not a valid IP address to bind to.");
++ return -1;
++ }
++ }
++
+ fd = socket(AF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ logerror("syslog: Unknown protocol, suspending inet service.");
+ return fd;
+ }
+
+- memset(&sin, 0, sizeof(sin));
+- sin.sin_family = AF_INET;
+- sin.sin_port = LogPort;
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, \
+ (char *) &on, sizeof(on)) < 0 ) {
+ logerror("setsockopt(REUSEADDR), suspending inet");
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
new file mode 100644
index 000000000000..8c3f571f3ca2
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
@@ -0,0 +1,118 @@
+http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff?rev=1.1;content-type=text%2Fplain
+diff -upk.orig sysklogd-1.4.2.orig/sysklogd.8 sysklogd-1.4.2/sysklogd.8
+--- sysklogd-1.4.2.orig/sysklogd.8 2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/sysklogd.8 2005-08-18 14:41:26 +0000
+@@ -32,6 +32,9 @@ sysklogd \- Linux system logging utiliti
+ .RB [ " \-s "
+ .I domainlist
+ ]
++.RB [ " \-u"
++.IB username
++]
+ .RB [ " \-v " ]
+ .LP
+ .SH DESCRIPTION
+@@ -161,6 +164,19 @@ is specified and the host logging resolv
+ no domain would be cut, you will have to specify two domains like:
+ .BR "\-s north.de:infodrom.north.de" .
+ .TP
++.BI "\-u " "username"
++This causes the
++.B syslogd
++daemon to become the named user before starting up logging.
++
++Note that when this option is in use,
++.B syslogd
++will open all log files as root when the daemon is first started;
++however, after a
++.B SIGHUP
++the files will be reopened as the non-privileged user. You should
++take this into account when deciding the ownership of the log files.
++.TP
+ .B "\-v"
+ Print version and exit.
+ .LP
+diff -upk.orig sysklogd-1.4.2.orig/syslogd.c sysklogd-1.4.2/syslogd.c
+--- sysklogd-1.4.2.orig/syslogd.c 2005-08-18 14:40:25 +0000
++++ sysklogd-1.4.2/syslogd.c 2005-08-18 14:41:26 +0000
+@@ -524,6 +524,10 @@ static char sccsid[] = "@(#)syslogd.c 5.
+ #include <arpa/nameser.h>
+ #include <arpa/inet.h>
+ #include <resolv.h>
++
++#include <pwd.h>
++#include <grp.h>
++
+ #ifndef TESTING
+ #include "pidfile.h"
+ #endif
+@@ -775,6 +779,7 @@ int NoHops = 1; /* Can we bounce syslog
+ intermediate host. */
+
+ char *bind_addr = NULL; /* bind UDP port to this interface only */
++char *server_user = NULL; /* user name to run server as */
+
+ extern int errno;
+
+@@ -827,6 +832,21 @@ static int set_nonblock_flag(int desc)
+ return fcntl(desc, F_SETFL, flags | O_NONBLOCK);
+ }
+
++static int drop_root(void)
++{
++ struct passwd *pw;
++
++ if (!(pw = getpwnam(server_user))) return -1;
++
++ if (!pw->pw_uid) return -1;
++
++ if (initgroups(server_user, pw->pw_gid)) return -1;
++ if (setgid(pw->pw_gid)) return -1;
++ if (setuid(pw->pw_uid)) return -1;
++
++ return 0;
++}
++
+ int main(argc, argv)
+ int argc;
+ char **argv;
+@@ -880,7 +900,7 @@ int main(argc, argv)
+ funix[i] = -1;
+ }
+
+- while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:v")) != EOF)
++ while ((ch = getopt(argc, argv, "a:dhf:i:l:m:np:rs:u:v")) != EOF)
+ switch((char)ch) {
+ case 'a':
+ if (nfunix < MAXFUNIX)
+@@ -933,6 +953,9 @@ int main(argc, argv)
+ }
+ StripDomains = crunch_list(optarg);
+ break;
++ case 'u':
++ server_user = optarg;
++ break;
+ case 'v':
+ printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
+ exit (0);
+@@ -1100,6 +1123,11 @@ int main(argc, argv)
+ kill (ppid, SIGTERM);
+ #endif
+
++ if (server_user && drop_root()) {
++ dprintf("syslogd: failed to drop root\n");
++ exit(1);
++ }
++
+ /* Main loop begins here. */
+ for (;;) {
+ int nfds;
+@@ -1254,7 +1282,7 @@ int main(argc, argv)
+ int usage()
+ {
+ fprintf(stderr, "usage: syslogd [-drvh] [-l hostlist] [-m markinterval] [-n] [-p path]\n" \
+- " [-s domainlist] [-f conffile] [-i IP address]\n");
++ " [-s domainlist] [-f conffile] [-i IP address] [-u username]\n");
+ exit(1);
+ }
+
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-build.patch b/app-admin/sysklogd/files/sysklogd-1.5-build.patch
new file mode 100644
index 000000000000..12f4822cd265
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-build.patch
@@ -0,0 +1,20 @@
+respect env CC/CFLAGS/CPPFLAGS/LDFLAGS
+
+--- Makefile
++++ Makefile
+@@ -17,14 +17,12 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+-CC= gcc
+ #SKFLAGS= -g -DSYSV -Wall
+ #LDFLAGS= -g
+-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
++SKFLAGS= $(CFLAGS) $(CPPFLAGS) -DSYSV -Wall -fno-strength-reduce
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ # $(shell getconf LFS_SKFLAGS)
+-LDFLAGS= -s
+
+ # Look where your install program is.
+ INSTALL = /usr/bin/install
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
new file mode 100644
index 000000000000..7f6c2a79b0b2
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-debian-cron.patch
@@ -0,0 +1,38 @@
+--- debian/cron.daily
++++ debian/cron.daily
+@@ -20,10 +20,6 @@
+ # Written by Martin Schulze <joey@debian.org>.
+ # $Id: cron.daily,v 1.14 2007-05-28 16:33:34 joey Exp $
+
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+
+ cd /var/log
+@@ -41,4 +37,4 @@
+
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload
+--- debian/cron.weekly
++++ debian/cron.weekly
+@@ -19,10 +19,6 @@
+ # Written by Ian A. Murdock <imurdock@debian.org>.
+ # $Id: cron.weekly,v 1.11 2007-05-28 16:33:34 joey Exp $
+
+-test -x /usr/sbin/syslogd-listfiles || exit 0
+-test -x /sbin/syslogd || exit 0
+-test -f /usr/share/sysklogd/dummy || exit 0
+-
+ set -e
+
+ cd /var/log
+@@ -40,4 +36,4 @@
+
+ # Restart syslogd
+ #
+-/etc/init.d/sysklogd reload-or-restart > /dev/null
++/etc/init.d/sysklogd --quiet reload
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch
new file mode 100644
index 000000000000..fcddb7574590
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-glibc-2.24.patch
@@ -0,0 +1,11 @@
+--- sysklogd-1.5.1/syslogd.c
++++ sysklogd-1.5.1/syslogd.c
+@@ -2094,7 +2094,7 @@
+ (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
+ wait ((int *)0);
+ #else
+- union wait status;
++ int status;
+
+ while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
+ ;
diff --git a/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch b/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch
new file mode 100644
index 000000000000..76912a265565
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-1.5-syslog-func-collision.patch
@@ -0,0 +1,103 @@
+http://bugs.gentoo.org/342601
+
+rename local "syslog" and "vsyslog" functions to avoid conflicts with glibc's
+
+patch by Dmitriy Matrosov
+
+--- sysklogd-1.5/klogd.c
++++ sysklogd-1.5/klogd.c
+@@ -258,7 +262,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <stdlib.h>
+ #include <pwd.h>
+@@ -637,7 +640,7 @@
+ }
+ argl += 3;
+ }
+- syslog(priority, fmt, argl);
++ syslog_own(priority, fmt, argl);
+ va_end(ap);
+ #ifdef TESTING
+ putchar('\n');
+@@ -646,7 +649,7 @@
+ }
+
+ va_start(ap, fmt);
+- vsyslog(priority, fmt, ap);
++ vsyslog_own(priority, fmt, ap);
+ va_end(ap);
+ #ifdef TESTING
+ printf ("\n");
+@@ -1205,7 +1208,7 @@
+ }
+
+ if (server_user && drop_root()) {
+- syslog(LOG_ALERT, "klogd: failed to drop root");
++ syslog_own(LOG_ALERT, "klogd: failed to drop root");
+ Terminate();
+ }
+
+--- sysklogd-1.5/klogd.h
++++ sysklogd-1.5/klogd.h
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
++#include <stdarg.h>
+
+
+ /* Function prototypes. */
+@@ -38,3 +43,5 @@
+ extern char * ExpandKadds(char *, char *);
+ extern void SetParanoiaLevel(int);
+ extern void Syslog(int priority, char *fmt, ...);
++extern void syslog_own(int, const char *, ...);
++extern void vsyslog_own(int, const char *, va_list);
+--- sysklogd-1.5/ksym_mod.c
++++ sysklogd-1.5/ksym_mod.c
+@@ -95,7 +98,6 @@
+ #if !defined(__GLIBC__)
+ #include <linux/time.h>
+ #endif /* __GLIBC__ */
+-#include <stdarg.h>
+ #include <paths.h>
+ #include <linux/version.h>
+
+--- sysklogd-1.5/syslog.c
++++ sysklogd-1.5/syslog.c
+@@ -75,6 +79,10 @@
+
+ #define _PATH_LOGNAME "/dev/log"
+
++
++void syslog_own(int, const char *, ...);
++void vsyslog_own(int, const char *, va_list);
++
+ static int LogFile = -1; /* fd for log */
+ static int connected; /* have done connect */
+ static int LogStat = 0; /* status bits, set by openlog() */
+@@ -82,17 +90,17 @@
+ static int LogFacility = LOG_USER; /* default facility code */
+
+ void
+-syslog(int pri, const char *fmt, ...)
++syslog_own(int pri, const char *fmt, ...)
+ {
+ va_list ap;
+
+ va_start(ap, fmt);
+- vsyslog(pri, fmt, ap);
++ vsyslog_own(pri, fmt, ap);
+ va_end(ap);
+ }
+
+ void
+-vsyslog(pri, fmt, ap)
++vsyslog_own(pri, fmt, ap)
+ int pri;
+ const char *fmt;
+ va_list ap;
diff --git a/app-admin/sysklogd/files/sysklogd.confd b/app-admin/sysklogd/files/sysklogd.confd
new file mode 100644
index 000000000000..c9735739117d
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.confd
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0"
+# send warnings and above to the console
+KLOGD="-c 3 -2"
+
diff --git a/app-admin/sysklogd/files/sysklogd.logrotate b/app-admin/sysklogd/files/sysklogd.logrotate
new file mode 100644
index 000000000000..8148a2ab2948
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.logrotate
@@ -0,0 +1,8 @@
+/var/log/auth.log /var/log/daemon.log /var/log/debug /var/log/kern.log /var/log/lpr.log /var/log/mail.err /var/log/mail.info /var/log/mail.log /var/log/mail.warn /var/log/messages /var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice /var/log/syslog /var/log/user.log {
+ create 640 root root
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/sysklogd -q reload
+ endscript
+}
diff --git a/app-admin/sysklogd/files/sysklogd.rc7 b/app-admin/sysklogd/files/sysklogd.rc7
new file mode 100644
index 000000000000..787fe3d752d7
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc7
@@ -0,0 +1,74 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+ need clock hostname
+ provide logger
+}
+
+start_daemon() {
+ local retval=0
+ local daemon="$1"
+ local options="$2"
+
+ [ -z "${daemon}" ] && return 1
+
+ ebegin "sysklogd -> start: ${daemon}"
+ start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+ --pidfile /var/run/"${daemon}".pid -- ${options}
+ retval=$?
+ eend ${retval} "Failed to start ${daemon}"
+
+ return ${retval}
+}
+
+stop_daemon() {
+ local retval=0
+ local daemon="$1"
+
+ [ -z "${daemon}" ] && return 1
+
+ ebegin "sysklogd -> stop: ${daemon}"
+ # syslogd can be stubborn some times (--retry 15)...
+ start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+ retval=$?
+ eend ${retval} "Failed to stop ${daemon}"
+
+ return ${retval}
+}
+
+start() {
+ start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+ # klogd do not always start proper if started too early
+ sleep 1
+
+ if ! start_daemon "klogd" "${KLOGD}" ; then
+ stop_daemon "syslogd"
+ return 1
+ fi
+
+ return 0
+}
+
+stop() {
+ stop_daemon "klogd" || return 1
+ stop_daemon "syslogd" || return 1
+ return 0
+}
+
+reload() {
+ local ret=0
+
+ ebegin "Reloading configuration"
+
+ start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
+ ret=$((${ret} + $?))
+ start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+ ret=$((${ret} + $?))
+
+ eend ${ret}
+}
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
new file mode 100644
index 000000000000..094ccd37b3fd
--- /dev/null
+++ b/app-admin/sysklogd/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>
+ <use>
+ <flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..84b9d1750410
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.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 flag-o-matic toolchain-funcs
+
+DEB_PV="1.5-6"
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
+ mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="logrotate"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+ sys-apps/debianutils"
+
+DOCS=( ANNOUNCE CHANGES NEWS README.1st README.linux )
+
+PATCHES=(
+ "${WORKDIR}"/${PN}_${DEB_PV}.diff
+
+ "${FILESDIR}"/${PN}-1.5-debian-cron.patch
+ "${FILESDIR}"/${PN}-1.5-build.patch
+
+ # CAEN/OWL security patches
+ "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+ "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+ "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+ "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
+ "${FILESDIR}"/${PN}-1.5-glibc-2.24.patch #604232
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+ append-lfs-flags
+ tc-export CC
+}
+
+src_install() {
+ dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
+ doman *.[1-9] debian/syslogd-listfiles.8
+ insinto /etc
+ doins debian/syslog.conf
+ if use logrotate ; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+ else
+ exeinto /etc/cron.daily
+ newexe debian/cron.daily syslog
+ exeinto /etc/cron.weekly
+ newexe debian/cron.weekly syslog
+ fi
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
+ newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}
diff --git a/app-admin/sysklogd/sysklogd-1.5.1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
new file mode 100644
index 000000000000..99df849cf104
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DEB_PV="1.5-6"
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
+SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
+ mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+IUSE="logrotate"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+ sys-apps/debianutils"
+
+src_prepare() {
+ epatch "${WORKDIR}"/${PN}_${DEB_PV}.diff
+
+ epatch "${FILESDIR}"/${PN}-1.5-debian-cron.patch
+ epatch "${FILESDIR}"/${PN}-1.5-build.patch
+
+ # CAEN/OWL security patches
+ epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
+ epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
+ epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
+
+ epatch "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
+}
+
+src_configure() {
+ append-lfs-flags
+ tc-export CC
+}
+
+src_install() {
+ dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
+ doman *.[1-9] debian/syslogd-listfiles.8
+ insinto /etc
+ doins debian/syslog.conf
+ if use logrotate ; then
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+ else
+ exeinto /etc/cron.daily
+ newexe debian/cron.daily syslog
+ exeinto /etc/cron.weekly
+ newexe debian/cron.weekly syslog
+ fi
+ dodoc ANNOUNCE CHANGES NEWS README.1st README.linux
+ newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
+ newconfd "${FILESDIR}"/sysklogd.confd sysklogd
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
new file mode 100644
index 000000000000..7741504e4d6f
--- /dev/null
+++ b/app-admin/syslog-ng/Manifest
@@ -0,0 +1,34 @@
+AUX 3.4/syslog-ng.conf.gentoo 1203 SHA256 75469d378500b82e7717bab6197b24652990eb9c9f83f23d58c3f7ef70a41cd9 SHA512 2b71e075e40a462c95bbd8fbe505656d4edf6f6a46303a561bca932ff7b1f957bde351a19ec9583e3d1efa8c7d9af0fb697b242f082360ef8ea9de7837f351ea WHIRLPOOL 30365ef8e88c1f6364f73ee2c51ef77e7f040d7a0749ea3c904054d129f4932272b9a462474d765373bcde5d7bf68269faa471c40089785dfeef9e0b50971a8b
+AUX 3.4/syslog-ng.conf.gentoo.fbsd 593 SHA256 4911ee60a992764dc3b1c94fdcd1bedb6c0098e0d7d779dc08288d86dd73d6cc SHA512 a0aecad6460fcf090ae4c178dca639bda70e7b1bfb7d468a85b1beb453255dc61f92d03f800821cc1ea91402f148375371175cae52205ee7faadc8db5decc658 WHIRLPOOL bb6059304d22fc08e3bfd38fee35073d61e26d6d84a8fae3d3a639c2f738ba19256e30577f1347c7865bc6f542d23170a11ac614c2cfe195f0b4f2c662ff6b78
+AUX 3.4/syslog-ng.conf.gentoo.hardened 4520 SHA256 fe4ad3d66fdc2c67219f3fe3cd9d499edd8f2725c103bb95a7a95ee1fc540060 SHA512 bae079a3d5316949b4bf30cabf9e3a333d4a4e74b137708183a5eb050539f56ae78a15d690070f5e51ee614151c11adc1418fc7a5b2987c2508850b2b91d3969 WHIRLPOOL edc0000ec5deb1233f0507295ad1a1d9963f368d80248f8a84aae079f450e4037580eb57e13c8ed012c591528a6db260d273bd175096d2564233860136437367
+AUX 3.4/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
+AUX 3.4/syslog-ng.rc6 1932 SHA256 5da90358d85e9a2f730a12bca2c94c1196fcca41ceb091115dda4922d3f84984 SHA512 46c748be5be10e7dfb404994edce45a4d3f6511880962c04e8eefeceb8e4ca176f7ae849a8dcf87a6b19b8a9a7ac53f76cb79fb02d4b111e74addf5d3db85dbb WHIRLPOOL 9c299085cbd102edff6c4acc0549fe1205cc4c841ba7a2bdc0445994fddff559d73d5e42937b65f2787b120dc9d09132629104a6e3ddc185624d3aefa8e45783
+AUX 3.6/syslog-ng-3.6.2-redis.patch 853 SHA256 0645bb613776a653b844e8c3bb96ee85cecc9446c073b8646c29cd6428bc4c82 SHA512 fea621e66185509d79bd33ec440a8122faeadaff610c8823d428a6485563f4f83534c5ed40012a4d6818256e278a5bf0cc0d90caa00e60ce3a91561b549ce828 WHIRLPOOL 6eb24eca6c369e25ee3263216b20313e1332c6af13202a8b036ee6d7155adddc912083539a44ed7b3f330a895dddd4d98bb45e1d748a18749f06e31bf5c78ba6
+AUX 3.6/syslog-ng.conf.gentoo 1203 SHA256 4f207c1b09267759bb9edfccfa06f2faef3667c58412850448d66301613aa3ef SHA512 b3a07a4b4a65b20d831484d968abfcfdd3080aa4d3cafa495d7ccf7f1dc7f54f582636197079a3bea43fa297f03d6de909a0bc6fb9f9e3f51f02e21df100faa9 WHIRLPOOL 36f9e4de368ce0832616c92d0f13381c0d4a5a946d85a815cecd034ff3710bcd2acf9835deebbae42810de66c2ee83545fa81a3734d0c58fd56f5b72b5d83577
+AUX 3.6/syslog-ng.conf.gentoo.fbsd 593 SHA256 138fe83f51263a31275ea33693d1c7a435a2bf3c7213e1db484a19c48defcbbb SHA512 d227234a8c5b685b87eb76ba621345fe93c12e95f61d29f83a7bbc3a555eb2c78121f68992ead159c053453a40505b577d5a43d54d8b9282d63dcb1b4f4e8da8 WHIRLPOOL 0f8a10908a14bb047d965cdb0e128d217d58130aaf7671d034d93a8d23e66f6913badef0e467b321010afd8b3f6752295fe73a33717821a8cc9eb5d7b90a9f5f
+AUX 3.6/syslog-ng.conf.gentoo.hardened 4520 SHA256 acbe915005684c4d885f1f7f29343994b3d811a7cbf4832c178a51db8f37a091 SHA512 c45c2fdd41c6854b6cffe6171f41f4c4caca322333681f868a06a1c7ae2a4221b3c4e9070bb0be49f0f9448ab113534ac133e779ad0d5f3b068d9057eaa8e8df WHIRLPOOL 380a81c1c2f6064919e69ae3b93540b592132741242c3d617958e7b5c1a278327e11262ad256d7f2abc9f06ca54d9a2bc742de8c4fcd5834e45ef640ef380cbf
+AUX 3.6/syslog-ng.confd 1492 SHA256 b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0 WHIRLPOOL 11fd5a62c3fbb66ebc84844ce091e7cb5dbace790d20273b6cfb21e99bd935b13dc5da1b13fa17a4038c3a2ea3d6b3fd80227034e3db87e0ef890caa0beaadb3
+AUX 3.6/syslog-ng.rc6 1919 SHA256 5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04 WHIRLPOOL a543b2b79bb3941da94d87a1cfaa2e33f589b4726caab609f116b79097983a61b91228210989a493e085a3128b4cb5d05c488de81209c9e9ee1ebcd7c551f16d
+AUX 3.7/syslog-ng.conf.gentoo 1203 SHA256 d28081dab13a6a845c24b2647441fd581b7a6cb9cb79a545c4d63558439414d9 SHA512 44de47c9ba8927ab69cbd9479bc18f87a311fb7a7273912b236650385bbaddec28d3a706d822e53a4264fc8fd9895887243fb070252024b732bdb41a840d44be WHIRLPOOL ba31fb950ee9da1670abd7678d327c6076b85c1eb8d5d2292af897658735b92ce238b7934ec11be6c720ba60f0052a8199e34e5757df3a04c25e0fb638183ad8
+AUX 3.7/syslog-ng.conf.gentoo.fbsd 593 SHA256 0ab222249c8aad28620c257f69505e6f601fc19b33d5b17b239387f6bc1b5fb0 SHA512 947be1b330a98490da99d9e64d76732fe8eb54beb266ae1a546df7319cea998a89963ddf086e993025efbba1a8aefc2ecc4ff5bd440a50e565cfddbe35536d90 WHIRLPOOL 78c834b81ee892389f9c2314cb07699898c28cc3b4dec720d3ef949bbd042a129eb9485ca8160dc6abd8b88003c303d4f6f2c99b951374eb6029bcd2c55b3b24
+AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 SHA256 fd464306229a5b33015681d9770d225e8ffbe0e595b4147095a575a7acd05105 SHA512 2a0d31178e83ea9685ac1b5988652ef077b71d368d75eda46ebf0e1ef3dbb79e8c911bc6498d6a934912250ead902cfa4bb8ceff1f14a08e06f6152824e36128 WHIRLPOOL 8335dbf436f78a7cd0a3e54e0eeca8ecd7594ca5ffc9df7d167e809150630b93099e5a24fb0368b34e2a7793ce8904aee886d90102f90ee1411f7892f04c79ad
+AUX 3.7/syslog-ng.confd 1492 SHA256 b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0 WHIRLPOOL 11fd5a62c3fbb66ebc84844ce091e7cb5dbace790d20273b6cfb21e99bd935b13dc5da1b13fa17a4038c3a2ea3d6b3fd80227034e3db87e0ef890caa0beaadb3
+AUX 3.7/syslog-ng.rc6 1919 SHA256 5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04 WHIRLPOOL a543b2b79bb3941da94d87a1cfaa2e33f589b4726caab609f116b79097983a61b91228210989a493e085a3128b4cb5d05c488de81209c9e9ee1ebcd7c551f16d
+AUX README.hardened 358 SHA256 712e5bb70d79e416237ccd69a73e0b8deaf7d9bfbb92a0c85554a12bebbaf6bc SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e WHIRLPOOL 7980551efe131b736c2542f7d066e2442201be3e541dc0036e92de1c5379d945148164b628b47ec5c5379c1e50ead7120f653c63ab78feefe69c5753998c0295
+AUX syslog-ng.logrotate 231 SHA256 8ca1cd26fb5ac1dcf569bb22d9e3d31203dc6b5b183d8f0d5cb21fcb256f8a99 SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b WHIRLPOOL c6d4d6a3bcb5df626fe9a43dcfce0bb0915c079493b1abece68d73197998f7b11f688f1364a7e3e12594bb61d34eaf7b73b8a0908659f4b8515f8df42a0930c6
+AUX syslog-ng.logrotate.hardened 1614 SHA256 0c90254b19f3f73cc950516d98a4283e0d12c396700d257bdff48f60f989762c SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760 WHIRLPOOL f5d2c185827a4a30be10f480335302d39189b8dd9604a42138c152820ee1d8837720b716c32a09e2269602c1576b1249323b43882d7546989c9a80e0912873cb
+AUX syslog-ng.logrotate.hardened.in 1518 SHA256 a4dd0c5d0f7e698a56b502f6eaa86fea36d4decf0e8e47a41f268e93218c2a3a SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620 WHIRLPOOL 1901ae7b34e1b48c6a1dab52fd61e8bc537df4097d39b1298b8fe3c91898a914879695382e88988f425065c59e77e49b38e6440b2caae1fcf338e2a027c447b4
+AUX syslog-ng.logrotate.in 219 SHA256 e6ec851f272561f7173fdc8efba7f6d6814fe7441baf04aa596211cbeb25a4af SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb WHIRLPOOL 3430133bc5f00527ec72fdd0fc144098c0915d0ae247d4f3504613d14d7a917a08d68c49175c820229fed0e22e8144a80badb56f92a7f5b0d764d3d5bd2d2f25
+DIST syslog-ng-3.7.2.tar.gz 3558377 SHA256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 SHA512 dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f WHIRLPOOL 3721841f6e5ea883cd5ee71bf1651fa0861904008eb1136127c36990e2fe8801deafdf31ce880677eff7739b0b07411eee4542d8d4a80b60819fa3bd9ab24b9e
+DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b WHIRLPOOL ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a
+DIST syslog-ng_3.4.8.tar.gz 3169372 SHA256 96c2f970fbba4fdd7659b1fee5e476d2858c911d4304d42099f495493762ff49 SHA512 23ba9908664e594c186cbe4bd5dcfb5d2ed3faf02ec45b931bb91b078660547989c2340a08b478a33adb530d39a6d6f39a2e7519107a3f6b923ac9f39529620e WHIRLPOOL 1085fa2c90e0c85421c64ed50e8a357f29006afea2f3e329e42d1e27f4210a10fe0f05d4af95a11c245d68b43644a4a829a50c05b7d541f59a6f580b3643b434
+DIST syslog-ng_3.6.2.tar.gz 3207456 SHA256 ef47fada52981e09af570457a5af30f815f5d5b6c2e33754cedd4ca9780d8261 SHA512 15603b4df2001e1ce7e0019d0dd9a0f4295445e3fd19a527ebf3d49486da7da27fac6c465727ec0354f8f70ca0f671a285ec132f9aa0de62b40f18b44af2a226 WHIRLPOOL 7135db242374d6e5789c0820a06187b7e325054fd214e3aee75aac5b8dde56786b432cc4519c07ce0cd413c3a560e8e74ee6eca319c21eaa750ca8140ef1b63f
+DIST syslog-ng_3.6.4.tar.gz 3276432 SHA256 7be11df31ac7d716f1f952e22b5ae8e2049edd633a41b223776a853d9106f4e7 SHA512 9c648628b9bd3ebb25bc44fa6586e88a4b9ed7c24b1c337569d3cccb04bf2f427ba1218900f8dfd8f668f245d6ab44ad45b67da661b7c2af68c6c42101b722e1 WHIRLPOOL 496a9b2e06e33b0c42726f3b13f859f356f136367c48363cd22b086b72f4f54a32cc057235636f2d2ea3ad7bdd622354ea67df1cbc770be608a84bc861fce93d
+EBUILD syslog-ng-3.4.8.ebuild 3473 SHA256 11d33c2e07e4419781cd7c0e18b24953961559432a75c578ad76cee2b6124e3f SHA512 42e06b912a6f297e794417ffa180e54be2de5da9d76eef19761749722e4f88d886b799b52110d8052c43c9041f5d6902b65ff5d63652bcb4d56b5ab3095a968e WHIRLPOOL a87f78139bd5f5d3b40bf0efa2913fb64c74bccb2410f2d5b2f46aab442e74488f961b5f084a285f4956601e75da4b258150151a2bb9ec0e5397e7171ff85a7d
+EBUILD syslog-ng-3.6.2.ebuild 3668 SHA256 2baa0743b437407db99a95872208b1af6030d440ac1a5880e397ec296c5844bd SHA512 69df9c0b2223202578978274bb0fccce52d93797aa83fb090a361985ca06e2edf6878e6d72b4fdc67e910dfc9ca357b1c9b5ca90b43f68e5016e24a92bbb486d WHIRLPOOL 72233ece16a122fb95a2e3eb5d4c3ec32fe7965a078bc63e8e037a01b69b0c17a9a41e3b770ef73e8a02a6f5e876da238588f4a51dce59126d122facecbe3334
+EBUILD syslog-ng-3.6.4.ebuild 3639 SHA256 2e57d5fe12a42f1e97aa910959acbb9687d0f23c055a3b102b12787e7c0ee0ed SHA512 db5197fb637ba43c11a03cf2d83f615421c1e7fdcda9716ff1e3dd0ce4cc0f86e6ee2546161617f09fbbed3abd48b4833886070064cc53b079691e9e3015e15f WHIRLPOOL 279acd43f07f27a8b2753a939b34d01f8b04632b3427658eab196ea93489b2b4a76ff6d5cebe0f9de6d5671f98d7b773dfa631a2592d58889493be679f8db3d9
+EBUILD syslog-ng-3.7.2.ebuild 4051 SHA256 2e0a6e11119742b1edb80d869a88182a8b15c1b33851346c8ed6f44077aa2441 SHA512 aecd4082352c206ace1c809746baaf73651eb01ca293aa55490868d0c1bbe4642e01db37e3cce7872ef09fa61696aedf0984dfd05b88a521eae5dc9b416ad68b WHIRLPOOL 5efa562c6b18fd781ebbe9ff874bb409415557d151c78e1dc6cc102b12df983a7aed986ac7621bbdbf0961d7a3a7f6c5ea2daf5b9ea543b7244cdd0e0eb79fd8
+EBUILD syslog-ng-3.7.3.ebuild 3972 SHA256 d8be3c1d3ea2528cd61808d134e426ce4d15b19dc6bbf46e3e12af458c9971df SHA512 637446d09bc29c9476177bfea1fac156b54174008d9b8b60a4ed6ae2ed39039aa8310b89b1a531db61a6e3c73d49d9aa92a931ef93531ff69903ceab5b7b48f0 WHIRLPOOL cdb2182f003ffa7b42fa09610c1bfe5573fc81666e448f5e76ebd65ace4bd2d14e67b6b861afcd923f1baedefc99be8d0565c101c8726760fe1b4b76ff9d5268
+MISC ChangeLog 8208 SHA256 3b545b096598bb6cad61acf338071e27f6831db8307c32d5b4bd5befcbe53d4b SHA512 9f14a440149c12281875d0df7608e6420d7aa65651f51cf8fe734eabc5ce73d63a636d7972f903333871e84876d6c9cd1012872013c1990edba446df7f6672e5 WHIRLPOOL 8d73073cb1210d35202acbf088c45def3071fe73ff96719e9cd6023a9e52d2458ecfde934f699d1effe638239499d43f6552ccbd518d15b8835cdd0e79f2f456
+MISC ChangeLog-2015 61057 SHA256 563de14419f021b91a607c1a5193162c42d67ae088d195f07077784dfe150751 SHA512 5e4d4294d5992cad24bafed095716b370df4a1b1c04205b1f4e148fab85cd569d77612d3bfdbd0859e3725685351beaaf286a6c5a5d877ad90973d1344f0dc1d WHIRLPOOL ef7b0b186827097e1552db8469e38490261729752dd89c9b6b8f485aaf41c54faf038596a55a727ef07faab0e377cae30bfa25c8b3492357d660a2ca1f97d754
+MISC metadata.xml 901 SHA256 39ebf2980aa7c3a678e1e49beba3234812059d24e79250df8d371f40719abf28 SHA512 8b560d5ceac1801357882119adb47f438bfc9a50a21a2f785561459d78f67497657801784d6a6a27cc280967d0e478e0ac77dc73f76b117a8d96aa6b02fa64b9 WHIRLPOOL e3e533d4f8e89fbd4e2f1602430982ecde425802fcd22a514a289d77833482e587ef34987ebc90f847fd878a4d917f84bfd476660ccba210f433106295e0e807
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..075d34356734
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.4
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..ff4a297390ab
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.4
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..3c68261a9a67
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,114 @@
+@version: 3.4
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+ stats_freq(43200);
+};
+
+source src {
+ unix-dgram("/dev/log");
+ internal();
+};
+source kernsrc {
+ file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+ and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.confd b/app-admin/syslog-ng/files/3.4/syslog-ng.confd
new file mode 100644
index 000000000000..6a437d1bf36f
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/var/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6
new file mode 100644
index 000000000000..8db2101e132f
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+ use clock
+ need hostname localmount
+ after bootmisc
+ provide logger
+}
+
+checkconfig() {
+ ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+ syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+ eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+ checkconfig || return 1
+ checkpath \
+ -d \
+ --mode 0700 \
+ --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \
+ "${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+ [ "$RC_CMD" = restart ] && sleep 1
+ return 0
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration and re-opening log files"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
new file mode 100644
index 000000000000..aa00c3b9d0e4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng-3.6.2-redis.patch
@@ -0,0 +1,29 @@
+From 0e51c69056a93bd2b95341f005b8b1fdceec2b10 Mon Sep 17 00:00:00 2001
+From: Tibor Benke <ihrwein@gmail.com>
+Date: Wed, 17 Dec 2014 23:52:41 +0100
+Subject: [PATCH] redis: free reply object after a succesful ping
+
+---
+ modules/redis/redis.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules/redis/redis.c b/modules/redis/redis.c
+index 46a5b6b..9114324 100644
+--- a/modules/redis/redis.c
++++ b/modules/redis/redis.c
+@@ -132,9 +132,14 @@ redis_dd_format_persist_name(LogThrDestDriver *d)
+ static gboolean
+ redis_dd_connect(RedisDriver *self, gboolean reconnect)
+ {
++ redisReply *reply;
++
+ if (reconnect && (self->c != NULL))
+ {
+- redisCommand(self->c, "ping");
++ reply = redisCommand(self->c, "ping");
++
++ if (reply)
++ freeReplyObject(reply);
+
+ if (!self->c->err)
+ return TRUE;
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..2da277949df2
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.6
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..4e83482b980f
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.6
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..11719174ca87
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,114 @@
+@version: 3.6
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+ stats_freq(43200);
+};
+
+source src {
+ unix-dgram("/dev/log");
+ internal();
+};
+source kernsrc {
+ file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+ and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.confd b/app-admin/syslog-ng/files/3.6/syslog-ng.confd
new file mode 100644
index 000000000000..42fa26ab4cf4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
new file mode 100644
index 000000000000..a27ae55dcbdf
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+ use clock
+ need hostname localmount
+ after bootmisc
+ provide logger
+}
+
+checkconfig() {
+ ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+ syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+ eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+ checkconfig || return 1
+ checkpath \
+ -d \
+ --mode 0700 \
+ --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+ "${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+ [ "$RC_CMD" = restart ] && sleep 1
+ return 0
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration and re-opening log files"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
new file mode 100644
index 000000000000..131dea1f71ad
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
@@ -0,0 +1,36 @@
+@version: 3.7
+#
+# Syslog-ng default configuration file for Gentoo Linux
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+ # The default action of syslog-ng is to log a MARK line
+ # to the file every 20 minutes. That's seems high for most
+ # people so turn it down to once an hour. Set it to zero
+ # if you don't want the functionality at all.
+ mark_freq(3600);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+# By default messages are logged to tty12...
+destination console_all { file("/dev/tty12"); };
+# ...if you intend to use /dev/console for programs like xconsole
+# you can comment out the destination line above that references /dev/tty12
+# and uncomment the line below.
+#destination console_all { file("/dev/console"); };
+
+log { source(src); destination(messages); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
new file mode 100644
index 000000000000..eb2e3d986e6d
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
@@ -0,0 +1,24 @@
+@version: 3.7
+#
+# Syslog-ng default configuration file for Gentoo FreeBSD
+#
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+
+ # The default action of syslog-ng is to log a STATS line
+ # to the file every 10 minutes. That's pretty ugly after a while.
+ # Change it to every 12 hours so you get a nice daily update of
+ # how many messages syslog-ng missed (0).
+ stats_freq(43200);
+};
+
+source src { system(); internal(); };
+
+destination messages { file("/var/log/messages"); };
+
+log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
new file mode 100644
index 000000000000..b7443f0bd66a
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
@@ -0,0 +1,114 @@
+@version: 3.7
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# https://bugs.gentoo.org/show_bug.cgi?id=426814
+@include "scl.conf"
+
+#
+# Syslog-ng configuration file, compatible with default hardened installations.
+#
+
+options {
+ threaded(yes);
+ chain_hostnames(no);
+ stats_freq(43200);
+};
+
+source src {
+ unix-dgram("/dev/log");
+ internal();
+};
+source kernsrc {
+ file("/proc/kmsg");
+};
+
+#source net { udp(); };
+#log { source(net); destination(net_logs); };
+#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
+
+destination authlog { file("/var/log/auth.log"); };
+destination _syslog { file("/var/log/syslog"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+#destination ppp { file("/var/log/ppp.log"); };
+destination mail { file("/var/log/mail.log"); };
+
+destination avc { file("/var/log/avc.log"); };
+destination audit { file("/var/log/audit.log"); };
+destination pax { file("/var/log/pax.log"); };
+destination grsec { file("/var/log/grsec.log"); };
+
+destination mailinfo { file("/var/log/mail.info"); };
+destination mailwarn { file("/var/log/mail.warn"); };
+destination mailerr { file("/var/log/mail.err"); };
+
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination debug { file("/var/log/debug"); };
+destination messages { file("/var/log/messages"); };
+destination console { usertty("root"); };
+destination console_all { file("/dev/tty12"); };
+#destination loghost { udp("loghost" port(999)); };
+
+destination xconsole { pipe("/dev/xconsole"); };
+
+filter f_auth { facility(auth); };
+filter f_authpriv { facility(auth, authpriv); };
+filter f_syslog { not facility(authpriv, mail); };
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+#filter f_ppp { facility(ppp); };
+filter f_news { facility(news); };
+filter f_debug { not facility(auth, authpriv, news, mail); };
+filter f_messages { level(info..warn)
+ and not facility(auth, authpriv, mail, news); };
+filter f_emergency { level(emerg); };
+
+filter f_info { level(info); };
+
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_crit { level(crit); };
+filter f_err { level(err); };
+
+filter f_avc { message(".*avc: .*"); };
+filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
+filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
+filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog); destination(_syslog); };
+log { source(src); filter(f_cron); destination(cron); };
+log { source(src); filter(f_daemon); destination(daemon); };
+log { source(kernsrc); filter(f_kern); destination(kern); };
+log { source(src); filter(f_lpr); destination(lpr); };
+log { source(src); filter(f_mail); destination(mail); };
+log { source(src); filter(f_user); destination(user); };
+log { source(src); filter(f_uucp); destination(uucp); };
+log { source(kernsrc); filter(f_pax); destination(pax); };
+log { source(kernsrc); filter(f_grsec); destination(grsec); };
+log { source(kernsrc); filter(f_audit); destination(audit); };
+log { source(kernsrc); filter(f_avc); destination(avc); };
+log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
+log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
+log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
+log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
+log { source(src); filter(f_news); filter(f_err); destination(newserr); };
+log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
+log { source(src); filter(f_debug); destination(debug); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_emergency); destination(console); };
+#log { source(src); filter(f_ppp); destination(ppp); };
+log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.confd b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
new file mode 100644
index 000000000000..42fa26ab4cf4
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
@@ -0,0 +1,42 @@
+# Config file for /etc/init.d/syslog-ng
+
+# If you are not using network logging, this entire section should be
+# commented out. Otherwise, choose one of the settings below based on
+# how you are configuring your network.
+#
+# If you are using the net.* scripts to configure your network, you should
+# set rc_need to match the interface through which your logging server
+# can be reached.
+#rc_need="net.eth0"
+#
+# If you are using an interface manager like wicd, dhcpcd in standalone
+# mode, networkmanager, etc to control your interfaces, set rc_need to
+# the name of that service.
+# rc_need="dhcpcd"
+#rc_need="networkmanager"
+#
+# If you are using newnet and configuring your interface statically with
+# the network script, you should use this setting.
+#rc_need="network"
+#
+# You can use this setting, but I do not recommend relying on it.
+#rc_need="net"
+#
+# You may also want to uncomment the following if you are using network
+# logging.
+#rc_use="stunnel"
+
+# For very customized setups these variables can be adjusted as needed
+# but for most situations they should remain commented:
+# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
+# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
+# SYSLOG_NG_PIDFILE_DIR=/run
+# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
+# SYSLOG_NG_GROUP=root
+# SYSLOG_NG_USER=root
+
+# Put any additional options for syslog-ng here.
+# See syslog-ng(8) for more information.
+
+SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
new file mode 100644
index 000000000000..a27ae55dcbdf
--- /dev/null
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
+SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
+SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
+SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
+SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+
+SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
+SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+
+command="/usr/sbin/syslog-ng"
+command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+pidfile="${SYSLOG_NG_PIDFILE}"
+start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
+description="Syslog-ng is a syslog replacement with advanced filtering features."
+description_checkconfig="Check the configuration file that will be used by \"start\""
+description_reload="Reload the configuration without exiting"
+required_files="${SYSLOG_NG_CONFIGFILE}"
+required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
+
+depend() {
+ use clock
+ need hostname localmount
+ after bootmisc
+ provide logger
+}
+
+checkconfig() {
+ ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
+ syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
+ eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
+}
+
+start_pre() {
+ checkconfig || return 1
+ checkpath \
+ -d \
+ --mode 0700 \
+ --owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
+ "${SYSLOG_NG_STATEFILE_DIR}"
+}
+
+stop_pre() {
+ [ "$RC_CMD" = restart ] && sleep 1
+ return 0
+}
+
+reload() {
+ checkconfig || return 1
+ ebegin "Reloading configuration and re-opening log files"
+ start-stop-daemon --signal HUP --pidfile "${pidfile}"
+ eend $?
+}
diff --git a/app-admin/syslog-ng/files/README.hardened b/app-admin/syslog-ng/files/README.hardened
new file mode 100644
index 000000000000..dcb0fc3f3ae2
--- /dev/null
+++ b/app-admin/syslog-ng/files/README.hardened
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+If you intend to use syslog-ng together with the systemd journal,
+please be sure to configure it to listen accordingly, e.g. replace
+
+ unix-dgram("/dev/log");
+
+with
+
+ unix-dgram("/run/systemd/journal/syslog");
+
+in /etc/syslog-ng/syslog-ng.conf
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
new file mode 100644
index 000000000000..ba4730e084f4
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate
@@ -0,0 +1,12 @@
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+ missingok
+ sharedscripts
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
new file mode 100644
index 000000000000..678814a623fb
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
@@ -0,0 +1,75 @@
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# User log
+/var/log/user.log {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+ sharedscripts
+ missingok
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# Authentication
+/var/log/auth.log {
+ sharedscripts
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
+
+# the rest
+/var/log/messages {
+ sharedscripts
+ postrotate
+ /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true
+ endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
new file mode 100644
index 000000000000..21ec5eba69c3
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -0,0 +1,75 @@
+#
+# Syslog-ng logrotate snippet for Hardened Gentoo Linux
+# contributed by Maciej Grela
+#
+# Updated bug #284669
+
+# Generic
+/var/log/debug /var/log/syslog /var/log/kern.log {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# System services
+/var/log/cron.log /var/log/daemon.log /var/log/lpr.log /var/log/uucp.log {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# User log
+/var/log/user.log {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# News system
+/var/log/news/news.crit /var/log/news/news.err /var/log/news/news.notice {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# Mail system
+/var/log/mail.log /var/log/mail.info /var/log/mail.err /var/log/mail.warn {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# Hardened logs
+/var/log/avc.log /var/log/audit.log /var/log/pax.log /var/log/grsec.log {
+ sharedscripts
+ missingok
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# Authentication
+/var/log/auth.log {
+ sharedscripts
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
+
+# the rest
+/var/log/messages {
+ sharedscripts
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
new file mode 100644
index 000000000000..2e368bd1099a
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
@@ -0,0 +1,12 @@
+#
+# Syslog-ng logrotate snippet for Gentoo Linux
+# contributed by Michael Sterrett
+#
+
+/var/log/messages {
+ missingok
+ sharedscripts
+ postrotate
+ @GENTOO_RESTART@ > /dev/null 2>&1 || true
+ endscript
+}
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
new file mode 100644
index 000000000000..149ca4378d1c
--- /dev/null
+++ b/app-admin/syslog-ng/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>mr_bones_@gentoo.org</email>
+ <name>Michael Sterrett</name>
+ </maintainer>
+ <use>
+ <flag name="amqp">Enable support for AMQP destinations</flag>
+ <flag name="smtp">Enable support for SMTP destinations</flag>
+ <flag name="spoof-source">Enable support for spoofed source addresses</flag>
+ <flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
+ <flag name="mongodb">Enable support for mongodb destinations</flag>
+ <flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
+ <flag name="redis">Enable support for Redis destinations</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">balabit/syslog-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
new file mode 100644
index 000000000000..cfe719f24461
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib systemd
+
+MY_PV=${PV/_/}
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct +pcre smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+ pcre? ( dev-libs/libpcre )
+ spoof-source? ( net-libs/libnet:1.1 )
+ ssl? ( dev-libs/openssl:= )
+ smtp? ( net-libs/libesmtp )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ >=dev-libs/eventlog-0.2.12
+ >=dev-libs/glib-2.10.1:2
+ json? ( >=dev-libs/json-c-0.9 )
+ caps? ( sys-libs/libcap )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+ cd "${TMPDIR}" || die
+
+ for f in *logrotate*.in ; do
+ if use systemd ; then
+ sed \
+ 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+ $f > ${f/.in/} || die
+ else
+ sed \
+ 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+ $f > ${f/.in/} || die
+ fi
+ done
+}
+
+src_configure() {
+ econf \
+ --disable-docs \
+ --with-ivykis=internal \
+ --with-libmongo-client=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/syslog-ng \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(systemd_with_unitdir) \
+ $(use_enable systemd) \
+ $(use_enable caps linux-caps) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_enable mongodb) \
+ $(use_enable pacct) \
+ $(use_enable pcre) \
+ $(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+ $(use_enable spoof-source) \
+ $(use_enable dbi sql) \
+ $(use_enable ssl) \
+ $(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+ # -j1 for bug #484470
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc AUTHORS NEWS contrib/syslog-ng.conf* contrib/syslog2ng \
+ "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.hardened" \
+ "${TMPDIR}/syslog-ng.logrotate.hardened" \
+ "${FILESDIR}/README.hardened"
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${FILESDIR}/${PV%.*}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/${PV%.*}/syslog-ng.rc6" syslog-ng
+ newconfd "${FILESDIR}/${PV%.*}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.4-guides/en/syslog-ng-ose-v3.4-guide-admin/html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
new file mode 100644
index 000000000000..febb3545a584
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ json? ( >=dev-libs/json-c-0.9 )
+ redis? ( dev-libs/hiredis )
+ smtp? ( net-libs/libesmtp )
+ spoof-source? ( net-libs/libnet:1.1 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ dev-libs/libpcre
+ >=dev-libs/eventlog-0.2.12
+ >=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${MY_PV_MM}/${P}-redis.patch
+ epatch_user
+ cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+ cd "${TMPDIR}" || die
+
+ for f in *logrotate*.in ; do
+ if use systemd ; then
+ sed \
+ 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+ $f > ${f/.in/} || die
+ else
+ sed \
+ 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+ $f > ${f/.in/} || die
+ fi
+ done
+}
+
+src_configure() {
+ econf \
+ --disable-docs \
+ --with-embedded-crypto \
+ --with-ivykis=internal \
+ --with-libmongo-client=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/syslog-ng \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(systemd_with_unitdir) \
+ $(use_enable systemd) \
+ $(use_enable caps linux-caps) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_enable mongodb) \
+ $(use_enable pacct) \
+ $(use_enable redis) \
+ $(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+ $(use_enable spoof-source) \
+ $(use_enable dbi sql) \
+ $(use_enable ssl) \
+ $(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+ # -j1 for bug #484470
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+ "${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+ newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
new file mode 100644
index 000000000000..641db9183360
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
+RESTRICT="test"
+
+RDEPEND="
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ json? ( >=dev-libs/json-c-0.9 )
+ redis? ( dev-libs/hiredis )
+ smtp? ( net-libs/libesmtp )
+ spoof-source? ( net-libs/libnet:1.1 )
+ ssl? ( dev-libs/openssl:= )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ dev-libs/libpcre
+ >=dev-libs/eventlog-0.2.12
+ >=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+ epatch_user
+ cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+ cd "${TMPDIR}" || die
+
+ for f in *logrotate*.in ; do
+ if use systemd ; then
+ sed \
+ 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+ $f > ${f/.in/} || die
+ else
+ sed \
+ 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+ $f > ${f/.in/} || die
+ fi
+ done
+}
+
+src_configure() {
+ econf \
+ --disable-docs \
+ --enable-manpages \
+ --with-embedded-crypto \
+ --with-ivykis=internal \
+ --with-libmongo-client=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/syslog-ng \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(systemd_with_unitdir) \
+ $(use_enable systemd) \
+ $(use_enable caps linux-caps) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_enable mongodb) \
+ $(use_enable pacct) \
+ $(use_enable redis) \
+ $(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+ $(use_enable spoof-source) \
+ $(use_enable dbi sql) \
+ $(use_enable ssl) \
+ $(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+ # -j1 for bug #484470
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+ "${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+ newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-v3.6-guide-admin/html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
new file mode 100644
index 000000000000..a855ef61bc5f
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ json? ( >=dev-libs/json-c-0.9 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( dev-libs/hiredis )
+ smtp? ( net-libs/libesmtp )
+ spoof-source? ( net-libs/libnet:1.1 )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ dev-libs/libpcre
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/eventlog-0.2.12
+ >=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch_user
+ use python && python_fix_shebang .
+
+ if use !json ; then
+ sed -i \
+ -e '1 s/cim //' \
+ scl/Makefile.am || die
+ eautoreconf
+ fi
+
+ cp "${FILESDIR}"/*logrotate*.in "${TMPDIR}" || die
+ cd "${TMPDIR}" || die
+
+ for f in *logrotate*.in ; do
+ if use systemd ; then
+ sed \
+ 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+ $f > ${f/.in/} || die
+ else
+ sed \
+ 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:' \
+ $f > ${f/.in/} || die
+ fi
+ done
+}
+
+src_configure() {
+ econf \
+ --disable-java \
+ --disable-docs \
+ --enable-manpages \
+ --with-embedded-crypto \
+ --with-ivykis=internal \
+ --with-libmongo-client=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/syslog-ng \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(systemd_with_unitdir) \
+ $(use_enable systemd) \
+ $(use_enable caps linux-caps) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_enable mongodb) \
+ $(use_enable pacct) \
+ $(use_enable python) \
+ $(use_enable redis) \
+ $(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+ $(use_enable spoof-source) \
+ $(use_enable dbi sql) \
+ $(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+ # -j1 for bug #484470
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+ "${TMPDIR}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${TMPDIR}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+ newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ prune_libtool_files --modules
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
new file mode 100644
index 000000000000..99f98ce6773b
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 eutils multilib systemd versionator
+
+MY_PV=${PV/_/}
+MY_PV_MM=$(get_version_component_range 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ json? ( >=dev-libs/json-c-0.9 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( dev-libs/hiredis )
+ smtp? ( net-libs/libesmtp )
+ spoof-source? ( net-libs/libnet:1.1 )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ dev-libs/libpcre
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/eventlog-0.2.12
+ >=dev-libs/glib-2.10.1:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local f
+
+ use python && python_fix_shebang .
+
+ if use !json ; then
+ sed -i -e '1 s/cim //' scl/Makefile.am || die
+ eautoreconf
+ fi
+
+ for f in "${FILESDIR}"/*logrotate*.in ; do
+ local bn=$(basename "${f}")
+
+ sed \
+ -e "$(usex systemd \
+ 's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+ 's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
+ "${f}" > "${T}/${bn/.in/}" || die
+ done
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --disable-java \
+ --disable-docs \
+ --enable-manpages \
+ --with-embedded-crypto \
+ --with-ivykis=internal \
+ --with-libmongo-client=internal \
+ --sysconfdir=/etc/syslog-ng \
+ --localstatedir=/var/lib/syslog-ng \
+ --with-pidfile-dir=/var/run \
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng \
+ $(systemd_with_unitdir) \
+ $(use_enable systemd) \
+ $(use_enable caps linux-caps) \
+ $(use_enable geoip) \
+ $(use_enable ipv6) \
+ $(use_enable json) \
+ $(use_enable mongodb) \
+ $(use_enable pacct) \
+ $(use_enable python) \
+ $(use_enable redis) \
+ $(use_enable smtp) \
+ $(use_enable amqp) \
+ $(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
+ $(use_enable spoof-source) \
+ $(use_enable dbi sql) \
+ $(use_enable tcpd tcp-wrapper)
+}
+
+src_install() {
+ # -j1 for bug #484470
+ emake -j1 DESTDIR="${D}" install
+
+ dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
+ contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+
+ # Install default configuration
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${T}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
+ newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ prune_libtool_files --modules
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ elog "For detailed documentation please see the upstream website:"
+ elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
+
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ echo
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ echo
+ fi
+}
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
new file mode 100644
index 000000000000..42eed5e96845
--- /dev/null
+++ b/app-admin/syslog-summary/Manifest
@@ -0,0 +1,5 @@
+DIST syslog-summary-1.14.tar.gz 7278 SHA256 d912e9b7db3e3a33a4a95662c97ccf73ac5ead4d2f1779ef9184c53bede8518b SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277 WHIRLPOOL 68d78468ff2ea97fc0248546056c5448565fbcb3278057813a511c84d5b6913aede5f4e44ae85eb776a49cd1e24c0157c283bace741e173c8b93253578fe5496
+EBUILD syslog-summary-1.14-r1.ebuild 753 SHA256 13e66454c41311a3ed2a8c8e26399286ada5b43ea7a7a1de75e9ade391433a77 SHA512 d3a1d4bd6634b7a37b029b5231c924ab603f8512c55309a686851aa9d71f8f8e93315a72fb2566d35d22712aa6afea71849f6e940b8ec7ba9d7d6f020d96c83c WHIRLPOOL 9780ab61ba7dbb49242c07e62b5ee7627074294bf77ad223de546f62bc706f53264e86ddda2b0711162135d251aa2343735fc5ae3c6833a32790ea521200008f
+MISC ChangeLog 2354 SHA256 2dac1c389be6b896830246b5de80a0534851dcf832564e44cee6b0ba2cdf067d SHA512 a82931251cac5d872f3bf8f91192b4094426fada3f2e9f8ddcc0a748bbe7673a02fce5e483d1af361412e30ed23ea087ed48caff8e7d1195bb9f8b7f33a214fb WHIRLPOOL f87e0885fb8bd6ba5095cc4d2b884f9ba2db3c622676bd8fc00c77f68b7ac5ef6e67e77eae39e7b55150b5226814aa5c75f224143b6d5ec353b5a03c2a3989ed
+MISC ChangeLog-2015 1746 SHA256 072922b52520ffd25fd2c8d5a1e29db4169a7c537d213431e9405feea83f7414 SHA512 241b96fb1daf46ee859d3e08e3326e70d779967df13f07239399d2f8d1ff6162b088b1002070ad5dc541c9d6859f89b6906e908991a61e874f8667d5bfa1ed82 WHIRLPOOL 654a9a9c3f275fd118d108f48f790206b255498225239a279a720b14d84e66f76807bfa8452ac50d00bf8c78f2e4d98fa9009dfcb46af8df02ae5ee29cb7a7e6
+MISC metadata.xml 260 SHA256 78cfca3812c8a61cf805bd6c2fd1190269ee28f98488bd8117c7f8136948b83a SHA512 165a24f5387267c854334cc1de61522c00da716191e985aa2d7df5f85f042c85c2a5037fe8fdec791232e43bf3644294e6fef8150fd7449334488c4d54c60f7a WHIRLPOOL 842aec236bbc3296358b1cf687a456fca7684d2de2bd22e1a2350e3a3a1e7f66297aabbcbef9237ea9deeb769f6ece9b274e8fc76efdd1a63b08109fb6873e14
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
new file mode 100644
index 000000000000..262bb459b8c4
--- /dev/null
+++ b/app-admin/syslog-summary/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">dpaleino/syslog-summary</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
new file mode 100644
index 000000000000..f23f58c39b83
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 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="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+ python_fix_shebang -f syslog-summary
+
+ # Sadly, the makefile is useless for us.
+ rm Makefile || die
+}
+
+src_install() {
+ dobin syslog-summary
+ dodoc AUTHORS ChangeLog NEWS README
+ doman syslog-summary.1
+
+ insinto /etc/syslog-summary
+ doins ignore.rules
+}
diff --git a/app-admin/syslogread/Manifest b/app-admin/syslogread/Manifest
new file mode 100644
index 000000000000..f55a02cc8d49
--- /dev/null
+++ b/app-admin/syslogread/Manifest
@@ -0,0 +1,9 @@
+AUX 0.92/klogd.run 84 SHA256 643ff8e40aa189bbf60ba4eb1f3143bb796fca34d98b1fda6ba38c6bdec3b389 SHA512 6451fc04a4005e5bf0e8c7852da8fa46c6e87ae32cff18554996acdb06a9d4c1323f54439de6c7c9274fbd09aed38c9c3af982700aa3ca1f122434ba9b75fc6e WHIRLPOOL f31d024622b8e726272c3d2008a23b15877b5dda07d4d86cc03da89022a27d4b73a5ad35e8a04b7ebf41843fed6bd47159cd9fb63f6a6ddcf0153ec40497a496
+AUX 0.92/syslogread-log.run 129 SHA256 bdb69e01e1ce4bc84315db4852d81ccfaac3cb5ed97032552f84d52d61b0b1a2 SHA512 3ef1cd5a49a8a360c1417ff646ecb1c42ec15a2ebe1fdf83e949e7fb7a80265c3e76229316a1f98107b9739a4edf5ea62c446aa4af3cb254ea2c180c36ed0aab WHIRLPOOL 8b9f589c65a804e7558ea639d300b3579300a08b98f5e54d9bd35b25fc2ec8f22b4136db08364611ad83b56dbb23f2814bee6b22c82612e407d0c1bfc9bb1f43
+AUX 0.92/syslogread.run 56 SHA256 17706e9f1eebeede0555834b25497f15de6cecfe03d512ea1e2b473199838ac1 SHA512 f1ba637765145a51279c29e1c9c345a5426e606c7f483129d6675b1998c8a578c591f16aaf9887907ecf3053c75ada1190c52ab09a49e938f566068c191096ac WHIRLPOOL e0709194562d2c0ebe86d52894817a5c024ec5c51661d064f09a8d3a18a600824778cfe9442efebc0666258776182f19b39c6f256c82cc3708d193d9416e60fe
+AUX syslogread-0.92-fix-parallel-build.patch 516 SHA256 9a5fca50c488d23587fff7cde6076b70a1e9387f578b9c245e786bb951210a26 SHA512 da661b502f21c82284acbc057e53531dd5ae596c8a7fcc85e6f112687ddc7756bb4c908c7d5f30e935023576fccbb625c5d5cebcbc17c09164cf34353d501635 WHIRLPOOL f2fee43f6514685b84bac85bb0b3836e483dc67fdaf744dca8a78f193e847b70229cd55b3f9ca5e0389815968ef3a1376de8562658ad8360d5749f41595e20db
+DIST syslogread-0.92.tar.gz 21807 SHA256 eae464db3d9cc9826f65c8bd7ccbfe95795c39fda2876d4db2a4ee8d578bcd03 SHA512 8e00d169955e2c659233df1746f0e50f33f50cf9eb7d4b6d2926eadd6e6a7183b7beec485b7422befc399cc48da83462a709304715083d2c5ec8359b6f3728c0 WHIRLPOOL d94f949bd193ded38df687e12438412e117afd6ab5a29c2edd86d213a0c1691ae19f5c942aa711336b99c65ca94d17189f50b40514137afb1bf856419794d4f9
+EBUILD syslogread-0.92-r1.ebuild 2174 SHA256 90265a248fb1f23bbdaafe42e658122d2d647ebe0276fb76b7725a91738f7056 SHA512 5e9ffff6904fe1b2a67081256e1c483db3b65355acc4c9e76d8cd578ea29384ec858ac314f740c5db20e1fd17afc7949af82d3b1aecaf44c36c3119594ffeb51 WHIRLPOOL f897c65573aeb7f819d2675d569b7d4192adce3e438b6e88b28484bca93ae7cfe5a79114a82456bb32a69a66da9570023289b2ed7456ed34ca8fef6202152718
+MISC ChangeLog 2672 SHA256 4189982a2cac0062ed743c040889461ffb2a0d98be700b3b5ec3d06a3ade416b SHA512 edb885c5d481e4c7288cc6c6435728cfb175c9ba9505673093a4e4131896a930813daf8eea588a533ea070299aed3ba3814a491f37c26bf59eb13fc95e78d2ff WHIRLPOOL 8cd6e6535ffafb5f4c93e8d2c487cec7f790ccc1088923023ec3972613d479042524b7d08ae08923871364245b2d9c4c432db3e5c47705a43481b2abf0310c7c
+MISC ChangeLog-2015 2305 SHA256 37d94cfccfce66b3ed8c1a6ad4414adf9aac5ad0b05f7115357a2fb670a7cdcb SHA512 9fe13570bc5418d67453441eb7f09ff3b6b6373323b49b75f9a396f7e0af61e218c1c3e3b572daf6e09f0ef5ca6059e8607a593c0b84fdb0ee6d12bd57cf59c5 WHIRLPOOL ff67c689254691c21958877048bf9a7407228db6eb0ac96556abada9040944fb92bad5a63c1cbd31fc31776320cf90f02fb3d1c64698b72600fd022862217cd1
+MISC metadata.xml 320 SHA256 26356d5aeef4b0de374c2fe6b2a04e232679309ca52c31b0b3c0280f15685baa SHA512 ed2785769c5264f45b4712ec699ce6b01ae6dafc0ebd3de566b0c7d1189fca026f249e8e9f60b24dc69ca24cc8c86f45dca94161c80fdca8242494132305b408 WHIRLPOOL 96740336ff3bf24b96986d9ac6f15509399e1d14e9b761a2086a14f8b895bbe590715bad7ebf5ba26b5029f139acb558d4710b46ead32e00a88431193e9df6fb
diff --git a/app-admin/syslogread/files/0.92/klogd.run b/app-admin/syslogread/files/0.92/klogd.run
new file mode 100644
index 000000000000..b6d0fb27795e
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/klogd.run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+exec < /proc/kmsg
+exec /usr/bin/multilog t n64 /var/log/klogd
diff --git a/app-admin/syslogread/files/0.92/syslogread-log.run b/app-admin/syslogread/files/0.92/syslogread-log.run
new file mode 100644
index 000000000000..f53cd0199571
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/syslogread-log.run
@@ -0,0 +1,3 @@
+#!/bin/sh
+#exec setuidgid syslog syslogxlate '*.*' | multilog t /var/log/syslog
+exec setuidgid syslog multilog t /var/log/syslog
diff --git a/app-admin/syslogread/files/0.92/syslogread.run b/app-admin/syslogread/files/0.92/syslogread.run
new file mode 100644
index 000000000000..fdcb018c3066
--- /dev/null
+++ b/app-admin/syslogread/files/0.92/syslogread.run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec envuidgid syslog sysloglread -U /dev/log
diff --git a/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
new file mode 100644
index 000000000000..98e810fc70a9
--- /dev/null
+++ b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
@@ -0,0 +1,19 @@
+--- Makefile.orig 2010-01-14 13:47:59.000000000 +0100
++++ Makefile 2010-01-14 13:49:00.000000000 +0100
+@@ -45,14 +45,14 @@
+ ./load insthier -lbg-installer
+ mv insthier installer
+
+-instcheck: load insthier.o
++instcheck: load insthier.o installer instshow
+ ./load insthier -lbg-instcheck
+ mv insthier instcheck
+
+ insthier.o: compile insthier.c conf_bin.c conf_man.c
+ ./compile insthier.c
+
+-instshow: load insthier.o
++instshow: load insthier.o installer
+ ./load insthier -lbg-instshow
+ mv insthier instshow
+
diff --git a/app-admin/syslogread/metadata.xml b/app-admin/syslogread/metadata.xml
new file mode 100644
index 000000000000..2fbe00ebaa8e
--- /dev/null
+++ b/app-admin/syslogread/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">
+ This package is a set of tools that are useful in receiving, analyzing,
+ or producing syslog messages.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/syslogread/syslogread-0.92-r1.ebuild b/app-admin/syslogread/syslogread-0.92-r1.ebuild
new file mode 100644
index 000000000000..f92cca746857
--- /dev/null
+++ b/app-admin/syslogread/syslogread-0.92-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib user
+
+DESCRIPTION="Syslog message handling tools"
+HOMEPAGE="http://untroubled.org/syslogread/"
+SRC_URI="http://untroubled.org/syslogread/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.106"
+RDEPEND="virtual/daemontools"
+
+pkg_setup() {
+ enewgroup syslog
+ enewuser syslog -1 -1 /nonexistent syslog
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/syslogread-0.92-fix-parallel-build.patch
+}
+
+src_configure() {
+ echo "/usr/include/bglibs/" > conf-bgincs
+ echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
+ echo "${D}/usr/bin" > conf-bin
+ echo "${D}/usr/share/man" > conf-man
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+ dodir /usr/bin
+ dodir /usr/share/man
+ ./installer || die
+
+ dodoc ANNOUNCEMENT ChangeLog README
+
+ insinto /var/lib/supervise/klogd
+ newins "${FILESDIR}/${PV}/klogd.run" klogd.run
+
+ insinto /var/lib/supervise/syslogd
+ newins "${FILESDIR}/${PV}/syslogread.run" syslogread.run
+
+ insinto /var/lib/supervise/syslogd/log
+ newins "${FILESDIR}/${PV}/syslogread-log.run" syslogread-log.run
+
+ # See ChangeLog for why these are commented out:
+
+ #newinitd "${FILESDIR}/${PV}/syslogread.init" syslogread
+
+ #keepdir /var/log/klogd
+ #keepdir /var/log/syslog
+
+ #fowners syslog:syslog /var/log/syslog
+ #fperms o-rwx /var/log/syslog
+}
+
+pkg_postinst() {
+ echo
+ elog "Run "
+ elog "emerge --config =${PF}"
+ elog "to create or update your run files (backups are created) in"
+ elog " /var/lib/supervise/klogd (kernel logger)"
+ elog " /var/lib/supervise/syslog (system logger)"
+ echo
+}
+
+pkg_config() {
+ cd "${ROOT}"var/lib/supervise/klogd
+ [ -e run ] && cp run klogd.run.`date +%Y%m%d%H%M%S`
+ cp klogd.run run
+ chmod u+x run
+
+ cd "${ROOT}"var/lib/supervise/syslogd
+ [ -e run ] && cp run syslogread.run.`date +%Y%m%d%H%M%S`
+ cp syslogread.run run
+ chmod u+x run
+
+ cd "${ROOT}"var/lib/supervise/syslogd/log
+ [ -e run ] && cp run syslogread-log.run.`date +%Y%m%d%H%M%S`
+ cp syslogread-log.run run
+ chmod u+x run
+}
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
new file mode 100644
index 000000000000..ea52931accf7
--- /dev/null
+++ b/app-admin/sysrqd/Manifest
@@ -0,0 +1,7 @@
+AUX sysrqd-config.patch 494 SHA256 5dd233f8063a7c0dee1f488bcb4e9c3f5a4e989a36cbd7f6d620f376dbe48f34 SHA512 5dc0d43e571a8d75c61914846edb87437b81c5bb467a5a16fa927a82d5b42d40b45e3a1cfcf98165a417cd175192207ed8a5d23f39f1c5844d9b589c7eae2337 WHIRLPOOL eb5e8be46846da911b738a6e3e770650d3fa5b69739da976a7fba8ab5d12bad7d02a3e4f301b7b53c589ac7842353a0f238c431100bbee4e0a73b77a1272ea2c
+AUX sysrqd.init 700 SHA256 4646f2206043094110ac6a9f32d63dad6ca823cce82fd4c3b4e6ed96218d5143 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918 WHIRLPOOL 367a765511b406a8d88c1ac2da95e65d8c34d34ec2dddb30def9c6e752ce0891e0ab80384cb5e143d654fe4273e2fc18105ac64bda39a18680988c0e6fe84093
+DIST sysrqd-14.tar.gz 4759 SHA256 aa938dc663b73fb28d165c8145f51b6c2412ccb202e641548452c9583d593428 SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2 WHIRLPOOL 3d13a15d1722b388e853227baa6fb21eee5adda680ade409f633aa8bfab58cb5252bccb091d2e5c913613751c6cb9991b74ba65e8f27d8bfe49a3c5cf745f1c0
+EBUILD sysrqd-14.ebuild 1445 SHA256 e26b745d3faf225c32fcf8fb9784becfd1781df6c20948f2ca6228a185c5fc9a SHA512 e9f5bfec1305270a52e179516d8060d6c220b2eff281232253a37317173a51ff60c04e857361d36495537775bf21330e4d6be2dfbf2a6c349193d1b6f1ca7c1e WHIRLPOOL 04510f0fcfd276a32fb5aceb3d4a40e43712c61b8997eebd13b37244faab793ab3962118adbf1ed0fa16658937d1f6f907c0d01cc23ac5740661dc9712256d33
+MISC ChangeLog 2484 SHA256 8c93c58ec65f8f5559c72adc306aa6284681bdc30a2d53cfe5081a0c5e880286 SHA512 d929361f9bf41004084c2e0e0ddc3c40ced9aa80f4a5d8dc75f85ae2945adb5b928d6d477d5eb0e017a2e678b17c0fbde4a0746dcc93f420bd66315d01da2c58 WHIRLPOOL 04dc5a9d50958da21b9a2f3b8c32dc05c8c881a7eeb24af94bb0da6e488ec5a770afb72258bc75f48dad13991a3186253b78a772227fa381a5d8203a3ae55479
+MISC ChangeLog-2015 1431 SHA256 213a79abbcadb76525f2cef1990841f6f8454dac59df653b7a61f8c0c655c242 SHA512 686bcbc22ee3fceb682debaefdf6f659daa5c3e72ed15c48a7ebbd76b8e6bdce215e9a27eadd03a170be9d68e0ff579dfa5a5b42c6601078920cf82d35b9f82f WHIRLPOOL bf01b2e3c89550e9bb3c90e2a4f3a59128926188ee8383914040cddcdf003ea3fd06880cc344dee23e524a354ab4c5632f11cb0f6643f6b11314fbca1f3dd8b0
+MISC metadata.xml 531 SHA256 706c567689cd65b865ffa3d2dcacf64d0fd16528299201485429c8ed53a6038b SHA512 38c2de89d5f31d94e4756e76a3b2cba02c4907d84b2fb7d977ce5ae1b322ea92a096449dc5de5a85d4b6175e0e9a7529c01ef90e4eaf9396fcdeecde48aac7dd WHIRLPOOL c11aa7285c660bc2e613cc971b68f91377c0e2327ccf164e39848f63ff0f26cd5690942dc67d4823e5e7502e436aedd1c705ec1637721b82400963b40ad13dcd
diff --git a/app-admin/sysrqd/files/sysrqd-config.patch b/app-admin/sysrqd/files/sysrqd-config.patch
new file mode 100644
index 000000000000..ce463814d1e3
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-config.patch
@@ -0,0 +1,13 @@
+--- sysrqd.c.orig 2009-11-05 14:58:21.644471772 +0100
++++ sysrqd.c 2009-11-05 14:58:43.276472005 +0100
+@@ -40,8 +40,8 @@
+ #define BIND_MAX_LEN 16
+ #define PROMPT "sysrq> "
+ #define SYSRQ_TRIGGER_PATH "/proc/sysrq-trigger"
+-#define AUTH_FILE "/etc/sysrqd.secret"
+-#define BINDIP_FILE "/etc/sysrqd.bind"
++#define AUTH_FILE "/etc/sysrqd/sysrqd.secret"
++#define BINDIP_FILE "/etc/sysrqd/sysrqd.bind"
+ #define PID_FILE "/var/run/sysrqd.pid"
+ #define SYSRQD_PRIO -19
+ #define SYSRQD_LISTEN_PORT 4094
diff --git a/app-admin/sysrqd/files/sysrqd.init b/app-admin/sysrqd/files/sysrqd.init
new file mode 100644
index 000000000000..f88fc8ce43ef
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd.init
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ sysrqd_secret=/etc/sysrqd/sysrqd.secret
+ sysrqd_pidfile=/var/run/sysrqd.pid
+ if [ ! -e ${sysrqd_secret} ]; then
+ eerror "You need a '${sysrqd_secret}' containing a secret/password!"
+ eerror "Refusing to start."
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --pidfile ${sysrqd_pidfile} --quiet --exec /usr/sbin/sysrqd
+ eend $?
+}
+
+stop() {
+ checkconfig || return 1
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --quiet --pidfile ${sysrqd_pidfile}
+ eend $?
+}
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
new file mode 100644
index 000000000000..b86ebd13ff32
--- /dev/null
+++ b/app-admin/sysrqd/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>wschlich@gentoo.org</email>
+ <name>Wolfram Schlich</name>
+ <description>Primary maintainer</description>
+</maintainer>
+<longdescription>
+sysrqd is a small daemon intended to manage Linux Sysrq over network.
+Its philosophy is to be very responsive under heavy load and try to
+be somehow reliable. Authentication is made by clear password.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
new file mode 100644
index 000000000000..3475122a5807
--- /dev/null
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
+#SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-config.patch"
+}
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o sysrqd sysrqd.c
+}
+
+src_install() {
+ dosbin sysrqd
+ newinitd "${FILESDIR}/sysrqd.init" sysrqd
+
+ local bindip='127.0.0.1' secret
+ declare -i secret
+ let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}
+ echo ${bindip} > sysrqd.bind
+ echo ${secret} > sysrqd.secret
+
+ diropts -m 0700 -o root -g root
+ dodir /etc/sysrqd
+ insinto /etc/sysrqd
+ insopts -m 0600 -o root -g root
+ doins sysrqd.bind
+ doins sysrqd.secret
+
+ dodoc README ChangeLog
+}
+
+pkg_postinst() {
+ elog
+ elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !"
+ elog "As a security precaution, sysrqd is configured to only listen on"
+ elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind"
+ elog "to an IPv4 address you want it to listen on or remove the file"
+ elog "to make it listen on any IP address (0.0.0.0)."
+ elog
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
new file mode 100644
index 000000000000..a25861f56024
--- /dev/null
+++ b/app-admin/sysstat/Manifest
@@ -0,0 +1,14 @@
+AUX sysstat-10.0.4-flags.patch 887 SHA256 198660c418902107914afefbed1b07a0206ee05d673e99182f834f4ed98d1e8c SHA512 7daf43a8b09af67781ae33cbaaf7d6da9bb1f6f750428a08c3ddde8ecb94e0de27d5746a332086eb5191cccd8e6dbc37c263ab3046294b4b3df1a2666c1ab6ee WHIRLPOOL 7629adddebfb4a1704348ad17f6151359d343ef4285139681b61bba261c2a26cccc49b59c9b75bd18d29a864877845c69e7f7d66c9a8700bd16b75b6c412e17f
+AUX sysstat-11.0.4-cron.patch 1609 SHA256 40be139a456adeb21e76fc1f9663c171750f5aab3af2a4c6ed255fbabb14f02c SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d WHIRLPOOL 01b9f3aedac49494265891b03a885b59ead854099a6441f21a8aede873eba967b83c54df139f2be3215f489ddd0544c4c1d0241f5623985cdaf7082dbb912333
+AUX sysstat.init.d 378 SHA256 d42258dd706e387503a827515eec7081e10f78d51a0a507c71258e0388177a43 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4 WHIRLPOOL 44652d5d89ac23aec6b81ad9825e8470aa90270c8c1243d64a7d09d8c801e76e511877acd20054b1f1a7916adcc6b398cc270cf184391f27af4f1b17704dfb9c
+DIST sysstat-11.4.0.tar.xz 343968 SHA256 b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604 WHIRLPOOL 39f48929040405f83a0d3c49dcf2aac471deeadd10d31181ee03809a30573868a7da43df160688ad553d305221bd21c2e253f56913f8f8a53020fb66f62c05ba
+DIST sysstat-11.4.5.tar.xz 344796 SHA256 785d754d64c746b21190773a846539ef2ee789bf908f05cd8245c234d15784ff SHA512 e195e0fa4afa45e894fc1089ecdc7e77dd0532f0db0d10b717b32e642710baa96de31be01c70c8a1173359c8f65f34dc72ac2722ecd2c8e63bf286a6eed202fd WHIRLPOOL a35f673129b873a0fac657447905d7662eaa22f3bd80a095d5c440586d116a595dab68136a147f3f50b0019eb1e244a29c8cdff0fb4b8e6698f31920a901f623
+DIST sysstat-11.4.6.tar.xz 344832 SHA256 2bc1d98572169a901868afdf0c56f98580191353ba3bc5c7ce6efd12e7a7fa2e SHA512 50fa1426fde528758dcc3b067f3f52987bf6e09788f81feda9fa5db5286960f7cff9bf832ab8320448904429ee473c444eca25c40c545b875b83b90b9b132439 WHIRLPOOL 16b7e5d69f1bd4f3d2198b9a32f3cb88ff1063df331c9a336947e240789aa7945b34a009a27c69752e4002992718c6e461b52ee36e02b6b7aae361e8a7c79965
+DIST sysstat-11.6.0.tar.xz 468528 SHA256 122172f5730162efd80e74fbbc0eeee8facfe10b30f38fe4b8f0693588474ee4 SHA512 b54af1724777e20df54e9dac97b558abd4f669724234d4a62debbfa2dd5788020683ca8e47f95ea018feefd024abe2f930a91363b35ef490ddf69b7cf2d5df68 WHIRLPOOL bffada8ed40938fb1f67ec894403f2339a7736a2a11a8b14a370b7ab1c8bd0e0e3fbcb4d2e2a3d91916cc348e34848c215b72caa3cad5202eeb723df1c09c7ba
+EBUILD sysstat-11.4.0.ebuild 1945 SHA256 8b4c42c450645fbb9552c64ee24677370ce0c3c954dd76bfc984e15ec9fbe3ad SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c WHIRLPOOL eeb276f07de690091e6627607e3558c1d2e800d3eabff1918e43b58f95a1a36a637d7d5a2999e16e8dea17e4f57c42dfc7a315581834b94775a27b25303ae9bc
+EBUILD sysstat-11.4.5.ebuild 1959 SHA256 ae8a5a91e3e2be0935ccd56159e9c09b6cf8bc10705ae278b61bb8628d3ae0e4 SHA512 fd1743523099869d6ad26dd693c432a68b240af4833174681a902276bac5d8d953c0579ea2f5ccad3122fe83cae4c99a37f3ad5f9e2edb0d54499cbf8b4d7643 WHIRLPOOL 15ef41b0934e5c01217d5f74a58ae37d1c6c7f6c2f473884cccd0bb390685bafd9cb76e67c05eedca0cf7a29e6cee5bdca376e09bd45ba706f0a9e31ee3fb96d
+EBUILD sysstat-11.4.6.ebuild 1959 SHA256 ae8a5a91e3e2be0935ccd56159e9c09b6cf8bc10705ae278b61bb8628d3ae0e4 SHA512 fd1743523099869d6ad26dd693c432a68b240af4833174681a902276bac5d8d953c0579ea2f5ccad3122fe83cae4c99a37f3ad5f9e2edb0d54499cbf8b4d7643 WHIRLPOOL 15ef41b0934e5c01217d5f74a58ae37d1c6c7f6c2f473884cccd0bb390685bafd9cb76e67c05eedca0cf7a29e6cee5bdca376e09bd45ba706f0a9e31ee3fb96d
+EBUILD sysstat-11.6.0.ebuild 1833 SHA256 07ccc378ea215ff4c83a7fc4bf4213cb898c9c58f9e0a15e486a62a54779d918 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b WHIRLPOOL ed6b9fb0f3db56980b001c9c22f3d0b1d70de9f8b7989d3421ca2d11b9a1db86e0f53efdba174e03af097fe036df52a9cc073ec466edbb25c15012326d0d8753
+MISC ChangeLog 8800 SHA256 5a0dd841ec6fbb34ed7a3f70251a92ef2ba1d0d0bd1a60dcefd8636ec5fbb32a SHA512 9bf8efe78cc0fe4d6184abdaa9878780c56d8a02646594f3ebb7dee39a7def233b9264fde4751149a347966522e30112545010a39b125b814575d14e0463aa3c WHIRLPOOL 8430e337e1addb437f672841b11dd6cc95862a975181d7ae7f7930870acad2b956e93ad0760b5afc4dba246ebed56c4d6e8915fadb289de229dc719f69edc0d3
+MISC ChangeLog-2015 37518 SHA256 f020b27cf6b458e9fce1b9cd3294ca030b9a5992df7801e12c23ea3e3e8adb22 SHA512 13251666a2fdd4cf4efb042e997c24d4fc9090c387d75b46ff4d6e29074d9f96a05353903f278319987800c8b130f54962ed49974f3ed68f554bac51543029bd WHIRLPOOL 94424ca038660ae939574de7ea313c6e2c05a26749dcad1d376489567256b272e671d099bdff2de90efd2604782e3060ec85521603eb0868887ec1071eacf05f
+MISC metadata.xml 336 SHA256 128b2d510f79bb699bcfbc65c40ed0f8ffd0e29cdd7d13475e41f77637d26166 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6 WHIRLPOOL b33f41dddcecf3e249345056e094266a0a467ce7dcfa0195be2fecab6854cd61e5facb1cf1c7ef10995360b583da6b3fa1ffd2487e028a89af742de0aec0959b
diff --git a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
new file mode 100644
index 000000000000..402e7d604b1a
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -69,9 +69,8 @@
+ SYSCONFIG_DIR = @SYSCONFIG_DIR@
+
+ # Compiler flags
+-CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes
+ DFLAGS = @DFLAGS@
+-LFLAGS = @STRIP@
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ DFLAGS += $(DFSENSORS)
+
+@@ -154,7 +153,7 @@
+ $(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
+
+ % : %.o
+- $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
++ $(CC) -o $@ $(CFLAGS) $(LFLAGS) $^ $(LIBS)
+
+ all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
+
+@@ -196,7 +195,7 @@
+
+ sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
+
+-sadc: LFLAGS += $(LFSENSORS)
++sadc: LIBS = $(LFSENSORS)
+ sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
+
+ sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
new file mode 100644
index 000000000000..9d047ac6e9fe
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
@@ -0,0 +1,38 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -368,25 +368,19 @@
+ $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
+ ifdef SYSTEMD_UNIT_DIR
+ mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+-else
+- if [ -d /etc/cron.d ]; then \
+- mkdir -p $(DESTDIR)/etc/cron.d; \
+- elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
+- mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
+- fi
+- if [ -d $(INIT_DIR) ]; then \
+- mkdir -p $(DESTDIR)$(INIT_DIR); \
+- elif [ -d $(RC_DIR) ]; then \
++endif
++ifeq ($(INSTALL_CRON),y)
++ mkdir -p $(DESTDIR)/etc/cron.d; \
++ mkdir -p $(DESTDIR)$(INIT_DIR); \
++ if [ -d $(RC_DIR) ]; then \
+ mkdir -p $(DESTDIR)$(RC_DIR); \
+ fi
+ endif
+- if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
+- if [ -d $(DESTDIR)/etc/cron.d ]; then \
+- $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
+- elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
+- $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
+- $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+- fi \
++ if [ -d $(DESTDIR)/etc/cron.d ]; then \
++ $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
++ elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
++ $(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
++ $(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+ fi
+ ifeq ($(COPY_ONLY),n)
+ if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
diff --git a/app-admin/sysstat/files/sysstat.init.d b/app-admin/sysstat/files/sysstat.init.d
new file mode 100644
index 000000000000..4222de28174b
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat.init.d
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use hostname
+}
+
+start() {
+ ebegin "Writing a dummy startup record using sadc (see sadc(8))..."
+ /usr/lib/sa/sa1 --boot
+ eend $?
+}
+
+stop() {
+ ebegin "Cannot stop writing a dummy startup record (see sadc(8))..."
+ eend $?
+}
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
new file mode 100644
index 000000000000..b62be5070572
--- /dev/null
+++ b/app-admin/sysstat/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>jer@gentoo.org</email>
+ <name>Jeroen Roovers</name>
+</maintainer>
+<use>
+ <flag name="isag">Install isag, the Interactive System Activity Graph tool</flag>
+</use>
+</pkgmetadata>
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
new file mode 100644
index 000000000000..34da2f0d0764
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="debug isag nls lm_sensors selinux static"
+
+CDEPEND="
+ isag? (
+ dev-lang/tk:0
+ dev-vcs/rcs
+ sci-visualization/gnuplot
+ )
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+ epatch \
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch \
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable isag install-isag) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_unitdir)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc contrib/sargraph/sargraph
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.4.5.ebuild b/app-admin/sysstat/sysstat-11.4.5.ebuild
new file mode 100644
index 000000000000..74bbea22aec4
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.4.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug isag nls lm_sensors selinux static"
+
+CDEPEND="
+ isag? (
+ dev-lang/tk:0
+ dev-vcs/rcs
+ sci-visualization/gnuplot
+ )
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+
+ default
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable isag install-isag) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc contrib/sargraph/sargraph
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.4.6.ebuild b/app-admin/sysstat/sysstat-11.4.6.ebuild
new file mode 100644
index 000000000000..74bbea22aec4
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.4.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug isag nls lm_sensors selinux static"
+
+CDEPEND="
+ isag? (
+ dev-lang/tk:0
+ dev-vcs/rcs
+ sci-visualization/gnuplot
+ )
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+
+ default
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable isag install-isag) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc contrib/sargraph/sargraph
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.6.0.ebuild b/app-admin/sysstat/sysstat-11.6.0.ebuild
new file mode 100644
index 000000000000..aa17b2d17f98
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.6.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0.4-flags.patch
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+
+ default
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc -r contrib/
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
new file mode 100644
index 000000000000..a84f42591be1
--- /dev/null
+++ b/app-admin/system-config-printer/Manifest
@@ -0,0 +1,5 @@
+DIST system-config-printer-1.4.8.tar.xz 904068 SHA256 9f65e96434819bf4170d654ef5caa945699e48f72bf5ae8c500341409c3db2f9 SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304 WHIRLPOOL 9ade5a1b1cab5eeccfcaa0244e9421efafb0691f4da7925d4fffe80f3b6f7f6d7171d2082f4540606d1c6af8e7929fdd41f18edbee3fe13ad68c620ff18370e1
+EBUILD system-config-printer-1.4.8.ebuild 2593 SHA256 f0c3302932344a78944b4cc8c3b06678551714921faccb613129832f9864f061 SHA512 8534d81c6349e5959d819c38f85a67d29695fc078fe7e2a512ed8042184aa7310cfd6d4225a6341472c0f3e4967ef3921568e41859444362a1d430118d574207 WHIRLPOOL 707c055318f89befec5058b0f3a3becbc796c504df75aa98addd01641d33aa0ab193275cd0ed4de8abd452cb824fb42491617230c4556db4a37f0d36b525daa0
+MISC ChangeLog 2470 SHA256 b2b5d67b126b8e7603508b501c4430799dfc40f6da4d73329e5307e7e0c60638 SHA512 67f6b661e2ee3127e1990e195fb92d2856f15795d9e441711594248bb60350aa4911c29e02b808478ffa084a1b28df9201e19d3adb79365a71f47959aeb54bd4 WHIRLPOOL 58df9301523fec900e64a311657901ec76e25ce62c8909cc3f0b60c28db332369cea8862b5acdab3046913fb72070c6ff1e1e80ba640428d62d3eb2c7160e84d
+MISC ChangeLog-2015 924 SHA256 af0c5a8553634a90f0700f38c8d1db64a3a151cad9409508188acbedaca29d47 SHA512 59a95e742a663783f0517635bd7b4395ac65d098f5056a940284003587124a2d532738fe1322de229140d7592a8a002c7dfe2b570c7070f15a84d8cd3333bb6d WHIRLPOOL 86b9e2e9b8de9573f313cb208ac97c5c76b17ac62afbff712e7a564618541394146bc728493aea92dcbbcdcac9a7139c40963e6d7762c70aeb8635743f5745b4
+MISC metadata.xml 463 SHA256 70d7c2d00b93e080e5554d90e2df3b0b1cce7b288f8527b0c3f2cbd6f0ac3237 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533 WHIRLPOOL f2abf339877be339e5bb0494ae6a7038d31fcb7ae80c058785ff420d91774083e0fe6d219ddbe93b49f3e9eeb85a7dcc9d8153cf55cccdaeace37d1cc4b1652a
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
new file mode 100644
index 000000000000..ef7c43f6f08a
--- /dev/null
+++ b/app-admin/system-config-printer/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>reavertm@gentoo.org</email>
+ <name>Maciej Mrozowski</name>
+</maintainer>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
new file mode 100644
index 000000000000..5ed82d665477
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 systemd versionator
+
+MY_V="$(get_version_component_range 1-2)"
+
+DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
+HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
+SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+SLOT="0"
+
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2:2
+ dev-libs/libxml2[python,${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ >=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ net-print/cups[dbus]
+ virtual/libusb:1
+ >=virtual/udev-172
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libnotify[introspection]
+ x11-libs/pango[introspection]
+ gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+ policykit? ( >=sys-auth/polkit-0.104-r1 )
+ !app-admin/system-config-printer-common
+ !app-admin/system-config-printer-gnome
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=app-text/xmlto-0.0.22
+ dev-util/desktop-file-utils
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+"
+
+APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
+he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
+pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
+for X in ${APP_LINGUAS}; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+# Bug 471472
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myconf
+
+ # Disable installation of translations when LINGUAS not chosen
+ if [[ -z "${LINGUAS}" ]]; then
+ myconf="${myconf} --disable-nls"
+ else
+ myconf="${myconf} --enable-nls"
+ fi
+
+ gnome2_src_configure \
+ --with-desktop-vendor=Gentoo \
+ --with-udev-rules \
+ $(systemd_with_unitdir) \
+ ${myconf}
+}
+
+src_compile() {
+ gnome2_src_compile
+ use doc && emake html
+}
+
+src_install() {
+ gnome2_src_install
+ use doc && dohtml -r html/
+ python_fix_shebang "${ED}"
+}
diff --git a/app-admin/system-tools-backends/Manifest b/app-admin/system-tools-backends/Manifest
new file mode 100644
index 000000000000..1c98c56f55fb
--- /dev/null
+++ b/app-admin/system-tools-backends/Manifest
@@ -0,0 +1,8 @@
+AUX stb.rc 418 SHA256 6276d25419fcb4921dd64649c34f9a1a8be2332bc27e4fe0ab7736e6fa58a9b7 SHA512 847f19a82ae1e2d6f0c6be1ed77c46033bba1e85b99ac3764afd285f0192f09cf5928a6214ef4266c96255c35fd902148c5f068ce914898354476636cd10646c WHIRLPOOL 7fc19ed2cbc812f28aa72076c324b5430c33f1c543574ea238397243216b84555cb4d70b26364fdcb3ec996de062bfffd17f59ec2574d8f544128e22f72c8743
+AUX system-tools-backends-2.8.2-cve-2008-4311.patch 1984 SHA256 d7ef2a15e67cd9887ad41b75f5c545f63bf5a7cd8ef8ff1bab623182039dcd4b SHA512 ec8d2f526ad16f286aeef6d521ae3f2909676b846ad2a715d23c5a30b02f0608e42d550691e0e07493d70d1141093dc59c36a55afa82032c6d28e128ab1fd49b WHIRLPOOL 1e9d7d9c23872a1268363112cb217f2bd2db4253613dc409aab869e314d6f44eee25342cf9f9331f06ad72163205d0f97a364cbb630bb156f5d9357ad6b89abe
+AUX system-tools-backends-2.8.2-default-permissions.patch 945 SHA256 f2752d877938d70805d31adf113c05ce45b62255cd195c4c74abe93695ec08c6 SHA512 0225f2825928c123cde5781d8d34c64e71ac6c4349e7440bc4e37cbbaaa99b55ca86f14459477a0a4ab3bd60625f95427d3779bd167d10f721a2b2c4ca9a20ae WHIRLPOOL 7d6a1d0591c15e9e06a5023d91715cbfe2e29eaa23b849a2693732529b76233b5e0ef2e43ce4ac06a279357ae00b051ca733b21d8091db1e81c75424766646db
+DIST system-tools-backends-2.10.2.tar.bz2 448939 SHA256 1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670 SHA512 9ee3e0643122740493265e532350fed9056334de0ea3d6656daa1d42b97f76f0f85024ac87e732fe5122a1e31ad009a1d2f119720081673a06696b81452fb990 WHIRLPOOL 2357ca2249b8f7c7ce3fc7ffcb4c49bcd83040d77910bbb1ce19e47750da999e6d359689d14c284a84b421287d5a8d3d183fc1debd0b119aa520dd125ca1a599
+EBUILD system-tools-backends-2.10.2.ebuild 1460 SHA256 9e86fb282e2afebdb09128e7d4b536077ab51c5e030648b8df0918a1f5de785a SHA512 487b2d0918986e8b35a6af7065d27fbed62b9a0e05fb72e82c96124cb169f6d07fe162fb2374ec781e2fe3d2bf21cd5c98ad6f88491a292bf4e4f66df4e4e115 WHIRLPOOL 675361872aa3483f79618f170bca94576fa4ffdf16cc50629f8ee5238001d0464a0ab5a32347329367c03ae9779ab8739aa64ae66d83f7357e30fecb252fcd36
+MISC ChangeLog 3049 SHA256 686ec0329faf9fae0df729a1c4f6f50f8331874c29dca1bd75b97092174d62be SHA512 fbd3023ccbba593643289c915a6955ec2e6090249082b449ed83bb6ba2c492679c64935dc97dea81823ad7e01acdd422f5f6e1781cb933820cc4a3712c609815 WHIRLPOOL d287753872fe1c9feae12534c932acf285e1507a25895f86b991ab88a78ae6cf7635c4f7c8ea7336e394b8e0d3a242199783b201291a7d656fc5714969a0d983
+MISC ChangeLog-2015 14221 SHA256 0784840116b2af74fdc1897d16ff9824993cdbf6b62edcab8cd8ae1a93d02f5f SHA512 56a68622edaf62a8471335ee8e5b9bcc1819a49874c656a96aa849cafa2462d752c29b08b5dab57d8c8985394310cc50c8be42d4d3c2a6395a70cc36a700dc3b WHIRLPOOL b73e05685b1d7da51e8056b9bc97176f57d541c579e5984fb3f2d1712c31d7250e32e7e342556e895683cea596081ccdd61922313b63b4c390ef7f7a6af284fd
+MISC metadata.xml 505 SHA256 adac11b9b131306055e8c9b43dcf83842f30de557710fa09864ccd2dd8057bfb SHA512 e3d52afec42d48a68f30802c50b3e7cb033100acd041706b1bbba6b6168c7dc1b2720a20a346a974acd2b82c530e41868d3bc49f89c1a469ba38e372e459e397 WHIRLPOOL eaa049120409fe4bdaf3b8b0c576fbcc3a9712bbeb4ef8c6990452b565d89900bf7db4e937993f2f8432fd764afe55f0ec3eebcd1624355da10d397b46393c88
diff --git a/app-admin/system-tools-backends/files/stb.rc b/app-admin/system-tools-backends/files/stb.rc
new file mode 100644
index 000000000000..814f0d359570
--- /dev/null
+++ b/app-admin/system-tools-backends/files/stb.rc
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need dbus
+}
+
+start() {
+ ebegin "Starting system-tools-backend"
+ start-stop-daemon --start --exec /usr/sbin/system-tools-backends -- -D
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping system-tools-backend"
+ start-stop-daemon --stop --pidfile /var/run/system-tools-backends.pid
+ eend $?
+}
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
new file mode 100644
index 000000000000..47f93da74f16
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
@@ -0,0 +1,47 @@
+From 544d679c2796602ff277e78e238abd56d30ad633 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:58 +0100
+Subject: [PATCH 3/4] Gentoo: fix CVE-2008-4311
+
+commit fd648907e46017d46c367f59c62d0b0395830903
+Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Date: 2009-01-04 19:35:51 +0000
+
+ Allow root to send messages to all the system tools backends, so
+ they work even when CVE-2008-4311 has been fixed.
+
+ Also disallow normal user access by destination, not by
+ interface (fd.o #18961).
+---
+ org.freedesktop.SystemToolsBackends.conf | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index 58972ee..537ef73 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -22,8 +22,10 @@
+ <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
+ -->
+
+- <!-- Only allow talking to the dispatcher -->
+- <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++ <!-- configuration modules can't be accessed directly... -->
++ <deny send_destination="org.freedesktop.SystemToolsBackends"/>
++ <deny send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
++ <deny send_destination="org.freedesktop.SystemToolsBackends"/>
+ </policy>
+
+ <policy user="0">
+@@ -45,8 +47,6 @@
+
+ <!-- be able to speak to configuration modules,
+ so any message to them has to go through the dispatcher -->
+- <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+- <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
+ <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+ <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
+ <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
+--
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
new file mode 100644
index 000000000000..bc58ba4fb1f9
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
@@ -0,0 +1,25 @@
+From ea88120dac8ba2c2dabf4c393c283f69b3d33b5a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:15 +0100
+Subject: [PATCH 2/4] Gentoo: restrict access to stb to users in stb-admin group
+
+---
+ org.freedesktop.SystemToolsBackends.conf | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index d031525..58972ee 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -60,4 +60,8 @@
+ <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
+ <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
+ </policy>
++ <policy group="stb-admin">
++ <!-- be able to speak to the dispatcher -->
++ <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++ </policy>
+ </busconfig>
+--
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
new file mode 100644
index 000000000000..a8fccb3731a6
--- /dev/null
+++ b/app-admin/system-tools-backends/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>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+</maintainer>
+<longdescription lang="en">
+The System Tools Backends are a set of cross-platform modules for Linux,
+FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
+interface to all distros for modifying or reading the system configuration.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
new file mode 100644
index 000000000000..436bb9c06c14
--- /dev/null
+++ b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 readme.gentoo user
+
+DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
+HOMEPAGE="https://projects.gnome.org/gst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+ !<app-admin/gnome-system-tools-1.1.91
+ >=sys-apps/dbus-1.1.2
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.15.2:2
+ >=dev-perl/Net-DBus-0.33.4
+ dev-lang/perl
+ >=sys-auth/polkit-0.94
+ userland_GNU? ( virtual/shadow )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to add yourself to the group stb-admin and
+add system-tools-backends to the default runlevel.
+You can do this as root like so:
+# rc-update add system-tools-backends default
+"
+
+pkg_setup() {
+ enewgroup stb-admin
+}
+
+src_prepare() {
+ # Change default permission, only people in stb-admin is allowed
+ # to speak to the dispatcher.
+ epatch "${FILESDIR}/${PN}-2.8.2-default-permissions.patch"
+
+ # Apply fix from ubuntu for CVE 2008 4311
+ epatch "${FILESDIR}/${PN}-2.8.2-cve-2008-4311.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --localstatedir=/var
+}
+
+src_install() {
+ gnome2_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/systemdgenie/Manifest b/app-admin/systemdgenie/Manifest
new file mode 100644
index 000000000000..973d8568e3c6
--- /dev/null
+++ b/app-admin/systemdgenie/Manifest
@@ -0,0 +1,3 @@
+DIST systemdgenie-0.99.0.tar.xz 29104 SHA256 22ebd9d6da7f03399603e21e3e21d69cbe87ec49695d12a15e9dda6b23703f25 SHA512 9600ffa05737bbf8d7deaece3fc78392dbb4228aa2f001ca3e34fb6390c1a9104884f61eec90ae204550a8cee0281b92f34f64652f9881967430fb695f6bb3f4 WHIRLPOOL 57413b314edcdf4600bb644f0ffd9617580258f94f7250875ec317bc1e9faf19b1f35dfd8c110497d94396fb0a2cf7be88407ecc98fef37586f5a258eecf01d1
+EBUILD systemdgenie-0.99.0.ebuild 730 SHA256 88e531cbd601be4915ddba49269a4b1282e81b3a1ae5040828578a5e3d0c0724 SHA512 3b92b9c57e85c4aa6fc121c1a31d49ca68ea7650e581d43af67a416c5a06c6410df4b4a23f711651e04c6fef5a055ef0a930d4c530aab7c3edd4d853e4acc6d4 WHIRLPOOL 80687b87e4ca7a24a0d51788c4bda65cdd798d4970d1871ba50d2c55cbeb6f8d8838ddeb8244aff9df9465dbbe45d585b9c15802a578d1feebc7d7c6411fa946
+MISC metadata.xml 686 SHA256 4b1193f4539c407c6eb930ceeecc0e87382863c1d738b5e1acf319b0f692b7d6 SHA512 cf49cfa73a7798aa4a5c568df4afc5fdf3d66c43b9df5569ae38f4d590aefe6161e78e8314be92dbd4366d1413258a6a55c24e9783f1df870ad27a2f2c87cb9d WHIRLPOOL 3e79f6e1c4489009cbaacc5262661ffd1196bf00bad10439948edb45d3fffbd33b13c406c1ca56eb818c0d43533e551a2315f08bba2ae14a2c6fe4e9f5f6b358
diff --git a/app-admin/systemdgenie/metadata.xml b/app-admin/systemdgenie/metadata.xml
new file mode 100644
index 000000000000..11abdb5d1f9d
--- /dev/null
+++ b/app-admin/systemdgenie/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>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ systemd management utility based on KDE technologies. Tt provides a graphical frontend for the systemd daemon, which allows for viewing and controlling systemd units, logind sessions as well as easy modification of configuration and unit files.
+ </longdescription>
+ <upstream>
+ <maintainer status="active">
+ <email>rthomsen6@gmail.com</email>
+ <name>Ragnar Thomsen</name>
+ </maintainer>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
new file mode 100644
index 000000000000..3d6e2edbee3d
--- /dev/null
+++ b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="systemd managment utility"
+HOMEPAGE="https://cgit.kde.org/systemdgenie.git"
+LICENSE="GPL-2+"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ sys-apps/systemd
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
new file mode 100644
index 000000000000..4261ac342da9
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -0,0 +1,63 @@
+DIST systemrescuecd-x86-4.4.1.iso 413272064 SHA256 358253bf8d88b10be49f5485bf00e6cffea4f38ce635fe0d9f798803edf53d9e SHA512 5c5045df219181064201dda195961096da9722d3d5758dcb111c2c74ed083b3464f314340c01a5a27a920c33bd5bc95efee2efa1edc2405a0d11d9bc67e4b2a5 WHIRLPOOL b834a7a985a85909e9f99441407df78a06ee2c508e3d2020c5c4045cf35e3462f0fba58b888d150f22c0d23daf0d866d4fa93ba4bb6252ab7b502c390824e6ef
+DIST systemrescuecd-x86-4.5.0.iso 439603200 SHA256 47279ea1bd1f904fd7973a88ad74e749d46e6fbca4e9a8fc0fc110d4181721f9 SHA512 e821876cb6f58d5eaeba35c91c60503e81c04c50b3c496e4144c8dc459c6e78aece9b7e7a3ca35ce427e0965c197758b2267909bcdf95f6a19221898fdbc91b2 WHIRLPOOL 3d7ab635ca5dcb2d13d02d5597905434d11da8d441e132d2baae795dcccd42f706d0eaef1f266b1f4a8dea4242bfa225291d8d7f793e619f4fb26f9144c8bc0f
+DIST systemrescuecd-x86-4.5.1.iso 443541504 SHA256 4fda2fce55a46c7b258fba10c88a4a337821c8b801a8cd3c344cc223a9c4436d SHA512 561fa30404a7a41a1fcb0cc24c1a5eea407de1c2d2f1bd5273e2acd471986ab8587df9f9b3ff364617f81a351cdedd12c6859b53b1f7e430867c654fd136a524 WHIRLPOOL d266518c6898f9163341eaa671ce8367ea2e836e959806e65095e8de34d72cefaec576a640fcca53811b01bfd4e45b6d69a8a3da6191dca320709b542fd9ff3d
+DIST systemrescuecd-x86-4.5.2.iso 456060928 SHA256 e8805433699acd7b6df38ff893eddad8c6f287a09cc34be3f6fef46d3e5056c4 SHA512 b27223b08032f0132f81204a244638262cf70348a1a299e5bf63971db556d604e52d8c3408e3943c305eac887c2e38ed6d2b1488633595c9f8c1cc087162f911 WHIRLPOOL 0c304b5622e0079746128832133b7f554b8dd6536b447d399da150539c6425ed6ec6aaaef4d3d034ff9a6e814812f9f0ac3383b07f83f13ede9e00d917f2ad5b
+DIST systemrescuecd-x86-4.5.3.iso 458467328 SHA256 16aadc8bef95a0f409a7865054e8597b1001d815b22d976556c103379ea6aba3 SHA512 14774e9a882d5a505532ab8bee85e81867f5d30674df471eb76cae84678eae00fa3992c894b6c90b85c7eaa20bdc04ffe910a7a432092faf3329c08bf54eff49 WHIRLPOOL 7fa6a4e708453bc149d50b56fc05e77ed0d14a6ebab0c939f4e33d92ccbf2409de0da1154425f633e7e4415a3de7f9dc705131259e290b5a40b51f4f43b0f7dd
+DIST systemrescuecd-x86-4.5.4.iso 459102208 SHA256 333827d5375cbb9bb201aa2c36871d941e78eeb66652c18c76664154a30eb9a4 SHA512 c32904413516af917de3d58b8eaf3b5701b9c49b1249daf1f8eca060497d5278fedbb0c0d86907bf94ddeab716dc8bf014e0baed0aee66141e8967207805d446 WHIRLPOOL 75c46f12dd92b093e4194e3b67ca020aefc43a3d9e27d94088a2c2f7f0ccad5cd44f7d7fbec4185956756fc3a3bf8845a82ab7a3d171c6ce3d8672f76e9c46e0
+DIST systemrescuecd-x86-4.6.0.iso 467294208 SHA256 cdf1db091a7d963e3395f4d9b90f40b2b0b939c99ae9138178d5abc6dfa31e0f SHA512 f90d46adb8ab19b19eae589744808bcbd50aa0b0eac22eca92a09e8407c77e7a2bf573c2c72b37f497a9d287c90b20164b213bf007b538063f758b12b1da11eb WHIRLPOOL f6f8a674d3971309361997b2c5a06ddcec15bbdf069a5177dab3a0701c95f55723bcd835f8e3bac0e5b756d9a5115f4828ceac0af7edef903af16ece0c24e81a
+DIST systemrescuecd-x86-4.6.1.iso 470530048 SHA256 5812ea8198831b15db9ab37e772524a047c5750a9ee79789bcb4f77e117bf4d5 SHA512 3ae7c4f3f2196190c8bac44da35878450ef5455240e10f5bf2063a28f0f1c59d35458c7db42a3324e8b963a9e8b250a1b54ffa85e5cb6cf27c9e94ae1fb593d3 WHIRLPOOL fc389a182b2942efea89da1fc088c6d38e2c3a8df35d6012e3a3d560b3022866fed169dea2249f3d236cb1e559fe3bb44ec15c78a7740e93c843cebcaaf6dd5e
+DIST systemrescuecd-x86-4.7.0.iso 479350784 SHA256 79de1d6f41dc195a247a15ef95f610b968a955b2892939326f58440284f481bb SHA512 c0246dd558186d3436666ef6509eacb2abed82a3205e47eb00b0fa0e98cafbfd6dd8880e83bb7e98b2b019b6f1a0797abcb26c5101eed265a83c37139085dc1d WHIRLPOOL 8f4cfb37dfe0ac7a788aff1d488b7c41dc34315aacbd0cf25ba2cc48824c77be748d8f5228f2b2fa92271f7d5e4e20d6207f7ae80e394111845be7d1fe133348
+DIST systemrescuecd-x86-4.7.1.iso 481220608 SHA256 3d99953b14788c5b50d72083c7cc72d3edecb440077c71edd108fd90aef86505 SHA512 13114a4e4616dfb8f118c07724fcca1fe9dd739a7c2dd8f5553f48dbaa744fe6d211cf6f341159b4ffda090f0101bd96f72d3e11c7c8c77a33a888d3c2859a6c WHIRLPOOL 4494cbb7095d8447928400b7882b458c0be2552462fd64250dffee189f7dc60db4e5978e33eb34ed505d97c8964713241c0676e931ec3570358a87bedad853a6
+DIST systemrescuecd-x86-4.7.2.iso 482217984 SHA256 b0a3333c091ec2f4658e2a150305053a2cf50c63b217465cd504559dee4447a7 SHA512 2340facff40d8f7eaebf75bba771333d21e8951384c34b04dcc5734de3c18e0c8e50e5cc35b93ab91df48f2ba9dc51ebe97a820fdb322d9f169df7067d6a92d6 WHIRLPOOL 3bdbd296a5cee2dc6cd47313bc70c95b65dd4d198cc67907c3215e181b2ffc3366a3fce49561650ce70d9d732a646b039265543da065702c1e6894219d1a438a
+DIST systemrescuecd-x86-4.7.3.iso 482799616 SHA256 f3a30a11ade9c5dd631522a9bfad4b2d5b7e5b14d9ba65ec94d1cf441635bc7a SHA512 42331496283b981661861e49448b17b0a4fd202f38024990a5aaf2572f300016e67f86ec3ec82adb4dc337a5275da858bf80fbb6a49886682298ffcea6c0d1f0 WHIRLPOOL 6f0ef187624b4a7da11e0a1f7d822ef964889c37bf5b66263ac3ccc83fba3b654c1d67a9831925608ecc20eeb42a40be5b3fc37fdcaedf06e4de30d1db7d7f2a
+DIST systemrescuecd-x86-4.8.0.iso 488042496 SHA256 06e6847384063bbb67c1c8f0824e995046c9ff125ad07a4214b129efb9b18241 SHA512 bfd3142149a9155e35d1add271265ae54074bfe2a8f658ca366dfdecfa893b683adb6206f11738d972df98cf7026c893d17ecebf8635c3cd5cd38cfd4c0b2e0e WHIRLPOOL 93959e6c55b30c696d82e62d48ea54cdc67f1b8c2951d4a895ebd6d526802ddce21795f4fb787b62f830c10ff549d55360217ce609df9bc486bbf6dd6886d287
+DIST systemrescuecd-x86-4.8.1.iso 483315712 SHA256 144cc9e936c5fa9d11232ac4d1717a8d0ae4b95a2b5f9c8548afab6fbe9cfbd2 SHA512 0424fab36e2caf7e3e9dd7c334d57b7eb9a090e3d79c52ea8e003e05931558b48be5375ac49eaaa78141d179d7153c91c386a42d7ead8d56ef3113363b8ff692 WHIRLPOOL 5ded246b624cad86fa93c244e5b53f6edd28ddc8909c53fcfc8049de47a68a0811a4e83d78d94a95df559bdb99bfc22ef59d3b68326791199cdfe1b414ac6135
+DIST systemrescuecd-x86-4.8.2.iso 497338368 SHA256 0daf5602899ae41f419fc7027f8f77b2c96a3e2a7d923acf65761619dc6c54d8 SHA512 6467e383382edcd4a92aae60404b0f1451f6941c147dd911296f911a001d0002546d1fe4d4f49dc1eafc688aa53eaa07948b6f7f388fc87830ec1c58093b1135 WHIRLPOOL 4b2ac5f344abcd8974a30e092829ee4d9e32a7fe71aa7f598524394199f705b314ff535464dd31a4074dc3d9a0297fd7e583ef62b2bf8c1f262dd4a78d031229
+DIST systemrescuecd-x86-4.8.3.iso 498751488 SHA256 1a4a1d35e32a812f42415596695e4dec9f50781c251d034579a45df1e9049e3e SHA512 6111ad0b238ece75bef707f40668f6e7d039eeee4e89acf6e975e07ce6084f7d00da3c24e3271d3d75a504849e1799d1155691a0d6f5f1dd82966a41b7f5ec04 WHIRLPOOL e971b64aac87c40debe0c243c25585c6a6471680330c65b7ea5cae822c2d6d6923923e83c2b01355f0ea6a3d3fadac6980f8ba058f5f9ea398061ca1737af661
+DIST systemrescuecd-x86-4.9.0.iso 504498176 SHA256 1e84a298fd156826fc0a066f559b894bb89d6ab1ff13594233d7aa3499157de7 SHA512 04c89f0140245992aac2659b2b0114ae2961bd382ca302a70fe8dc2348286099601011b16c339cb95ca13345aaed94749272a61f86223dec30cb31328565665b WHIRLPOOL 0734747c4546f367b110688282be293e768cfdd1fb0bb1ff405c1cee4b4bd42c8f2f59639a417513fe0dd28b01dfa67db38641ebe95c07af0a6839089230e8ff
+DIST systemrescuecd-x86-4.9.1.iso 513009664 SHA256 d6ad5d97b676fa224bae172fbd2681d207f62031e8597e46dd2e97e0751368db SHA512 ac4c2bc65611a575c2f4d12012e9bcaf8bd94283aa8d8c0ad571352b8f33161dded68de091839c9d8a4d5101a2413864838596eed1aedcf20d9441dd59f96dfa WHIRLPOOL 123af2cc99388add86681acb3b6377275b906ccba8163b4be97f8b049ff29460c0015681a042e4d1fa1c3b134a3da1c6cb610b4873ca050200dd0f997f94a503
+DIST systemrescuecd-x86-4.9.2.iso 512159744 SHA256 40c028b4ae2f8289f8113533fdfdfeae17d998fbd7d5c284a5d21c6774d871fe SHA512 2d99c0e432ecf5b5635d597d6899518c6ee03bb79911d992d22bda993d38376028407c98ba15f9510c8723c5fba6bf8f0958574542c6035e7cce4c5096ad0a18 WHIRLPOOL 7a1a26a8a60a39217d934a59ba96eec281e197021d8f639c1950f5eb35c7916c7eebf56a5fc09d9dea6de05724faa6ea6bb1543db1934e65665374900a062e1c
+DIST systemrescuecd-x86-4.9.3.iso 515739648 SHA256 47c87b4ebebb9a3739d3434bf1cc8939d692182e39f0768e45b22ed1c8ba0382 SHA512 d60b3ba1548c98faba24e2c56ffe70be2e271b0946d2dde46cf766e6f206881f1e0450998af05c439f37edbcac67f0649830914c4354c2212518f63faa140254 WHIRLPOOL c67bb66ad0023dde57c1e1a6081de21671a49c8533cfbc9847886a1bac8321b8d80e331d94d27460918c89a193c57ae1c1078426aac0e42db7934c2005b1f7d4
+DIST systemrescuecd-x86-4.9.4.iso 516374528 SHA256 274319bd2c43b54bb901fed4e1cc07895baaaec1b94e5ddfe0443ae5dc114367 SHA512 7bfe963e7ec04f18efbeac5d40a016b56ae7bc8fe8913d8cfd0ea9fbe0f3833d2b86d1a00f30f6587b91338416884af6a65249121609ce2f58a6efa50486e139 WHIRLPOOL 97e94fd6b7bf178e4113226927832ba8b8d809bc2fc0f80fab1468487af7282bd972eebbcec8cf80dfe319affeee3ccfb9dfd1afa6db3bf746b301065f408fcd
+DIST systemrescuecd-x86-4.9.5.iso 520032256 SHA256 ffe944b6c74ca5da16396d4c647eaf5e392cf9a7cae46627a93b43d8ae272aea SHA512 6f9a3497c809c8cf1dcec114221d5d992fa2735b3fa1cc992e46a8e9c793ef7019c37c4a61f8abddafbac0cf7ce03c6fc9a3a2a750d7a82e69db3bdc6791e7fc WHIRLPOOL 087dc72dc264c04a982763f2824620ebc793a4b844b4dd53dedbc31c00c669fc50c08697704afbe0f60b5b060de4a143843423a84e27d9c56e5fdea11819d143
+DIST systemrescuecd-x86-4.9.6.iso 566126592 SHA256 345600159383a70cfd6dd8c32831ca6296610f95d3487e471e34c49721cfb1e8 SHA512 89f6fdc89f91e515d2d84543998ce2c4629c88d290d4aa16f9ad42e194ad7720ec02155a30e19a4744e5d68db0bb476fc86cafe64ec9eb62ff809c32504841b5 WHIRLPOOL 6452efa46721aabd53ebdd9d4506eeb28618481cf04858995bba2e78c4780019217575f5187b4e104e39b476da718359e3d229b4648bdcc3258f31b3a06a8b78
+DIST systemrescuecd-x86-5.0.0.iso 484790272 SHA256 0f04739b9a4c5b3174e4ffe462e23f8b700f9fdff37c75b64e7913b768bd9427 SHA512 67e442f229c55d16a13a46619134afee14fd7cf71e9d5e3d6f54a7b2ce3646e9ff89a17605c05f7a255b251c3bc56004aa9a59bd06f3ed69f7f4b9057ea6ea6c WHIRLPOOL 67b5ccec685746845361aa710e936aa6c693e08cd514283ad4805b44c385de19f5d3ba45cc349ae4b284c28046919ff8cd117a7f458a52fd488a2860f97359b4
+DIST systemrescuecd-x86-5.0.1.iso 485711872 SHA256 17f56dc7779d3716539a39a312ddb07d27f2cb1aa55b12420960bd67b00f6c9f SHA512 b18663574e54f1b6b5a147aa947d8faa4ad7eff7d756e8c3cee5397fdf3ac97c1c907f65a61403b2f0a7583fb9ad0fb74c920a8040365f6caad649371deeb1c4 WHIRLPOOL c33d81ebcec3d5f6744c7a8ccb5d33ae1b1847e31fcf43f66bfa4fdfdeeb226950562665f2a8b41d67c6077ec9cbea62ec8836135b3c391865f4171e147cc04a
+DIST systemrescuecd-x86-5.0.2.iso 495773696 SHA256 a2abdaf5750b09886cedcc5233d91ad3d1083e10380e555c7ca50849befbf487 SHA512 eaf5c080fbf810c0f966335c1f2f797f8e756c03a6246c8f2e2dd13637a66a160fd0d966095849d16b94664bf973bb9064e1f9f91785f0fd51372820c90b905f WHIRLPOOL 1b2cef05c0d8dff99757cfcf15c21ca3de42d6a5d41ec876bd4196af7f44209387b695e0e75ea03b00f1615be9a7b2c94eb41c1a72326c0c67df1e4129db4362
+DIST systemrescuecd-x86-5.0.3.iso 501446656 SHA256 e892d3e0aeabec2c435484f0a6913d56b5cc4505e61032bd86f39443e3ab162e SHA512 a6748224f3f8cac5f9751648278bbc06acfc123c64b7c0a3b6e47f00b0a3c255082e9ffc43fd0fd3df26322cf154797ea6a02c6b37087ae832219ec4f3bec673 WHIRLPOOL 3f197342689fa764bf66b269f3afd1213774cba16b04b3bcb45d408f2e650e503499303120bb233f3b15c4e254953f703c2b042ae1cfcbe0f1119330562952c0
+DIST systemrescuecd-x86-5.0.4.iso 501141504 SHA256 3b38c15ec8e2f60348181423b0f445856c8b290aac96e92210f316652d621507 SHA512 26b624c75f75e181051b164b0a1f24b612d9ac11c2ed8df3e40fd13e48bfa58022be814e4ac608f3fde892eaa99954f10c0e1fb1ef4831a501dc4e1c0c87b764 WHIRLPOOL 8a372a13edf76d31d44dfe1167216d2b89b3b75ac7437397341bb7e721b31336cbcedda05f087a0d061ca25b5cb95acd252fa042ce6639852c8795568a4ca128
+DIST systemrescuecd-x86-5.1.0.iso 505047040 SHA256 49466daab472d29fbbd38ac7d4d36363ecd73e27f7872dde1d67e62e190920d0 SHA512 15d019bbb91019f1b6d1847fc786e6c02f3f768826241e0823842bca9745ff1fa48fe7d32828f899b90845b2f4ce948a1f98e093edf8ca4c0c39cc0da72b4aa8 WHIRLPOOL 5bc909b4c2eea8ffb58f574b120ba07f53361cb4ff2782f214947f5dbccb0f33bc4168ea8a832ba65ebb56a6ea9fb08437af060ec793c6f07c33236bef0f825f
+DIST systemrescuecd-x86-5.1.1.iso 517359616 SHA256 5ab22119f2ca2e53d28880367e53b887df5cd82599b38d3175870d023455117a SHA512 a4063305da50ea8b73fb7157f46bf386b80d3ef777adabdcdd944814c801d078fe63778f166b80788b0851549b35bf6ada5940ca5a40a6c1a3e0f4c66efbea91 WHIRLPOOL e49d64915f487c31efc3ecd590965b4fe94b1a65b7c0261f1ccb4d2b0dc4336885398f2d021a670ec0041a3e3ba1d6c1cc524b1db95d1d7e3c6371f3806ca78d
+EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.5.2.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.5.3.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.5.4.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.6.0.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.6.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.7.0.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.7.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.7.2.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.7.3.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.8.0.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.8.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.8.2.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.8.3.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.9.0.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.9.1.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.9.2.ebuild 1590 SHA256 af2c6128295d05d4b90d101ea2ac4dbb280222288c9053b516d79566c096f375 SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860 WHIRLPOOL 4f7bf3100e538ef88674d7649c44affad45f972e08b09d394827a14aab32893e3418f675b6edc0821491d77aaac8d5f8bda072d92fbe4c7cebb11ac119ae3e15
+EBUILD systemrescuecd-x86-4.9.3.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-4.9.4.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-4.9.5.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-4.9.6.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.0.0.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.0.1.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.0.2.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.0.3.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.0.4.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.1.0.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+EBUILD systemrescuecd-x86-5.1.1.ebuild 1590 SHA256 990238e76a41a6d088e850df397bc25369bd78b45d269bb392895b851761ee12 SHA512 24cbac4ee85b17de9750c9a397ff196fc0e4694d5535dccefe6eeeb12762482bd6b957eab6f1de1a2ca301eaf48e423bad0e74a83a02033f5b42baf20f68399c WHIRLPOOL 38d096701f6ba10e5ee910d982f1267e52255afa2db321589ca6de9501d3c72b6e85c69400aa0648c349f15de6b44da79061a05a1ed1af35d8f5ad183875a2e6
+MISC ChangeLog 5639 SHA256 108cef8cc47b86855c74cd4ab587b487207c21c7cedb41ba2091e79c715932a0 SHA512 bce79e7a6c1f7551be700ddc16a4463254e8a1096f6d9f777d21681438f989707643d89bfe11bd85a6ac8d1225e952c39364eec9fba35264f2b8f2ce6d3bd664 WHIRLPOOL d9d474cf7d770118a545822c5093c82d3cdb72de07b9c55c00c3e0c05d68eafa8258168c3e2f950e4b25cab759f35e6371f85ac6272d6eb71d7adc270dfcd891
+MISC ChangeLog-2015 1436 SHA256 c9ac22d03927140dff0f6c9c7c932e7f1f29371548464599355f219194e56ac7 SHA512 bccd393af9c3951b9c8971ec773e582fd3581a255123e8363b759289fc13737305025e503cc78d15b4dd099ef2604c73811dc746994d937a5cc20c091f48b872 WHIRLPOOL d1910d0a14b2a4c62bfe2c581cb5ff5f6c72f92a81d5dc1b26801bc5a4505677d8bd7eb5c022c04fb5b3eb5ffa6964bd96cfbbdd48a6d1f0dd5848e016cb9e8b
+MISC metadata.xml 585 SHA256 b9e26d1bd95212e210c60a13ac61f5153d3ef71fa4ea4f6abf76bc44e537c76e SHA512 51a7820398c4c637017c4a38bc0cd7b8b157e5dca57af0495a05c3df0bf09662287954bc04b24995585e8ecf3ff510177561db4dae3fadc64490d184319c18b6 WHIRLPOOL 0c543bb1936815629ac3441424227bcad9e1620524f9002adf29ddf50fd476cc0222e1d6fdbc4d2d4edfdb03382186a90282ef62da89563258ffb93487250460
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
new file mode 100644
index 000000000000..5297bd0ea616
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/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>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <use>
+ <flag name="isohybrid">
+ Pass downloaded images through isohybrid in order to make it
+ possible to copy them directly to USB media and boot (requires
+ <pkg>sys-boot/syslinux</pkg> at build time).
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">systemrescuecd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
new file mode 100644
index 000000000000..cce5e34e9e34
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.0.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
new file mode 100644
index 000000000000..a15aecbe41c4
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+# Large ISO mirroring explicitly approved by infra in bug #588766
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
new file mode 100644
index 000000000000..e155b8f97a84
--- /dev/null
+++ b/app-admin/tenshi/Manifest
@@ -0,0 +1,14 @@
+AUX tenshi-create-mandir.patch 400 SHA256 8491ddb878481136c755718a42d172d67527df8cffac0723d89b5750e0a33c9e SHA512 62c1a221a4c4c80ad74a1fb7d3204c9e2452f7f70dc690d018a4da9f6d73877ef78c20ae5b934a2251194c7088e7c0f09af045fa4ac1708a7de78004e1208b35 WHIRLPOOL 372a6043d0b375ba4cb4ce9e1238419816592d3bfc94760ae7aab3d826a90a00bf061d5352b3841acde763eda98692938f48e1138d4b19b1f9b674d128a6b917
+AUX tenshi-openrc-init-r1.patch 251 SHA256 6cc1b6dc25960470b4c10d6151d918da693b5a37b2d36a3691e7da31f476ed7a SHA512 8f40208c01ad67914e6e81e5c4ee520a26c7f1347a0d17778c0671f6f2edb66b0320dac0add74b910ee9df8e0400837c338c66f0934040bc44195e701e8ac675 WHIRLPOOL 8f29bafa1a2ad6a13066755641a80494ead2f42406dcb10ab9a152f651cc712016563526a50a11e90c619da19c2d15b41919e5ea6ec939cd2eaf35248408a756
+AUX tenshi-openrc-init.patch 400 SHA256 ccd3596990737cc093acdcd299b8ae063795e2f81c80f859425d86b3bf0eeb2a SHA512 f623ddebbc873bc579484a60357aa4480bdff06d032591512765e8e8d947249899a45285d5abfeb78d77567154218f187c1f1f2d84d5a668473d5c03cfc19027 WHIRLPOOL 7186f52b8ed6fabfc06d7b53ee7837a5deff4920b2323e9b0b2c45b2e7ebdd688693897b89e71390a001ffaa966e22a66e1e515130baa24a2273003a1d019a39
+DIST tenshi-0.12.tar.gz 28467 SHA256 953bbad01cb03674ab6135b70f707467ccd55dd1b8cb7257f1f49473d7767920 SHA512 657998e3a8df49ad0aae9c948cdd78dab944153fdacf79ebfc31b3e57fb62d738514b94c61834342669c407a3b09e81ceab38c054153a9fae6337a377fc167db WHIRLPOOL a9c5b49238b5e7a86aa8df41f2b6cd6881f25ffacceb1ae850d37b2f227950536900af707884db5f16604903cf73c0586baecdb0a8cf0d906930dd2a5058d67c
+DIST tenshi-0.14.tar.gz 29764 SHA256 73ff5dfb078e0744709d0ead26276a1c88af8a9f0515e786a60c84bd9cd9cfc7 SHA512 9922e9b7f9f39bc38f2e8844399146a9303d8a622b167b748fd76970820b04dc15df55e4ff87c05662ba9d120876cac9fa6ffa3bf07f2ad7c4f6f58d1ca667d2 WHIRLPOOL 780ced7b2cc1902d90c5c51edd77a28cf49dcc45f0e764b47d05c1fcbadf9b5f94fdf86c9c7a746c79fe61c164dc7c1bf8e9d1ac593e804767cc420ccb7f7c7d
+DIST tenshi-0.15.tar.gz 28405 SHA256 4f875db168ca53249c521ac0b5a1e2b7498613bc3ac2a23de85638e44d0006a7 SHA512 7d241d192986d2073d8509cda8b6bd21bc678f05d6e3b830885485d259454c5e5c004b477e63dbef5eb3e5bea8c4af56d6d8ed32c6809de43ed1e144c6b3d04c WHIRLPOOL a35afa1c80cedbf57193b39119de428d53d70e222fcf8a597a187d67a66b2bea82934bf991f8cffa6aa0fc1a86b9f7e9e17d7d2c73e1bbb055d9f01acab8ff17
+DIST tenshi-0.16.tar.gz 24460 SHA256 a76ad83eaa8e2017ae14824abaab6b919742569c6a0885d4c471c006c4bc1ef0 SHA512 b23adc764ba0bbdde99a273a233cdb5117cd160da56aa19db05f196a4d4934e3a631c9d9effe4a80388c176c3b19b46328edca02af85265d08d6e77b724b044e WHIRLPOOL e965099d170c6f691989d6f897265e399331991e7a81c1a4e98144e72018240a5e88dd085715bc638d18c65d1e946738183b806fb68d59864f421c6ce1344279
+EBUILD tenshi-0.12.ebuild 1342 SHA256 d27f426fe51e4eb54fea432c547197f93e2bd76080a6f3a5413451a2f3cf505d SHA512 281348e573ec93eba92456d13c85d263fd32954f539ebe4cee0c66cb291b579bc034313c5d40cecef74d89dfb570d8b905bdd13fb24dfa30cd1ca10767d950a5 WHIRLPOOL 340bc530e696f7d32ba4ed9ccf249fa30e5e0b83a05acf7339fb05cb3ef85155f03c5c88670e5318ce5716e5d54e73d9c486679da04f842d71ed5a77b5e168de
+EBUILD tenshi-0.14.ebuild 1185 SHA256 5f851ca15c9a46e3e82fdeb15e0d8860cdca6e849060043de77504321fcb5495 SHA512 53b7df0fc590a83cd12d8ba0c6c5404941f71ab1e81787b8ce924a0baaee2c8162a7abaf3b1d36e6f634bb16520aec29ab3ff7ea1efeace731b676f167335331 WHIRLPOOL d84245f8021f0ef40bacae650900f49ac4d880a93294ab6a3e7cf3465f1179727f7faabe817aab42201b53cfa1f669bbeae2cf37cfd92a9fd6762d454ddbdeac
+EBUILD tenshi-0.15.ebuild 1186 SHA256 53592c2046feaf133cddfc09a6a5abc8d76058cbf42df02629f48eaf739c52a2 SHA512 eaffd6c1308d4c8111f443008eb7a2ec8bae686460b91509834c68801719d277f334660ae1330b6215959e6be8fa7349229e0ad214af593fb8a22d756120e769 WHIRLPOOL 7bb95664b52601b82aa0551898a65b4fd34f0e13cb26fc4e6121da29a58d256236833310d528e50ded5d4ebdde16af3d262cc98af76401018d2588d3fda2ff12
+EBUILD tenshi-0.16-r1.ebuild 1202 SHA256 aed391a945b91d4fcdef5b5f1915ff72aa7e6543d978dc65909f242919ec7e15 SHA512 5867a7541226f28c9d126a3a457a841dcf8fc9cf3f69aa5414eaddae5c461141d6f734ed27a68e0c273b82788d46b7c972ca6213025656eef9887ae30344ab6e WHIRLPOOL cbd0a577840096c324bbf84e83f615ac11b46811a5e09271b953d5f5532f33cb69521526df567f1cb90a1fdd29cb06d5cd77388b1de152ac792719f8e784722a
+MISC ChangeLog 3082 SHA256 183bfd0bffc42bedff4b0e21f5febaedf53a6c9b0dab076eca22105b3d52533d SHA512 7f44da90f2110dd629cdc0355d2df723b427b834cad7de44bf26ff89fd768d7a34982bd9f6528c5b7e75ce3ccb67def1dff098ceca6b4c42240afe608f9bddc3 WHIRLPOOL 8415fd3e1eae3ef2f69b04aa1561e83a4a65849beb2ddb35e4d148e90290140ad8056c634497b82225e58d0b36f50bd00d570ffa774ea3d6d712e5e6c4abfda2
+MISC ChangeLog-2015 9976 SHA256 573040119f052945409cc0f7531e879149db33e9831be911c47a893371031919 SHA512 a20c7c050bce9034f9cc818c6e2abe328c0855f93991c329e84ace3336dbde1b9e3222d194f5913ed5b87a744654684fe991db23e2ee530528bc7585ae3e26bd WHIRLPOOL 0fe1e23090f945fffc008f66e8505fa4afc5d1b3d10698408655333e8bd75e70fe8698d042ca06d8f82f579de535192dd9d1ae7fe3d73e57acddf8054aa81730
+MISC metadata.xml 616 SHA256 e563641e35db1a231554411a86489e2c72dd9fc769b9a9baa5f48014690dbdaf SHA512 aecc34001ab636a20f6431410c9b96b157c581abebbcd38e61f121472d458e1211cd6fc70f90e50ea1b50d3eda3f151d39a2345c1e6510a8c067f90402ab43b7 WHIRLPOOL c8ccf96605510ee6dccfeb12191955804d484a486e10b5b4555508c09afbb454f1313168f6213e1ad494c75ce64e1de9ad857d6d56daa738ccff9cdda0e6cd0a
diff --git a/app-admin/tenshi/files/tenshi-create-mandir.patch b/app-admin/tenshi/files/tenshi-create-mandir.patch
new file mode 100644
index 000000000000..72ca3f28576d
--- /dev/null
+++ b/app-admin/tenshi/files/tenshi-create-mandir.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -38,5 +38,7 @@
+ install -g root -m 0644 -D tenshi.conf ${DESTDIR}${sysconfdir}/tenshi/tenshi.conf
+ install -d ${DESTDIR}${docdir}
+ install -m 0644 ${DOCS} ${DESTDIR}${docdir}/
++ [ -d ${DESTDIR}${mandir}/man8 ] || \
++ install -d ${DESTDIR}${mandir}/man8
+ install -g root -m 0644 tenshi.8 ${DESTDIR}${mandir}/man8/
+ install -g root -m 755 -d ${DESTDIR}${libdir}
diff --git a/app-admin/tenshi/files/tenshi-openrc-init-r1.patch b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
new file mode 100644
index 000000000000..43d398610e7b
--- /dev/null
+++ b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
@@ -0,0 +1,11 @@
+--- a/tenshi.gentoo-init
++++ b/tenshi.gentoo-init
+@@ -1,6 +1,7 @@
+ #!/sbin/openrc-run
+
+-opts="depend start stop reload flush checkconfig"
++extra_commands="checkconfig"
++extra_started_commands="reload flush"
+
+ depend() {
+ need clock hostname logger
diff --git a/app-admin/tenshi/files/tenshi-openrc-init.patch b/app-admin/tenshi/files/tenshi-openrc-init.patch
new file mode 100644
index 000000000000..eef9874c553a
--- /dev/null
+++ b/app-admin/tenshi/files/tenshi-openrc-init.patch
@@ -0,0 +1,11 @@
+--- a/tenshi.gentoo-init
++++ b/tenshi.gentoo-init
+@@ -13,7 +13,7 @@
+
+ start() {
+ ebegin "Starting tenshi"
+- start-stop-daemon --start --quiet --exec /usr/sbin/tenshi -- -c /etc/tenshi/tenshi.conf -P /var/lib/tenshi/tenshi.pid
++ start-stop-daemon --start --quiet --pidfile /var/lib/tenshi/tenshi.pid --exec /usr/sbin/tenshi -- -c /etc/tenshi/tenshi.conf -P /var/lib/tenshi/tenshi.pid
+ eend $?
+ }
+
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
new file mode 100644
index 000000000000..332fa6f97201
--- /dev/null
+++ b/app-admin/tenshi/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>bldewolf@cpp.edu</email>
+ <name>Brian De Wolf</name>
+ <description>Primary proxied maintainer; set to assignee in all bugs</description>
+</maintainer>
+<maintainer type="person">
+ <email>atj@pulsewidth.org.uk</email>
+ <name>Adam James</name>
+ <description>Proxied co-maintainer; CC in all bugs</description>
+</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
new file mode 100644
index 000000000000..00fc0e6fd7a1
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils user
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ dev-perl/IO-BufferedSelect
+ sys-apps/coreutils"
+
+pkg_setup() {
+ enewgroup tenshi
+ enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-create-mandir.patch"
+ epatch "${FILESDIR}/${PN}-openrc-init.patch" #218042
+ epatch "${FILESDIR}/${PN}-openrc-init-r1.patch" #398987
+
+ # Fix for bug #241254
+ sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+ Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ fowners tenshi:root /etc/tenshi/tenshi.conf
+ dodir /var/lib/tenshi
+ fowners tenshi:root /var/lib/tenshi
+ doman tenshi.8
+ newinitd tenshi.gentoo-init tenshi
+ keepdir /var/lib/tenshi
+}
+
+pkg_postinst() {
+ ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+ ewarn "monitors /var/log/messages which, by default, can not be read"
+ ewarn "by the tenshi user. Make sure that the tenshi user has read"
+ ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/tenshi/tenshi-0.14.ebuild b/app-admin/tenshi/tenshi-0.14.ebuild
new file mode 100644
index 000000000000..462d7eb8175f
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils user
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ dev-perl/IO-BufferedSelect
+ sys-apps/coreutils"
+
+pkg_setup() {
+ enewgroup tenshi
+ enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+ # Fix for bug #241254
+ sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+ Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ fowners tenshi:root /etc/tenshi/tenshi.conf
+ dodir /var/lib/tenshi
+ fowners tenshi:root /var/lib/tenshi
+ doman tenshi.8
+ newinitd tenshi.gentoo-init tenshi
+ keepdir /var/lib/tenshi
+}
+
+pkg_postinst() {
+ ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+ ewarn "monitors /var/log/messages which, by default, can not be read"
+ ewarn "by the tenshi user. Make sure that the tenshi user has read"
+ ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/tenshi/tenshi-0.15.ebuild b/app-admin/tenshi/tenshi-0.15.ebuild
new file mode 100644
index 000000000000..16c4de5754a3
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.15.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 user
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ dev-perl/IO-BufferedSelect
+ sys-apps/coreutils"
+
+pkg_setup() {
+ enewgroup tenshi
+ enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+ # Fix for bug #241254
+ sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+ Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ fowners tenshi:root /etc/tenshi/tenshi.conf
+ dodir /var/lib/tenshi
+ fowners tenshi:root /var/lib/tenshi
+ doman tenshi.8
+ newinitd tenshi.gentoo-init tenshi
+ keepdir /var/lib/tenshi
+}
+
+cpkg_postinst() {
+ ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+ ewarn "monitors /var/log/messages which, by default, can not be read"
+ ewarn "by the tenshi user. Make sure that the tenshi user has read"
+ ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/tenshi/tenshi-0.16-r1.ebuild b/app-admin/tenshi/tenshi-0.16-r1.ebuild
new file mode 100644
index 000000000000..45059dc892f4
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.16-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ dev-perl/IO-BufferedSelect
+ sys-apps/coreutils"
+
+pkg_setup() {
+ enewgroup tenshi
+ enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+ default
+ # Fix for bug #241254
+ sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+ Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ doman tenshi.8
+ newinitd tenshi.openrc-init tenshi
+
+ # We don't need to install LICENSE files.
+ rm "${D}/usr/share/doc/${PF}/LICENSE" || die 'failed to remove LICENSE'
+}
+
+pkg_postinst() {
+ ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+ ewarn "monitors /var/log/messages which, by default, can not be read"
+ ewarn "by the tenshi user. Make sure that the tenshi user has read"
+ ewarn "permission on all the files that you want tenshi to monitor."
+}
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
new file mode 100644
index 000000000000..14fb15dc6f7a
--- /dev/null
+++ b/app-admin/testdisk/Manifest
@@ -0,0 +1,5 @@
+DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
+EBUILD testdisk-7.0-r3.ebuild 2443 SHA256 b7f9da8b9b59611ed779c9bc3d396a8618c2525dd88ff3c61a82f66ed6e407e1 SHA512 0e3e7478ddb21b301167f1ee39d67803e4f68912100194f7d6eba378281eaf2efeb36cadc773cb22aac896095e780288a53a13d0c21093fa858827dca63b1068 WHIRLPOOL 23450aa88284dbd9245b8b93e957a13201d9b120947977cd87c47287a40d4b4602df97c2c2d490885b97e9db32038c98611f1a4bd836b06b5e7237cc2b42ae20
+MISC ChangeLog 5383 SHA256 9210c676cb2f37e54ac086f4c38655402997e1c2ca586010306465ad0a2a305d SHA512 2101d2f57b43ce062557c234503f87eb410d35e1a296fb7722561378bb4b40cb3776340c57a2ba06c091e40e83f3e57e9d9c23aa1988b35be07b4d64c44cab44 WHIRLPOOL 1a0626d8f5044981af168b500dec6e9920e5e7c2de6fcdfdfc735fc4520087b6462ee05ed81c0bd976fb7a61bdcb6571e7ba4066f8228725c4f162bb9da7db80
+MISC ChangeLog-2015 11984 SHA256 0fc12084d048ee687c2e16f10ffa3bbeefd0bf845926b1fe45a4ad0908573a92 SHA512 ce5b0b2b633aa6896234c5a3a26eac9af652184f5900ed5a23e16b17c2eb739facd8b4085a192e26f546d5c76f739c2bc575e0689d88412523425d617a77cdbb WHIRLPOOL 95de07d79b5d3da9e686f0a9388bb6f62615aafec351929a3f74ab9905252ef08ad14a2ce408915688e15e9418c0ca1048a1eb13cd9375e5a89a4f79156b32bf
+MISC metadata.xml 459 SHA256 84f165d63ceba1845cfed257c990bc8dc0d10fa72ae14a799a244cb961503e46 SHA512 cdec4dc84d7bf69ad0a56c00361db4dc335770c437cf84173f69916039660a7eb9ae334828910fa47e47fb373758070825db7729c7427a3d2952ca91d0d046f2 WHIRLPOOL 51532b4a3236c99e7c572065d7aae86cc276f0769a20c787ead360df6521306d714a2fb34525d260aba58431a53780a66d57395dfbf8d36d6497e85b3fa0dfee
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
new file mode 100644
index 000000000000..0a84374e0270
--- /dev/null
+++ b/app-admin/testdisk/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>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <use>
+ <flag name="ntfs">Include the ability to read NTFS filesystems</flag>
+ <flag name="reiserfs">Include reiserfs reading ability</flag>
+ <flag name="ewf">Include ewf library</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
new file mode 100644
index 000000000000..22e8db9dfe2c
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
+IUSE="ewf jpeg ntfs reiserfs static qt4"
+
+REQUIRED_USE="static? ( !qt4 )"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+ static? (
+ sys-apps/util-linux[static-libs]
+ >=sys-libs/ncurses-5.2[static-libs]
+ jpeg? ( virtual/jpeg:0[static-libs] )
+ ntfs? ( sys-fs/ntfs3g[static-libs] )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+ >=sys-fs/e2fsprogs-1.35[static-libs]
+ sys-libs/zlib[static-libs]
+ !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
+ )
+ !static? (
+ sys-apps/util-linux
+ >=sys-libs/ncurses-5.2
+ jpeg? ( virtual/jpeg:0 )
+ ntfs? ( sys-fs/ntfs3g )
+ reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+ >=sys-fs/e2fsprogs-1.35
+ sys-libs/zlib
+ !arm? ( ewf? ( app-forensics/libewf:= ) )
+ qt4? ( dev-qt/qtgui:4 )
+ )"
+RDEPEND="!static? ( ${DEPEND} )"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( )
+
+src_configure() {
+ local myconf
+
+ # this is static method is the same used by upstream for their 'static' make
+ # target, but better, as it doesn't break.
+ use static && append-ldflags -static
+
+ # --with-foo are broken, any use of --with/--without disable the
+ # functionality.
+ # The following variation must be used.
+ use reiserfs || myconf+=" --without-reiserfs"
+ use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
+ use jpeg || myconf+=" --without-jpeg"
+ use ewf || myconf+=" --without-ewf"
+ myconf+=$(usex qt4 " --enable-qt" " --disable-qt")
+
+ econf \
+ --docdir "${ROOT}/usr/share/doc/${P}" \
+ --enable-sudo \
+ ${myconf}
+
+ # perform safety checks for NTFS, REISERFS and JPEG
+ if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+ die "Failed to find either NTFS or NTFS-3G library."
+ fi
+ if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+ die "Failed to find reiserfs library."
+ fi
+ if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+ die "Failed to find jpeg library."
+ fi
+}
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
new file mode 100644
index 000000000000..0fdd9a6e3253
--- /dev/null
+++ b/app-admin/tmpreaper/Manifest
@@ -0,0 +1,7 @@
+AUX tmpreaper-1.6.13-fix-protect.patch 1204 SHA256 d85b1b288d324f3a20cbeb96585645adca845e7ba5dca6c2d85aa204959f8447 SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0 WHIRLPOOL 38568c02f104f4f218f2841dff40c74a247afd1b2681044bd5098a059c65a05b34a1443a74c06a7436eebdc493a7fecb430ccb1782abb0c0952b6d20f0ab2cc8
+AUX tmpreaper-1.6.13-gentoo.patch 1766 SHA256 264076a9774aea0f419e7fa217469daa53fbb0443ecf2a0ff84ad8a51493971f SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9 WHIRLPOOL ed6b9f0b22c653394c44aa8def729c05763280d56eb8e1615280202821e5c4d882f6e90c83ec77199c383ae2f3fe5db96e65c74ac6faa376cc9103b382e31865
+DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 SHA256 c88f05b5d995b9544edb7aaf36ac5ce55c6fac2a4c21444e5dba655ad310b738 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f WHIRLPOOL 65a6717a19620ef85f301c38fab9fa6b5b82a2a43acace48a7c3578231b6a378a1c6dcbd6d716395f235c0184bf3cc171bc3326790c2241606a1a8f244165253
+EBUILD tmpreaper-1.6.13-r1.ebuild 1115 SHA256 db0b4210e5f2fe3928bf78c861c617b2c8f2ee4bbfbe2ac3443b81198673f098 SHA512 0e6e094cdfbb941d08cdaa4f7302eb6dc61ac4c20d9dd0948e9f8c38ba4d0fda1b5d8b283c2736ed75cf170fa37ff8dfa6de2ef35ca120c6d2246e86ce56fe9a WHIRLPOOL 3376aee692fe6c9c7b461b64c2196ff2b60c5847ef2972fb1a6b5a0305cfd7bd28b32d51b43b96507880c86881a3dce3eef4c9fadaf202ccd1b793ffc0b91c81
+MISC ChangeLog 2421 SHA256 27fdc8f6cd0dbe4ea10e93bc450eaefe0abd79121bac0ed0bd881c86ea0badd7 SHA512 ff69c24b16216aace52a4e2f72f331c1edcafcd8135ccf47c23057734fc4cc1eff813b203970f6a438344639a03d2798ea206877ac93fa2c0db66a769566ceae WHIRLPOOL 41ebf4b478a24e60a81afd9f704b1a606113e1b1114a9a96ab62971bbed140ddd397e92235ef04413fbdb377029ef0ff1b15fbcfd02b7a55ec4e0110c1f55839
+MISC ChangeLog-2015 6077 SHA256 b46f9bc6da15568a8c846d8bd5db3e33e7364039d950065007211fb44a4ea2e6 SHA512 7ae3a33102ab7b67e71c9774895eb5cb5d3535d5b1f5792de6b8ad21368fd45bf0144f9e1e823fd10f6dac3094241d2ae8581d0428ca1751d3af115a7d79e60a WHIRLPOOL 60eb0e51c0386f2f6a538c54bc9a5707ee851ef8df734680c6c99efb85250eeac893d337b1e8eaeeeca8759ce938e95e6c3898b30e8babf9d5740f10c2896c1e
+MISC metadata.xml 1186 SHA256 1fd9f29262cd7aa994fe83765e0b78b258ab65f3faaf516aa997a1c4505919cf SHA512 721eec5cb0ce1acf32c7d009fd2fed8bd8d29cfa225e41eab3626d8b7a50f6da666c24f9995d6e6f2ceb9b6e71ad0efe5c25107ba6e2bca25fe7b2d1ff1f9d8c WHIRLPOOL 167933bf6b5fbd3dda09c1d54656d94e38cab72d25616f8e4d2656685172bc4904a68ea180732f0cf9e70938a690a407de557d8c935510315cd3d4db405f676e
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
new file mode 100644
index 000000000000..9c07a4471e18
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
@@ -0,0 +1,46 @@
+--- tmpreaper-1.6.13+nmu1/tmpreaper.c.orig 2006-12-05 10:55:58.000000000 -0800
++++ tmpreaper-1.6.13+nmu1/tmpreaper.c 2006-12-05 10:56:46.000000000 -0800
+@@ -467,6 +467,21 @@
+ continue;
+ }
+
++ if (FLAGS_PROTECT_P (flags)) {
++ skip = i = 0;
++ do {
++ if (sb.st_ino == protect_table[i].inode) {
++ message (LOG_VERBOSE,
++ "Entry matching `--protect' pattern skipped. `%s'\n",
++ protect_table[i].name);
++ skip = 1;
++ break;
++ }
++ } while (protect_table[i++].name);
++ if (skip)
++ continue;
++ }
++
+ if (S_ISDIR (sb.st_mode)) {
+ char *dst;
+
+@@ -489,21 +504,6 @@
+ (u_int) getpid(), ent->d_name);
+ }
+
+- if (FLAGS_PROTECT_P (flags)) {
+- skip = i = 0;
+- do {
+- if (sb.st_ino == protect_table[i].inode) {
+- message (LOG_VERBOSE,
+- "Entry matching `--protect' pattern skipped. `%s'\n",
+- protect_table[i].name);
+- skip = 1;
+- break;
+- }
+- } while (protect_table[i++].name);
+- if (skip)
+- continue;
+- }
+-
+ /* Decide whether to remove the file or not */
+ /* check for mtime on directory instead of atime if requested */
+ if ( FLAGS_MTIME_P(flags) ||
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch
new file mode 100644
index 000000000000..afd5f60f3a1c
--- /dev/null
+++ b/app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch
@@ -0,0 +1,47 @@
+diff -ur tmpreaper-1.6.13+nmu1.orig//debian/cron.daily tmpreaper-1.6.13+nmu1/debian/cron.daily
+--- tmpreaper-1.6.13+nmu1.orig//debian/cron.daily 2008-05-19 10:10:16.000000000 -0700
++++ tmpreaper-1.6.13+nmu1/debian/cron.daily 2010-10-10 19:44:14.563252064 -0700
+@@ -32,28 +32,7 @@
+
+ # Set config defaults
+ SHOWWARNING=''
+-
+-# get the TMPREAPER_TIME value from /etc/default/rcS
+-
+-if grep '^TMPTIME=' /etc/default/rcS >/dev/null 2>&1; then
+- eval $(grep '^TMPTIME=' /etc/default/rcS)
+- if [ -n "$TMPTIME" ]; then
+- # Don't clean files if TMPTIME is negative or 'infinite'
+- # to mimic the way /lib/init/bootclean.sh works.
+- case "$TMPTIME" in
+- -*|infinite|infinity)
+- # don't use this as default
+- ;;
+- *)
+- if [ "$TMPTIME" -gt 0 ]; then
+- TMPREAPER_TIME=${TMPTIME}d
+- else
+- TMPREAPER_TIME=7d
+- fi
+- ;;
+- esac
+- fi
+-fi
++TMPREAPER_TIME=''
+
+ # ! Important ! The "set -f" below prevents the shell from expanding
+ # file paths, which is vital for the configuration below to work.
+diff -ur tmpreaper-1.6.13+nmu1.orig//debian/tmpreaper.conf tmpreaper-1.6.13+nmu1/debian/tmpreaper.conf
+--- tmpreaper-1.6.13+nmu1.orig//debian/tmpreaper.conf 2006-12-08 04:24:03.000000000 -0800
++++ tmpreaper-1.6.13+nmu1/debian/tmpreaper.conf 2010-10-10 19:45:53.251119766 -0700
+@@ -40,9 +40,7 @@
+ # TMPREAPER_ADDITIONALOPTIONS
+ # extra options that are passed to tmpreaper, e.g. --all
+
+-# uncomment and change the next line to overrule the /etc/default/rcS value
+-# TMPREAPER_TIME=7d
+-
++TMPREAPER_TIME=7d
+ TMPREAPER_PROTECT_EXTRA=''
+ TMPREAPER_DIRS='/tmp/.'
+ TMPREAPER_DELAY='256'
diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
new file mode 100644
index 000000000000..3d217fb65213
--- /dev/null
+++ b/app-admin/tmpreaper/metadata.xml
@@ -0,0 +1,24 @@
+<?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">
+ tmpreaper is a program that can be used to clean out temporary-file
+ directories. It recursively searches the directory, refusing to chdir()
+ across symlinks, and removes files that haven't been accessed in a
+ user-specified amount of time. You can specify a set of files to protect
+ from deletion with a shell pattern. It will not remove files owned by the
+ process EUID that have the `w' bit clear, unless you ask it to, much like
+ `rm -f'. `tmpreaper' will not remove symlinks, sockets, fifos, or special
+ files unless given a command line option enabling it to.
+
+ WARNING: Please do not run `tmpreaper' on `/'. There are no protections
+ against this written into the program, as that would prevent it from
+ functioning the way you'd expect it to in a `chroot(8)' environment.
+
+ The daily tmpreaper run can be configured through /etc/tmpreaper.conf .
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
new file mode 100644
index 000000000000..d13fc5593381
--- /dev/null
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.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
+
+MY_P="${PN}_${PV}+nmu1"
+DESCRIPTION="A utility for removing files based on when they were last accessed"
+HOMEPAGE="http://packages.debian.org/sid/tmpreaper"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/_/-}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-protect.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_install() {
+ emake DESTDIR="${D}" install
+ insinto /etc
+ doins debian/tmpreaper.conf
+
+ exeinto /etc/cron.daily
+ newexe debian/cron.daily tmpreaper
+ doman debian/tmpreaper.conf.5
+ dodoc README ChangeLog debian/README*
+}
+
+pkg_postinst() {
+ elog "This package installs a cron script under /etc/cron.daily"
+ elog "You can configure it using /etc/tmpreaper.conf"
+ elog "Consult tmpreaper.conf man page for more information"
+ elog "Read /usr/share/doc/${P}/README.security and"
+ elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
+}
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
new file mode 100644
index 000000000000..51d94906d6bd
--- /dev/null
+++ b/app-admin/tmpwatch/Manifest
@@ -0,0 +1,8 @@
+AUX tmpwatch-2.11-boottime.patch 1034 SHA256 5150b5d350213a6d3d4c5d747520077e5a1d7558c5f7174bacc138e72ec92d0a SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92 WHIRLPOOL 553353bb72b312aaebec9aa04b2211ec1e9340c41b08cde52caeb316861b39dc260bff3548d631e94a3c6c88fd5dff463ef3618994b6dd1c6865c01685daec22
+AUX tmpwatch.cron 1533 SHA256 ece4417d5ce022d647753e2005a11ee3b905d9f25e8f559a361c59a7760057f0 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016 WHIRLPOOL 5ec5ef4f7ea2ad491c39656ae6cd84884cf5dab28bc36e5b7e890a818715185307b3a422a840ac35a12056fe6364ad09c336256e860e4ce05cc78c315f4b802b
+DIST tmpwatch-2.11.tar.bz2 145609 SHA256 93168112b2515bc4c7117e8113b8d91e06b79550d2194d62a0c174fe6c2aa8d4 SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97 WHIRLPOOL 94d83c4a2b1c1a19ab88632c61de37903b709bc7fa88aff9f8ac4f4b71a26b8e6fbcb1564b3bce08ed5d1d0a78511c3470978a13211356f5fdf10b4d40f2de1c
+EBUILD tmpwatch-2.11-r2.ebuild 722 SHA256 000e6d20aed139b7ac3fcf4663ca45d206dfe8efb323b64d0ade2583fc94239a SHA512 91a43b7cf57e996674560d685b49d7e2fcbdf005782d787e129da6a13d1a784997ba2c0ec030073b73034575a71687e1bc31b1ee4b9e08401d65fa6b51b62973 WHIRLPOOL df164934639bae18f14992619536ee469f1d1304c4b6375159ec039dfa993e011d33a4989d6ee5e6d6f2aa28569d86fb8eaaef67546fdfbb9bf7e1aa71135fd8
+EBUILD tmpwatch-2.11.ebuild 722 SHA256 12e154c3f0197ebf62c68c338273b519d6b213f37c7357e116c2ebc75cc026b5 SHA512 a7543348e40cca314a89a04ab8d1d6e2c226172cd1b819cc26516cc92d81bbe0f71e8ff6673b16ec6e88e57aa34c9e55a69cc33badd1b7844a1c0e4dd14ff11a WHIRLPOOL a71956b225a739226885c667575f44f8a2da4d374c5c840ff301cccadd3742740dbcf7442273311b912ec126fdeac981b8943fccdee4240c2339c3b09f6fd39a
+MISC ChangeLog 3011 SHA256 98b53b719c552a79f897a1b602b768a8ead92f8217d62c8b35128c760c3e3cb2 SHA512 cf128f51a822d6f80c36fa89237a13b893d5765f4c7d1bf001935fa784c725f46057bf467408f6be9e520dd1ca81e03580a3831d5e1db7205043c26512b515de WHIRLPOOL c663c0bc940b186591ee5380299a36acc79316ad80841cf1eb0f0aa9107b2b6f58b433401cfe20376bcc27d7b47c27714152777985d4e99e45677dd2ade7d4f6
+MISC ChangeLog-2015 13646 SHA256 241cb43ec00ffaffefbf3c8a0f4c0ffa7cbaa293a0e257bd6f3f7b056d80f653 SHA512 288f1be301627114bbbf8135b7631d715eedc037f99b32b053fc915f123678835deaa59625b3f4a82cf2e98fcfcdd422afb8c28b1bc5dbafeadbfc30fc628a88 WHIRLPOOL e6cb093b566e4de6675d912aaac8b0f4f9581b1d947414487689df0050d0a588a219e42fd716bf94b7c7455966b7d9b14eae19905ae38c667617f88c4516a1d7
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch
new file mode 100644
index 000000000000..b622c8d70e70
--- /dev/null
+++ b/app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch
@@ -0,0 +1,30 @@
+Make boot time detection failures non-fatal. Taken from PLD Linux
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=468444
+PLD bug: https://bugs.launchpad.net/pld-linux/+bug/1034364
+Patch: https://github.com/pld-linux/tmpwatch/blob/master/tmpwatch-boottime.patch
+
+--- tmpwatch-2.11/tmpwatch.c~
++++ tmpwatch-2.11/tmpwatch.c
+@@ -666,9 +666,11 @@
+ time_t boot_time;
+
+ if (clock_gettime(CLOCK_REALTIME, &real_clock) != 0
+- || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0)
+- message(LOG_FATAL, "Error determining boot time: %s\n",
++ || clock_gettime(CLOCK_BOOTTIME, &boot_clock) != 0) {
++ message(LOG_DEBUG, "Error determining boot time: %s\n",
+ strerror(errno));
++ socket_kill_time = 0; /* Never remove sockets */
++ } else {
+ boot_time = real_clock.tv_sec - boot_clock.tv_sec;
+ if (real_clock.tv_nsec < boot_clock.tv_nsec)
+ boot_time--;
+@@ -677,6 +679,7 @@
+ boot_time -= 2;
+
+ socket_kill_time = boot_time - grace_seconds;
++ }
+ #else
+ socket_kill_time = 0; /* Never remove sockets */
+ #endif
diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron
new file mode 100644
index 000000000000..806b1453e552
--- /dev/null
+++ b/app-admin/tmpwatch/files/tmpwatch.cron
@@ -0,0 +1,47 @@
+#!/bin/sh
+# vim: ft=sh
+
+# This cron script contains several (commented out) examples. You may use
+# them as is, by uncommenting them, or modify them to suit your needs. Read
+# tmpwatch(8) for more information on tmpwatch parameters.
+
+### Variables ###
+
+TMPWATCH="/usr/sbin/tmpwatch"
+#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage"
+#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)"
+#DISTDIR="$(portageq distdir)"
+
+### EXAMPLES ###
+
+# NOTE: if you have noatime in /etc/fstab for any partitions you plan on
+# running tmpwatch on, you should obviously change any of the examples that
+# use atime (-u|--atime). Those that don't specify anything, default to
+# atime.
+
+# NOTE2: the time value is in HOURS!
+
+# Delete everything in /tmp that haven't been accessed in a week (>=168 hrs).
+#
+# if [[ -d /tmp ]]; then
+# ${TMPWATCH} --atime 168 /tmp
+# fi
+
+# Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks.
+#
+# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then
+# ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage}
+# fi
+
+# Delete everything in DISTDIR that hasn't been accessed in 6 months (going
+# by 30 day months)
+#
+# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then
+# ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles}
+# fi
+
+# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks
+#
+# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then
+# ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage}
+# fi
diff --git a/app-admin/tmpwatch/metadata.xml b/app-admin/tmpwatch/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-admin/tmpwatch/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-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
new file mode 100644
index 000000000000..b1028a59fbb6
--- /dev/null
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r2.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 eutils
+
+DESCRIPTION="Files which haven't been accessed are removed from specified directories"
+HOMEPAGE="https://fedorahosted.org/tmpwatch/"
+SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
+DEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-boottime.patch"
+)
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ dosbin tmpwatch
+ doman tmpwatch.8
+
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}/${PN}.cron" "${PN}"
+}
diff --git a/app-admin/tmpwatch/tmpwatch-2.11.ebuild b/app-admin/tmpwatch/tmpwatch-2.11.ebuild
new file mode 100644
index 000000000000..5e251f8628b1
--- /dev/null
+++ b/app-admin/tmpwatch/tmpwatch-2.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Files which haven't been accessed are removed from specified directories"
+HOMEPAGE="https://fedorahosted.org/tmpwatch/"
+SRC_URI="https://fedorahosted.org/releases/t/m/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-tmpreaper )"
+DEPEND=""
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ dosbin tmpwatch || die
+ doman tmpwatch.8 || die
+ dodoc ChangeLog NEWS README AUTHORS || die
+
+ exeinto /etc/cron.daily
+ newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
+}
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
new file mode 100644
index 000000000000..1d6542396bcf
--- /dev/null
+++ b/app-admin/tripwire/Manifest
@@ -0,0 +1,10 @@
+AUX tripwire 466 SHA256 222c078588d03394c4502a884d6049f210b25d7f826e9bb29a69d68a01b40eac SHA512 1df37364a84ab26ca0a3f2637e9f4938333c394979c2ccadb69401b7e6a93d03911ce737b25bb6e76c1963e4b7eaffd35b3551aa141b51bc9b3a8a00d9c828cf WHIRLPOOL afb61e9885b1c7d0214f03e35af6f02a5dca77a68f74441d6c84091ef7a7f9ee0d5a6b70e1a0ac2cf5f75f4739185ab3c2eaf7f47b2795f1c7a7bdaf347de36d
+AUX tripwire.txt 11492 SHA256 532a53633dca25ff96b13518e13c81744c191f4ec7ec28d46d8d865f74d77ee6 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47 WHIRLPOOL b00973d96255889bd8084c6f8d3a1718acb3bfdf41897b2de7839972fdf41f1146a6ed49ea9b999d060f75b13ed84b68123f1523fe5de8779d2c8a465c6e8960
+AUX twcfg.txt 604 SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2b02d90846 SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388 WHIRLPOOL a290ac4d1e421890b99c9b4b78088a5ae5abd52d85c0e96e2398f89a97d8f0a2b958b3a7d0f1c8a2a7df0bc8e7cf8d71fbeb3d4557619f554a787d3718b4aa6e
+DIST tripwire-2.4.3.5.tar.gz 965014 SHA256 4bb0b400d8f5d7f8762ffb87a683f113f8c77186689cc63b8cedbbc628c9c33b SHA512 7aef0e7d38f4b6966a806a4e556636c7b2477f4ea5451e89f1749c1535a489c2f490ea13898edff5d7786acf572f77d04430115b8ddd4c6a03c38382feb45269 WHIRLPOOL f5f06d2f509e8047ede81226d3179f253e32aae4193817ab1000dd843f4b9810f6aacc6cd9c0bdc8a0c6835fdb11f79c85838a3b799d8c6565861d43dd433a99
+DIST tripwire-2.4.3.6.tar.gz 1001145 SHA256 f55fe6805f2c159bd67fa3761ba52df95b2a7d0bdd06196847564bac00dd5606 SHA512 4757827b908fd56a014de81609be9cfdf3631d34cbc02214ac800bf6d9c413d85d812bc3211f9dc32ceee97e1f13decd955037a0cbbaf2f8e3020699492bd9bf WHIRLPOOL 0dad2b00a6e868179c1538ec48859a03857fa5bc62dcb9eb3240e11e10cd7ebf4de1fe85802c08abbf1ff1efca0768dcd63ff8088914f53f32cbf7fda20ec706
+EBUILD tripwire-2.4.3.5.ebuild 2407 SHA256 e92dcd221898e4735b4b352ad222ad3b5c78c5475276cb8d15b28b5142641b17 SHA512 a16a7873ce32ee7c86afb14488c439257f5697b84dd20fc9321ab5bb99603b0a614202ef37916e2ce3df3d6b777af06c3e680caec160f9d50add847f06aa9d59 WHIRLPOOL 8da61324fc67f11ef545638b75667f56b33715df2130c02822f28b91783e69778aae12775dfabe04115eea5779b760d6607138887ba9d7841680bc988eb157b9
+EBUILD tripwire-2.4.3.6.ebuild 2410 SHA256 33850be1591ec7add9f1b5abdd316b12b22256cf618b25c9c0b809d7ed33acef SHA512 8afaee953af4e49e2af180a5a941889812f18299fbe05b6ff19966ea639400efc506ebdfe77ce16297b03cd166590d5d2ecb98dd95344430057f81f5f4beb0c6 WHIRLPOOL ab34aaa09b0ae374e79013011f2fdaa0f14fe5b78d1723918cd1f3a7e576aed0b0d1d8df93f866566e049be57493bcf05967abb7f0dacb4047f0dd53592ee98b
+MISC ChangeLog 4534 SHA256 70b8e927eb118da4b9f8fc0a3b45d39c53d75f2c2fcff4088f4292464784a449 SHA512 42e38df0a2cc9a95dbfe37299321655bfa637f4c9a9361508cbcfb3e9e57c313d426bbb8af69d0f96cfc1f299e741f6694593c748e95e9635c17e2dd3d0a4af5 WHIRLPOOL 1b86ebc590ff89d1a79b0097b6db8d7d99c0248dc09a2f2103a6f8aa976144f117a83912ba8db5f3a9b831e801e2358181cae976cc2f0b51c67b91fec2d89d2b
+MISC ChangeLog-2015 10548 SHA256 7160399cc44557c92981c50f67f726c44103810f2cdd92173d2f636193723324 SHA512 0e6332b6021f6ffe3f0bcdaccc13b2f5af85b8d135e263e42b6b2c3a4caa3e5dbd8efae01e9c04ab3daa977d1ac7e977542c96718443a5a94d2e04e60be9b110 WHIRLPOOL f4b70c099751eab07d4bb85b9effb68b443c870c5eecad70e6ec42441049d26e567abdc4659122a6cc8263efb0dceddd58f798bdd01906dce1f6bf9bb74c33ba
+MISC metadata.xml 1616 SHA256 0b739488758f343224051751110c9a5ea9189df298e31c471a8a7929d5d28de1 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2 WHIRLPOOL f6e75fbe709dcb4b6d11293edac615288f750b66a654eee24d34981da4ffa0c677fc50ec39262e702c4122ef2998765a827b6e8d639e8266cb358d31b69f9efd
diff --git a/app-admin/tripwire/files/tripwire b/app-admin/tripwire/files/tripwire
new file mode 100644
index 000000000000..8f0f23f3e2d5
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire
@@ -0,0 +1,10 @@
+#!/bin/sh
+HOST_NAME=`uname -n`
+if [ ! -e /var/lib/tripwire/${HOST_NAME}.twd ] ; then
+ echo "**** Error: Tripwire database for ${HOST_NAME} not found. ****"
+ echo "**** Check tripwire.txt file for instructions or install ****"
+ echo "**** app-admin/mktwpol package (if you used the \"tools\" ****"
+ echo "**** USE flag, this has been done for you already. ****"
+else
+ test -f /etc/tripwire/tw.cfg && /usr/sbin/tripwire --check --quiet
+fi
diff --git a/app-admin/tripwire/files/tripwire.txt b/app-admin/tripwire/files/tripwire.txt
new file mode 100644
index 000000000000..4f47f8bd8196
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire.txt
@@ -0,0 +1,272 @@
+tripwire.txt v. 11 Sept 2013
+
+Introduction to Tripwire, with Gentoo-specific installation information
+
+Tripwire software can monitor the integrity of critical system files and
+directories by identifying specified changes made to selected system
+files and directories. Configure Tripwire software to monitor your
+system in the way that is best for you.
+
+Tripwire software works by comparing files and directories against a
+defined baseline, stored in a tripwire-created database. Tripwire
+generates the baseline by taking a "snapshot" of specified files and
+directories. Tripwire software then compares the current system against
+the baseline and reports modifications, additions, or deletions. Use
+Tripwire software for system security, intrusion detection, damage
+assessment, and recovery forensics.
+
+
+To set-up Tripwire Configuration
+
+The Tripwire tarball installs the basic program files needed to run the
+software. However, this installation does not prepare the configuration
+files that Tripwire needs to perform correctly. After you install the
+tripwire executable files and example configuration, you must:
+
+1. Review and perhaps edit the plain-text tripwire configuration file
+ (/etc/tripwire/twcfg.txt) with a text editor, if desired.
+
+2. Either run a configuration script (twsetup.sh from Gentoo's mktwpol
+ package, or tripwire-setup-keyfiles from Red Hat, or deprecated
+ twinstall.sh, also from Red Hat), or run the program `twadmin` with
+ the correct command line switches to make key files and encrypt/sign
+ the tripwire configuration file.
+
+ Make site key file
+ ------------------
+ `twadmin --generate-keys -S /etc/tripwire/site.key`
+
+ Make local key file
+ -------------------
+ `twadmin --generate-keys -L /etc/tripwire/$HOSTNAME-local.key`
+
+ Make mandatory signed tripwire configuration file (tw.cfg)
+ ----------------------------------------------------------
+ `twadmin --create-cfgfile -S /etc/tripwire/site.key /etc/tripwire/twcfg.txt`
+
+Note: Once encrypted/signed, the configuration file, tw.cfg, must not be
+renamed or moved. The plain-text tripwire configuration file (twcfg.txt)
+should be deleted. It can be recreated with `twadmin --print-cfgfile`
+
+3. Make a plain-text policy file. The use of the name twpol.txt is
+ common, but the name of this file is not defined or used by Tripwire,
+ other than preparation of the encrypted/signed policy file.
+
+ To make the plain-text policy file, either run a policy file generator
+ (for example, mktwpol.sh from Gentoo's mktwpol package), or edit the
+ plain-text policy file (twpol-GENERIC.txt, or twpol.txt, or similar)
+ with a text editor. The plain-text policy file should not refer to
+ any non-existent file or directory.
+
+ If you edit twpol-GENERIC.txt to act as your plain-text policy file,
+ provide your system's HOSTNAME at line 61. If you don't provide
+ the correct HOSTNAME, a tripwire inspection of the target computer's
+ filesystem will fail to check the tripwire database file for changes.
+
+ TWDB=/var/lib/tripwire/YOUR_HOSTNAME.twd;
+
+4. Convert the plain-text policy file into the encrypted/signed form
+ that tripwire will refer to as it examines the files on the target
+ computer's filesystem. The default filename for the encrypted/signed
+ policy file is defined in the tripwire configuration file (tw.cfg)
+ and is usually tw.pol. The encryption/signing of plain-text twpol.txt
+ is done with yet another `twadmin` command line.
+
+ Make mandatory encrypted/signed system inspection policy file
+ --------------------------------------------------------------
+ `twadmin -m P -c /etc/tripwire/tw.cfg /etc/tripwire/twpol.txt`
+
+Note: If you modify the plain-text policy file after running the
+configuration script, you must re-sign the plain-text policy file before
+initializing the database file. Tripwire baseline database creation and
+inspections refer to the encrypted/signed policy file, not to the
+plain-text policy file.
+
+Note: The plain-text tripwire policy file (twpol.txt) should be deleted.
+It can be recreated with `twadmin --print-polfile`
+
+5. Initialize the Tripwire database file.
+
+ Record current file attributes in the tripwire database
+ -------------------------------------------------------
+ `tripwire --init -c /etc/tripwire/tw.cfg`
+
+Note: Tripwire might issue some "Warning: File system error" errors,
+and appear to hang. But as long as it follows with "### Continuing...",
+it is still working.
+
+6. Run the first integrity check.
+
+ `tripwire --check -c /etc/tripwire/tw.cfg`
+
+Note: The use of "-c /etc/tripwire/tw.cfg" is not required if Tripwire
+uses the default tripwire configuration directory and file names. If
+you defer to tripwire default filenames, then updating a text policy
+file into a tripwire database, and running an integrity check, can be
+done with these commands:
+
+ `twadmin --create-polfile /etc/tripwire/twpol.txt`
+ `tripwire --init`
+ `tripwire --check`
+
+Modifying the Policy File
+
+How Tripwire software checks your system is specified in the Tripwire
+plain-text policy file (twpol.txt). A default policy file is included in
+the Tripwire software installation. This policy file should be tailored
+to fit your particular system. Tailoring the policy file is necessary
+to take advantage of Tripwire software's ability to monitor changes on
+your system.
+
+The plain-text policy file is usually located at /etc/tripwire/twpol.txt.
+An example policy file (located at /etc/tripwire/twpol-GENERIC.txt, or
+at /usr/share/doc/tripwire-VER#-REL#/policyguide.txt) is included to
+help you learn the policy language. Read the sample policy files and
+the comments in the sample policy file to learn the policy language.
+
+After you modify the plain-text policy file, don't forget!
+
+ encrypt/sign using `twadmin --create-polfile /etc/tripwire/twpol.txt`
+
+
+Selecting Passphrases
+
+Tripwire files are encrypted/signed using site or local keys. These keys
+are protected by passphrases. When selecting passphrases, the following
+recommendations apply:
+
+Use at least eight alphanumeric and symbolic characters for each
+passphrase. The maximum length of a passphrase is 1023 characters.
+Quotes should not be used as passphrase characters.
+
+Assign a unique passphrase for the site key. The site key passphrase
+protects the site key, which is used to sign Tripwire software
+configuration and policy files. Assign a unique passphrase for the local
+key. The local key signs the Tripwire baseline database file. The local
+key may sign the Tripwire report files also.
+
+Store the passphrases in a secure location. There is no way to remove
+encryption from a signed file if you forget your passphrase and lost the
+key files. If you forget the passphrases, the files are unusable. In
+that case you must create new key files and the baseline database.
+
+
+Initializing the Database
+
+In Database Initialization mode, Tripwire software builds a database of
+filesystem objects based on the rules in the policy file. This database
+serves as the baseline for integrity checks. The syntax for Database
+Initialization mode is:
+
+ `tripwire --init -c /etc/tripwire/tw.cfg`
+
+
+Running an Integrity Check
+
+The Integrity Check mode compares the current file system objects with
+their properties recorded in the Tripwire database. Violations are
+printed to stdout. The report file is saved and can later be accessed by
+twprint. An email option enables you to send email. The syntax for
+Integrity Check mode is:
+
+ `tripwire --check -c /etc/tripwire/tw.cfg`
+
+
+Printing Reports - twprint Print Report Mode
+
+The twprint --print-report mode prints the contents of a Tripwire
+report. If you do not specify a report with the --twrfile or -r
+command-line argument, the default report file specified by the
+configuration file REPORTFILE variable is used.
+
+Example: On a machine named LIGHTHOUSE, the command could be:
+
+ `twprint -m r --twrfile LIGHTHOUSE-19990622-021212.twr`
+
+
+Updating the Database after an Integrity Check
+
+Database Update mode enables you to update the Tripwire database after
+an integrity check if you determine that the violations discovered are
+valid. This update process saves time by enabling you to update the
+database without having to re-initialize it. It also enables selective
+updating, which cannot be done through re-initialization. The syntax for
+Database Update mode is:
+
+ `tripwire --update`
+
+
+Updating the Policy File
+
+Change the way that Tripwire software scans the system by changing the
+rules in the policy file. You can then update the database without a
+complete re-initialization. This saves a significant amount of time and
+preserves security by keeping the policy file synchronized with the
+database it uses. The syntax for Policy Update mode is:
+
+ `tripwire --update-policy`
+
+
+Testing email functions
+
+Test mode tests the software's email notification system, using the
+settings currently specified in the configuration file. The syntax for
+Email Test Reporting mode is:
+
+ `tripwire --test`
+
+
+Tripwire Components
+
+The policy file begins as a text file containing comments, rules,
+directives, and variables. These dictate the way Tripwire software
+checks your system. Each rule in the policy file specifies a system
+object to be monitored. Rules also describe which changes to the object
+to report, and which to ignore.
+
+System objects are the files and directories you wish to monitor. Each
+object is identified by an object name. A property refers to a single
+characteristic of an object that Tripwire software can monitor.
+Directives control conditional processing of sets of rules in a policy
+file. During installation, the text policy file is encrypted/signed and
+renamed, and becomes the active policy file.
+
+The database file is an important component of Tripwire software. When
+first installed, Tripwire software uses the policy file rules to create
+the database file. The database file is a baseline "snapshot" of the
+system in a known secure state. Tripwire software compares this baseline
+against the current system to determine what changes have occurred. This
+is an integrity check.
+
+When you perform an integrity check, Tripwire software produces report
+files. Report files summarize any changes that violated the policy file
+rules during the integrity check. You can view the report file in a
+variety of formats, at varying levels of detail.
+
+The Tripwire configuration file stores system-specific information, such
+as the location of Tripwire data files. Tripwire software generates some
+of the configuration file information during installation. The system
+administrator can change parameters in the configuration file at any
+time. The configuration file variables POLFILE, DBFILE, REPORTFILE,
+SITEKEYFILE, and LOCALKEYFILE specify where the policy file, database
+file, report files, and site and local key files reside. These variables
+must be defined or the configuration file is invalid. If any of these
+variables are undefined, an error occurs on execution of Tripwire
+software and the program exits.
+
+
+Tripwire Help
+
+All Tripwire commands support the help arguments.
+
+Example: To get help with Create Configuration File mode, type:
+
+ `twadmin --help --create-cfgfile`
+
+ -? Display usage and version information
+ --help Display all command modes
+ --help all Display help for all command modes
+ --help [mode] Display help for current command mode
+ --version Display version information
+
+We recommend you read the Tripwire Release Notes and README file.
diff --git a/app-admin/tripwire/files/twcfg.txt b/app-admin/tripwire/files/twcfg.txt
new file mode 100644
index 000000000000..9cf39bcc01e4
--- /dev/null
+++ b/app-admin/tripwire/files/twcfg.txt
@@ -0,0 +1,15 @@
+ROOT =/usr/sbin
+POLFILE =/etc/tripwire/tw.pol
+DBFILE =/var/lib/tripwire/$(HOSTNAME).twd
+REPORTFILE =/var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr
+SITEKEYFILE =/etc/tripwire/site.key
+LOCALKEYFILE =/etc/tripwire/$(HOSTNAME)-local.key
+EDITOR =/bin/nano
+LATEPROMPTING =false
+LOOSEDIRECTORYCHECKING =false
+MAILNOVIOLATIONS =true
+EMAILREPORTLEVEL =3
+REPORTLEVEL =3
+MAILMETHOD =SENDMAIL
+SYSLOGREPORTING =false
+MAILPROGRAM =/usr/lib/sendmail -oi -t
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
new file mode 100644
index 000000000000..9cf612218444
--- /dev/null
+++ b/app-admin/tripwire/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>nimiux@gentoo.org</email>
+ <name>Chema Alonso</name>
+ </maintainer>
+ <longdescription lang="en">
+ Tripwire is a tool that aids system administrators and users in
+ monitoring a designated set of files for any changes. Used with system
+ files on a regular (e.g., daily) basis, Tripwire can notify system
+ administrators of corrupted or tampered files, so damage control
+ measures can be taken in a timely manner.
+ </longdescription>
+ <longdescription lang="es">
+ Tripwire es una herramienta que ayuda a los administradores y
+ usuarios en la monitorización de los cambios en un conjunto de
+ ficheros. Se utiliza particularmente en los ficheros de sistema
+ de un modo regular (por ejemplo diariamente). Tripwire puede
+ notificar a los administradores de sistema sobre ficheros que
+ se han corrompido o han sido modificados maliciosamente, por lo
+ que se pueden adoptar medidas de control de forma periódica.
+ </longdescription>
+ <use>
+ <flag name="tools">Installs app-admin/mktwpol, providing scripts
+ for the installation/setup of tripwire, including generating the
+ tripwire policy file and maintenance of the tripwire database</flag>
+ <flag name="ssl">Adds support for Secure Socket Layer connections</flag>
+ <flag name="static">Builds the package statically</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">tripwire</remote-id>
+ <remote-id type="github">Tripwire/tripwire-open-source</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/tripwire/tripwire-2.4.3.5.ebuild b/app-admin/tripwire/tripwire-2.4.3.5.ebuild
new file mode 100644
index 000000000000..58e3201aa752
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.3.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="libressl selinux ssl static +tools"
+
+DEPEND="sys-devel/automake
+ sys-devel/autoconf
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+RDEPEND="virtual/cron
+ virtual/mta
+ selinux? ( sec-policy/selinux-tripwire )
+ ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+S="${WORKDIR}/tripwire-open-source-${PV}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # tripwire can be sensitive to compiler optimisation.
+ # see #32613, #45823, and others.
+ # -taviso@gentoo.org
+ strip-flags
+ append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+ econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+ dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+ doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+ dodir /etc/tripwire /var/lib/tripwire{,/report}
+ keepdir /var/lib/tripwire{,/report}
+
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/tripwire
+
+ dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+ "${FILESDIR}"/tripwire.txt
+
+ insinto /etc/tripwire
+ doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+ fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Tripwire needs to be configured before its first run. You can"
+ elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+ elog "the package to suit your needs. A quickstart guide is provided"
+ elog "in tripwire.txt file to help you with this."
+ elog "To configure tripwire automatically, you can use the twsetup.sh"
+ elog "script provided by the app-admin/mktwpol package. This package is"
+ elog "installed for you by the \"tools\" USE flag (which is enabled by"
+ elog "default."
+else
+ elog "Maintenance of tripwire policy files as packages are added"
+ elog "and deleted from your system can be automated by the mktwpol.sh"
+ elog "script provided by the app-admin/mktwpol package. This package"
+ elog "is installed for you if you append \"tools\" to your USE flags"
+ fi
+}
diff --git a/app-admin/tripwire/tripwire-2.4.3.6.ebuild b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
new file mode 100644
index 000000000000..ec2cc9bc418b
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="libressl selinux ssl static +tools"
+
+DEPEND="sys-devel/automake
+ sys-devel/autoconf
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+RDEPEND="virtual/cron
+ virtual/mta
+ selinux? ( sec-policy/selinux-tripwire )
+ ssl? ( dev-libs/openssl )"
+PDEPEND="tools? ( app-admin/mktwpol )"
+
+S="${WORKDIR}/tripwire-open-source-${PV}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # tripwire can be sensitive to compiler optimisation.
+ # see #32613, #45823, and others.
+ # -taviso@gentoo.org
+ strip-flags
+ append-cppflags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
+ econf $(use_enable ssl openssl) $(use_enable static)
+}
+
+src_install() {
+ dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
+ doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
+ dodir /etc/tripwire /var/lib/tripwire{,/report}
+ keepdir /var/lib/tripwire{,/report}
+
+ exeinto /etc/cron.daily
+ doexe "${FILESDIR}"/tripwire
+
+ dodoc ChangeLog policy/policyguide.txt TRADEMARK \
+ "${FILESDIR}"/tripwire.txt
+
+ insinto /etc/tripwire
+ doins "${FILESDIR}"/twcfg.txt policy/twpol-GENERIC.txt
+
+ fperms 750 /etc/cron.daily/tripwire
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Tripwire needs to be configured before its first run. You can"
+ elog "do this by manually editing the twpol-GENERIC.txt file shipped with"
+ elog "the package to suit your needs. A quickstart guide is provided"
+ elog "in tripwire.txt file to help you with this."
+ elog "To configure tripwire automatically, you can use the twsetup.sh"
+ elog "script provided by the app-admin/mktwpol package. This package is"
+ elog "installed for you by the \"tools\" USE flag (which is enabled by"
+ elog "default."
+else
+ elog "Maintenance of tripwire policy files as packages are added"
+ elog "and deleted from your system can be automated by the mktwpol.sh"
+ elog "script provided by the app-admin/mktwpol package. This package"
+ elog "is installed for you if you append \"tools\" to your USE flags"
+ fi
+}
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
new file mode 100644
index 000000000000..b8a46a7be97a
--- /dev/null
+++ b/app-admin/ulogd/Manifest
@@ -0,0 +1,8 @@
+AUX ulogd.init 949 SHA256 6674a030f149779bf29e52e884728730f85b39cd6c34ff3cf4bff52c28c1f930 SHA512 87331bc32592fc9153274a8716a5206392af99087f89d8ba51539c477805a1932706ad2fbb8f71947ef3534a368cb2559fd2f54ae0038ab49eccda85763e7a99 WHIRLPOOL a369c777fa428b99730c625ab83ef8975068998ad992d69dba27a5eef42a8c9d79bc8a20e38ca80f877c9d69ac3983707be16f371ed109273a74743045cb269e
+AUX ulogd.logrotate 193 SHA256 f5253a7906b2dc08c3ff5afe2c07f51aa77541c1ba65a5d2292099893827f66c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a WHIRLPOOL c10c9003fbfc367ae556ccef60eb453f736235c01e6fcf7252ed0bb7626ecf80fc2858408accc08987340008450a4405425bba93c13c25b6b47150e3702fcd25
+AUX ulogd.service 390 SHA256 1c3abf007d8463cea823de0442d7f85b8889c6e1c6c25827d58079840157bdf5 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89 WHIRLPOOL 13b0fc1f2b378d4423b4f080f71dd8278e5854320e578d65b965dd61b225c363872d506ef178e710e2622d1cb19b3a8c3b08b76d5eec1c7205a68932d30524ef
+DIST ulogd-2.0.5_p20161017.tar.gz 137936 SHA256 07798bbf17ab5fc6111ab7296c0c74778da231cb66fb7e8f38b09ccfc8d3e812 SHA512 b9a3f5323766856fc20d58a6c55f9bc955f50e9d7052df0828ca08bf9d573326e69920f6c90c9d3e877c4dc1a29a5a994cde070bd0834fbf4dee8eebbb251e98 WHIRLPOOL 92931a8248b1c03134f37746c68ad7c389deaec74774a93b78e9548ad42df2b8c027dd698f4498741a81d930dc7f311aa9ddb4e8d14de5f7dcfb6daeb7fe34f6
+EBUILD ulogd-2.0.5_p20161017.ebuild 3283 SHA256 2665b2e4017fd1109027d9f62e7490b3a18eaeacad22dd0e5ffae335aaddc631 SHA512 2a053311bf836f933fdb3ffa23f354bda4eaac186a36fbe50ccd4aeed719d8c172ab67f969339b0ef29a4698b0bd7b2fac9804eaa75d4b2c84b7808a096f9791 WHIRLPOOL 63abc71526abb05788e20c4b5797b2b8da7e15c9d36c2046c0de4f47467454732d8063ef6f8d8f33161f143814c748774bf638b1ac40b3ad07d3cf0eafc4adc6
+MISC ChangeLog 12429 SHA256 c620a5a4c109b8e79fd6472b821c2e982f89e057f0b2271631449a85b89de9cb SHA512 97afdb29b2c2ada1e16907327ff935e2d7b625415ef04ac8ec539472e45ab2d4c518411afd731d39282016d82e2ad3ff09d71a0d42865a65c09a86108c182a0a WHIRLPOOL de25e3b61b4752efed503b4759a7e3f24f68fd9f80d8dc8797139a943369de25836bfafffdebe3882b9a9db41e18f005d3b56b47573281091818570c701c0cbe
+MISC ChangeLog-2015 17489 SHA256 5925f0259a2590e6765b6596931c5d97313a412e82149e876d9490812b302aa4 SHA512 71c0aa15523ad3543f77ab0a655334551198d9ff929ce6d1abe746dd518633691b21f5f601e7cc1c3790fccad35f115ed3dca3e9f18f2c2a8361013baf2b15d6 WHIRLPOOL 6ceffc38f9dbc168b2c7e59831fddde6129cdbe2253a9f24a6be6cfb570af2fc4468cc937cdf5e8cde54441ff5d8cc06079038f0bcca12099ba6df87bbf77c1c
+MISC metadata.xml 1106 SHA256 4abdf5462bc8b972f11a9d1503e50f03d954b4d9e49fa6493c888cc073241d3d SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d WHIRLPOOL 1ee6288882ab14a94b1505b6cba958fa58298a0ccdffd0c8327c5515c2f29d6529b544dec6dc6175f67537f8249e41e0979badb9c7718859b2b6255b2dd91fe7
diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init
new file mode 100644
index 000000000000..84020224afc0
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.init
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload reopen"
+
+: ${ULOGD_BINARY:=/usr/sbin/ulogd}
+: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${ULOGD_WAIT:=200}
+: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
+
+depend() {
+ before iptables ip6tables ebtables nftables firewall
+ after mysql postgresql
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start \
+ --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \
+ -- ${ULOGD_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${SVCNAME} configuration"
+ start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
+ eend $?
+}
+
+reopen() {
+ ebegin "Reopening ${SVCNAME} logfiles"
+ start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
+ eend $?
+}
diff --git a/app-admin/ulogd/files/ulogd.logrotate b/app-admin/ulogd/files/ulogd.logrotate
new file mode 100644
index 000000000000..777e40097a5e
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.logrotate
@@ -0,0 +1,9 @@
+/var/log/ulogd/*.log {
+ sharedscripts
+ missingok
+ notifempty
+ create 0640 ulogd
+ postrotate
+ [ -f /run/ulogd.pid ] && /bin/kill -HUP $(cat /run/ulogd.pid)
+ endscript
+}
diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service
new file mode 100644
index 000000000000..e6c88fb810c3
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=A userspace logging daemon for netfilter/iptables related logging
+Before=iptables.service ip6tables.service ebtables.service nftables.service
+After=mysql.service postgresql.service
+
+[Service]
+Type=forking
+PIDFile=/run/ulogd.pid
+ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=network.target
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
new file mode 100644
index 000000000000..20ac91005d26
--- /dev/null
+++ b/app-admin/ulogd/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>itumaykin+gentoo@gmail.com</email>
+ <name>Coacher</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="json">Build JSON output plugin to save packets in JSON file format</flag>
+ <flag name="pcap">Build PCAP output plugin to save packets in libpcap file format</flag>
+ <flag name="nfacct">Build NFACCT input plugin to support traffic accounting via nfnetlink_acct</flag>
+ <flag name="nfct">Build NFCT input plugin to support stateful flow-based logging via nfnetlink_conntrack</flag>
+ <flag name="nflog">Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_log</flag>
+ <flag name="ulog">Build ULOG input plugin to support deprecated packet-based logging via ULOG target</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://bugzilla.netfilter.org/enter_bug.cgi?product=ulogd</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
new file mode 100644
index 000000000000..192a002f058a
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT_ID="62064f6a9e054739ecbdda010dbe9c3fd69bbaa2"
+
+inherit autotools eutils flag-o-matic linux-info readme.gentoo-r1 systemd user vcs-snapshot
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="http://git.netfilter.org/${PN}2/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite ulog"
+
+RDEPEND="
+ || ( net-firewall/iptables net-firewall/nftables )
+ >=net-libs/libnfnetlink-1.0.1
+ dbi? ( dev-db/libdbi )
+ json? ( dev-libs/jansson )
+ nfacct? (
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnetfilter_acct-1.0.1
+ )
+ nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+ nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+ mysql? ( virtual/mysql )
+ pcap? ( net-libs/libpcap )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/linuxdoc-tools
+ app-text/texlive-core
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+You must have at least one logging stack enabled to make ulogd work.
+Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
+"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 14; then
+ die "${PN} requires a kernel >= 2.6.14."
+ fi
+
+ if use nfacct && kernel_is lt 3 3 0; then
+ ewarn "NFACCT input plugin requires a kernel >= 3.3."
+ fi
+
+ if use ulog && kernel_is ge 3 17 0; then
+ ewarn "ULOG target has been removed in the 3.17 kernel release."
+ ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
+ fi
+
+ enewgroup ulogd
+ enewuser ulogd -1 -1 /var/log/ulogd ulogd
+}
+
+src_prepare() {
+ default_src_prepare
+
+ # Change default settings to:
+ # - keep log files in /var/log/ulogd instead of /var/log;
+ # - create sockets in /run instead of /tmp.
+ sed -i \
+ -e "s|var/log|var/log/${PN}|g" \
+ -e 's|tmp|run|g' \
+ ulogd.conf.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-lfs-flags
+ local myeconfargs=(
+ $(use_with dbi)
+ $(use_with json jansson)
+ $(use_enable nfacct)
+ $(use_enable nfct)
+ $(use_enable nflog)
+ $(use_with mysql)
+ $(use_with pcap)
+ $(use_with postgres pgsql)
+ $(use_with sqlite)
+ $(use_enable ulog)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default_src_compile
+
+ if use doc; then
+ # Prevent access violations from bitmap font files generation.
+ export VARTEXFONTS="${T}/fonts"
+ emake -C doc
+ fi
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doc/${PN}.html )
+
+ default_src_install
+ prune_libtool_files --modules
+ readme.gentoo_create_doc
+
+ doman ${PN}.8
+
+ use doc && dodoc doc/${PN}.{dvi,ps,txt}
+ use mysql && dodoc doc/mysql-*.sql
+ use postgres && dodoc doc/pgsql-*.sql
+ use sqlite && dodoc doc/sqlite3.table
+
+ insinto /etc
+ doins ${PN}.conf
+ fowners root:ulogd /etc/${PN}.conf
+ fperms 640 /etc/${PN}.conf
+
+ newinitd "${FILESDIR}/${PN}.init" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -o ulogd -g ulogd
+ keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest
new file mode 100644
index 000000000000..1d7a9d725351
--- /dev/null
+++ b/app-admin/usbview/Manifest
@@ -0,0 +1,5 @@
+DIST usbview-2.0.tar.gz 366337 SHA256 42511e4d43ddc5805bab0dea8aeeea54cc00462d229e04066ed5fb7c065d1b6b SHA512 87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f WHIRLPOOL 6c47fd33cee60f488164fadaaa87c826447fc33fab79526e7471423e251202e4ee62edaaca721052caf0922adc7bcf9f5c84b6e7237b8f7b6e8daeaa9b3d3324
+EBUILD usbview-2.0.ebuild 687 SHA256 88247a1669d8696c604aad0942b314648ea967950d38353407d45a8f21900d1c SHA512 dcbfe53a7099bda627bb260a893ef388a6da2cb1cfa859856d7db9bbeff27a5b7d348e7950d0c1e88805254f5f22105cc60f481e9d2e9d707cd65824249f405d WHIRLPOOL f30160c122da4940272e2e25f96bc99ee0cd1243d9af812e5d2a4f5c0caef7e820f70631e98eb932c1307e0ddf516c62837b9d7bddf6b3fe71874b42bc4cebb1
+MISC ChangeLog 2424 SHA256 7cec0d1c2d3bb423df56114a8f85aaa41311f2786b1e656dc6e4cd6a9d8d8757 SHA512 a69a34b250c77dca1c4c4a2005089faad69409b9dd9f636ac33a064d32a171b2a28ea214c6ebca100d49b48317f1a2696d724238e7a812f68fa7bf9dea185141 WHIRLPOOL ff4a912562231f73a7035ee5cbdb4358888d4c9723c7fe798c1cdc75e564c5e25b9682ad7384b2994e5ca2f954d55a388b54fab03ca931065e253aafa73507b3
+MISC ChangeLog-2015 5427 SHA256 3183b146735db943930bbbfd0fa6a2766444c1dc3d6a3b83091f1651acc46ff2 SHA512 b744f5bf648bc207b631da8c76f9b06a3389df2e6e14018417f6651f510a0bf1d42856f176545c688ada8b93c3d012ccccd2bcac812a531c6fee88d4839aadc3 WHIRLPOOL cf3be3af6457e8c88af55f7ce328048fc48377023a12e1f7537fabbfb6a8134f00ec92703446d945c7c69b08088a5c53429452302a9ca36af12417b1cabe8059
+MISC metadata.xml 276 SHA256 437f3dba7deca9da3b3f8ecda9bb5e97253de0412cbb3095d876f39140f3ea98 SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab WHIRLPOOL 8550fd604cf609511bf7c34245ebd6682dd6d058d8cbfa099a77c94d1afcf592909eb679a28a0806957ac0949c6cff350675e0182303ec5890a5e2c2c26d29c5
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
new file mode 100644
index 000000000000..2ba8e9e851e4
--- /dev/null
+++ b/app-admin/usbview/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-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild
new file mode 100644
index 000000000000..a57e2594af0c
--- /dev/null
+++ b/app-admin/usbview/usbview-2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="Display the topology of devices on the USB bus"
+HOMEPAGE="http://www.kroah.com/linux-usb/"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+pkg_setup() {
+ CONFIG_CHECK="~DEBUG_FS"
+ linux-info_pkg_setup
+}
+
+src_install() {
+ default
+ doicon usb_icon.xpm
+ make_desktop_entry ${PN} 'USB Viewer' usb_icon
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
new file mode 100644
index 000000000000..d64729ef5255
--- /dev/null
+++ b/app-admin/vault/Manifest
@@ -0,0 +1,14 @@
+AUX localhost.json.example 130 SHA256 b2b5f49e1971ad6500e996ab0e1e84a2f6529670393c4b1019bc457c5e81d030 SHA512 9f9bc222f3716942b7423fa2ab14afd1d516bf3f3170b7418a75b970a33341426e13f89cf331a5e25bd3159dcbb435e20e75a0c9109e767e67bf777a7dbcd182 WHIRLPOOL 360de035d86a7dadd4e004fe0359994e8e3d3882c1740d802baaf6391ab3498c062d949abed76730460019b5415aab41e26bf1104880baced4b467951d57ac5b
+AUX vault.confd 243 SHA256 302f038bbe2d20a5b1c034e760dedffa68c11895eb9e7660c50afc52eafd5126 SHA512 395d823dee49fed30d99fea1fcd1b0c1c3ae2bfd806fa0c169aa14d83a594d224f8966870799a3740a7e52f039616efe78834e0522e7a2802c7df4c56b3bbdd2 WHIRLPOOL b22ff911899cac2d483c60d51dc0a5b0eb7d7e69688d1417eb67f1e1ef4b7088d75d771f3f9c617b4fac70d314397289e59186f3cedc3eb7a4eab834d2e26e6e
+AUX vault.initd 542 SHA256 9b3fcd29f6677f9e88b9d9ee143836303c0a38b29d82dc8ae78d6f7fe9f1b7a6 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a WHIRLPOOL 7e23ff9d2ceb23fc7ca64e58ae51fd45b7c38ede2beaf08b1052600f6932cceaf065b390579fc7810ade62ca790b903e3b79870c23e78af3813649b65fe2cfb4
+AUX vault.logrotated 83 SHA256 9c899ee7d0afec8f80aaf66a35fc0c6f0587740e5e46a2a9ff25dcf858ff66a9 SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5 WHIRLPOOL 223f5e27f8224d6dfa34c1439104a2eb434183832748c7c75aa90bfe16138c300ae3c75f89f6073fac0bc5752228169a299b22aaaf9a982d8aae183489494b5f
+AUX vault.service 409 SHA256 a703ab5c1e57333b8bf03e9757749affbb1472c17ad9b19554bd6ead54da3e0d SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c WHIRLPOOL c34859683b03c218b7a46e0fa04806014506c67c9d4d9a5a23443a15de4924477671c3348ab21aaa2394649e47e3da492e1f215c9eb161f45f94ef8e111d1644
+DIST vault-0.7.3.tar.gz 6694636 SHA256 98409ae9c0e081e613a0e2288d2b5653582bb8bf57cb775cbff782d061a25708 SHA512 8632b4b721372cb0f5f684564ebe0749b7c1a9b5d0322b083773b3a2fd1734fb2eedee1aeb4b4c9431ce7f44c711ac0a95960c581165e1bac1a3754f8658e783 WHIRLPOOL d8eae9b3ed5d24a8b30dfec90360d2e5e4c94663b1bb168156b03724d6a2ff5dae1345474a02b67b1cde427419c07cc8a12bcbbe9b3db463a6c4f2a503832041
+DIST vault-0.8.2.tar.gz 7293367 SHA256 0e248c6cbf19ce8fb01fd31541d5a28b8c1c534b02256fb72bdc1d4d6aa462f2 SHA512 279056211aefbab09b6533ce5b0fea355511a84c3f21cbbae0fa08b0affd2254fcd0a9479a317d07e9b99c5a2bd6d8c9caa5c32f14f73b21d8c4be3f24345669 WHIRLPOOL f96be6c75a5fc1cf6db26f12270d00c028b665ea37589dba8087ade3e5bcd987cb9914188d990a9c6628045277226823accc4ffabeaf290e62f4f71cbb72a0d7
+DIST vault-0.8.3.tar.gz 8128509 SHA256 f7ba9d620478cbe4f4660f29b627b12244aadb59e87f30d8fed1b20c2fa8688b SHA512 e2b273ebb761246f6d85fc040d911a3f3a7beb0951fed4adcbe5df4106dd0cb013328b5816ef4153b2c4d363f7f2a14ae1c82bae9baaea74ef707ff0934d6c8d WHIRLPOOL 128afef1735add95cc0860fbc6b827d68d135d6a1b8171c176a1e38a96c7c88f8c349563ef46c6022d5937ba9672a0b23e526e57fa7b75c3afec8f6c3f4b54e2
+EBUILD vault-0.7.3-r1.ebuild 1438 SHA256 72b3e448b71e1290f318e9b85ab6321155cadbf257a101fa99315dd8824b7edb SHA512 5c7e1a13b75393f385d491a40c0754e012bc4f7e02f3625a8f4d79c43cfbe2320cbd248bc7d2c462268c843ccb259b91bad1bf44267314abff647eb48ee464a5 WHIRLPOOL f6bdc7e76ecc341b6adb48289563ac3c0cfc264ce89276fb9f7e2c6b294a330281931108a8780b7a3fd6f8cbf374e89e373fed3653a758f15a93adb3161814c9
+EBUILD vault-0.8.2.ebuild 1496 SHA256 d2694a8b31930eb87f2fcef5db4a9594176a1a4cea811948a9a96e05a30f2519 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8 WHIRLPOOL b2fcd2d45f64827791d58a175444787d86bdc06084e15d17672b6438080b8644605d20da55f28c6464736cf7e56b7bccc51eae4edfd172e5d3d94745eefc5363
+EBUILD vault-0.8.3.ebuild 1496 SHA256 d2694a8b31930eb87f2fcef5db4a9594176a1a4cea811948a9a96e05a30f2519 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8 WHIRLPOOL b2fcd2d45f64827791d58a175444787d86bdc06084e15d17672b6438080b8644605d20da55f28c6464736cf7e56b7bccc51eae4edfd172e5d3d94745eefc5363
+MISC ChangeLog 6007 SHA256 9585204b4ddddc0cd73c43f2c2062a006ba9cc0969c305e7565c0f0a87a6e971 SHA512 202c07c201b7bd4eeda2b8a46985fb715dbd880de8c6884ae6209625ccfe3b6d3c742b579c14d2b06b9a31a897a1c2156079d195be7d7847b8245fed1b1521f6 WHIRLPOOL 4dbda498176ac13edb12835eef4a572fdb07c019687daeabbc80519f56ca977d71cdf823e760d681c45314e53208d4bef4f168a69e145984ce48d3cc6fb11add
+MISC ChangeLog-2015 978 SHA256 ef1fbb6e2dfc9c03d96bfb5e0f4d764fc61254fb56166c90c42a4965d1139eb6 SHA512 c98580a36115007d5179b91d0d7cae0e8e749cadefc9e1bede62d145b68d7f2709ee84fd4ab81e02df04c603295f11533b2417b6d12f7aabcddc6d83bbf0ad39 WHIRLPOOL 32d816852e126c5126454255ec6e45b0ee26fc0f2f02bfb51931b3df66414629f2dfdc0aa93bbe79714fb804e24679e3c25d39401fee00c64500587ee4caf02e
+MISC metadata.xml 306 SHA256 2ad77eb17f40f9cce57e27781bbb02d88c52529219e641a550689bebf94f0318 SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787 WHIRLPOOL b89d7021ecfd8e98864d4694af37e53c7b02f3330fe6c7d5c97e4b30c3f811cd79194f87f6a2e2965748af088e75e7b211e47f05a82c2670060cc3fa01b24d00
diff --git a/app-admin/vault/files/localhost.json.example b/app-admin/vault/files/localhost.json.example
new file mode 100644
index 000000000000..02c377e424a9
--- /dev/null
+++ b/app-admin/vault/files/localhost.json.example
@@ -0,0 +1,9 @@
+backend "consul" {
+ address = "127.0.0.1:8500"
+ path = "vault"
+}
+
+listener "tcp" {
+ address = "127.0.0.1:8200"
+ tls_disable = 1
+}
diff --git a/app-admin/vault/files/vault.confd b/app-admin/vault/files/vault.confd
new file mode 100644
index 000000000000..6263ff00f911
--- /dev/null
+++ b/app-admin/vault/files/vault.confd
@@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: vault)
+# - pidfile (default: /run/vault/vault.pid)
+# - user (default: vault)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/vault.d"
diff --git a/app-admin/vault/files/vault.initd b/app-admin/vault/files/vault.initd
new file mode 100644
index 000000000000..d430bb8d39a9
--- /dev/null
+++ b/app-admin/vault/files/vault.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2015-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="vault server"
+group=${group:-${RC_SVCNAME}}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+
+command="/usr/bin/${RC_SVCNAME}"
+command_args="server ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+ --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+ need net
+}
diff --git a/app-admin/vault/files/vault.logrotated b/app-admin/vault/files/vault.logrotated
new file mode 100644
index 000000000000..66b827b9e693
--- /dev/null
+++ b/app-admin/vault/files/vault.logrotated
@@ -0,0 +1,7 @@
+/var/log/vault/vault.log {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git a/app-admin/vault/files/vault.service b/app-admin/vault/files/vault.service
new file mode 100644
index 000000000000..3071d0346277
--- /dev/null
+++ b/app-admin/vault/files/vault.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=vault server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=vault
+Environment=VAULT_SERVER_OPTS="-config=/etc/vault.d"
+ExecStart=/usr/bin/vault server $VAULT_SERVER_OPTS
+CapabilityBoundingSet=CAP_IPC_LOCK
+AmbientCapabilities=CAP_IPC_LOCK
+Capabilities=CAP_IPC_LOCK=ep
+SecureBits=keep-caps
+Restart=on-failure
+SuccessExitStatus=2
+
+[Install]
+WantedBy=default.target
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
new file mode 100644
index 000000000000..9f451f6533d7
--- /dev/null
+++ b/app-admin/vault/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>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/vault</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/vault/vault-0.7.3-r1.ebuild b/app-admin/vault/vault-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..332d32ddfc85
--- /dev/null
+++ b/app-admin/vault/vault-0.7.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-lang/go:=
+ dev-go/gox"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN}/scripts/build.sh || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ export GOPATH=${S}
+ cd src/${EGO_PN} || die
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin bin/${PN}
+}
diff --git a/app-admin/vault/vault-0.8.2.ebuild b/app-admin/vault/vault-0.8.2.ebuild
new file mode 100644
index 000000000000..e41ab098f405
--- /dev/null
+++ b/app-admin/vault/vault-0.8.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9:=
+ dev-go/gox"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN}/scripts/build.sh || die
+ sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ export GOPATH=${S}
+ cd src/${EGO_PN} || die
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin bin/${PN}
+}
diff --git a/app-admin/vault/vault-0.8.3.ebuild b/app-admin/vault/vault-0.8.3.ebuild
new file mode 100644
index 000000000000..e41ab098f405
--- /dev/null
+++ b/app-admin/vault/vault-0.8.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9:=
+ dev-go/gox"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN}/scripts/build.sh || die
+ sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ export GOPATH=${S}
+ cd src/${EGO_PN} || die
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin bin/${PN}
+}
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
new file mode 100644
index 000000000000..70b797d79c4d
--- /dev/null
+++ b/app-admin/verynice/Manifest
@@ -0,0 +1,9 @@
+AUX verynice 372 SHA256 2d1fa9f143bc792119641f96a6894079e523fa6cbcb55672422f924e7f3cf1f2 SHA512 b65b2f826b29ce19a237eace78518d0b31af0138caae0342c5354341dccd93cb13ffbf8d82acd1a52d0d710e62ae9d4a18a84e479c01c8931f78051daeab7e02 WHIRLPOOL 35d0e97c4ae418b88fd8ee6f52773cfeefd0618066268e6341c0e717554695c3cfea44a8f06fcaf0ff02f5982fbe9e15bfe4a328d31f8da2a0ec027c0bcc6038
+AUX verynice-1.1-build.patch 2525 SHA256 672c404f155a8be7e0ffa91997f25d2a13d16475a4c5821fead89108d3dd82c4 SHA512 8421776550e74a0d409cc3a02e65e96a047571abf0a7d5f0f1c97217978a150711bb7dd68b77abac044b4b7844970bed969151b166f91da20cd36c2c491bdee6 WHIRLPOOL 0bfea97c64dd76096150dc088c70dbf3ed62c25c46447a38aa23d08fcf439813ab04eccbed98daa4178659b6fa1184755bd9c238ea3f3a8d0968af658ba059a8
+AUX verynice.service 158 SHA256 f30efe2dbe6b87e637c458c7d618114b9cf9af5f3d12653de18aae9ff5a079f5 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148 WHIRLPOOL 7da0946a0b67425bf7e80b0d660bd5f9f601f86ac1364ccbd324bcfbd361e8721870f6d3112bfd593114cfeab6d6d866f5d648b06846f4f335705bbdd8f4aff2
+DIST verynice-1.1.tar.gz 37576 SHA256 5830fd4ac14ba3677e49159adbb7cd61e3d42d1f0b9aa73e4ed0aa154af6cd8d SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139 WHIRLPOOL ed1b7790aa333497e869830b2aacc3fa2289864e363bef3362ffee115c8afa0eb36b8cc29f255d87b929bb3dec3f8d9e839f30668c4572bccfdfb61f95da07c3
+EBUILD verynice-1.1-r2.ebuild 736 SHA256 b9e993eaed53518bf1f6489dbe249bd9bd276f1dfa40670e28c741f18116086f SHA512 37e77ad6769d2c19a4ab99a46299e154736d13c705e363d7a120c2957b00a638be1da544e2e4708d8d90bfd96057c24119eb8e979c3cb479e2f3e48e2a4ec4c8 WHIRLPOOL 9cdf4f6c4a1abd248c6e69a1d1ae6608405377b598d6f7c3752317153f220b2ec3f014ef2c41c98636db745219bb0e00dbd6dfd7541033e411dfbf5d805b165f
+EBUILD verynice-1.1-r3.ebuild 754 SHA256 4c8710e76495a84aa6c88f0957d60b09cb4eedcd0806547099a1186da80f662d SHA512 0feb88b732d9fa3df7d98e6d23ef34925a6964e9f8b6b9735540dc64c161309c1324b1bdee4230411812fe3d5f81fcdc688c0c84146b1c53b366253c29626512 WHIRLPOOL ad480c9738c8c9a02c35991fb8fa3a6e5aa52a65f6d9b0154d2d7e1d782282c8eb7969fcb8789661d58b7d000e12e6279209afd2824ff6bf45b4167322ad5c26
+MISC ChangeLog 2852 SHA256 e5d22061349d09a387f68ab8902297e9cfa732e4ed3e402ae36a9a856cecc037 SHA512 6ad1fca8df9baee0273af1fe101bb202ac9d21b8f30648d328388255d8520267f15ea98786ebbb66b7acb52f9928dcb79731c7ac5a8b01b486981fd663311c9e WHIRLPOOL 63467c91d453d1ea1dffba7c0a5d54f2bcd0b25e1043c055477eca2ac4bbe6b264efadf83ddeb90e7fbf47cce3130ab2cf93bb1a769f0bcf11a9a03f4b3d179a
+MISC ChangeLog-2015 3149 SHA256 75a73a476bc518e6f9c340de91e2de5e0d10ae5fdd26a0a6afc252e2b9810aac SHA512 03775f2ff4bc4a4f869af79e34932c6d5e97eb8302d9b32b21377bb2bf93d8ee6836944fc65b7a971a79ffe6de27564ef3bb8665834ab3dbd58ed43f11b7d584 WHIRLPOOL b444af9a2853805f67ece6690e9fed95e0d67d25761596b4dd786b726d8cc968af7fb26a40d078162ab1964f3823a210c9590f4c348cf89c2465d926c741e0eb
+MISC metadata.xml 318 SHA256 599a02a95b9b6acbf1de977d70ecef843f89e47d5146771fa6ef4022f45eff82 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46 WHIRLPOOL d44b2cc71ae157e56bec07d53ef9776834a36b91c054988475e3e44a4a6ebbf9f1260c390937983765a156e9db43228e20c423a0a0fa338692dc36136c39c2f8
diff --git a/app-admin/verynice/files/verynice b/app-admin/verynice/files/verynice
new file mode 100644
index 000000000000..4aa89cf73b2a
--- /dev/null
+++ b/app-admin/verynice/files/verynice
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ after checkroot root
+}
+
+start() {
+ ebegin "Starting verynice"
+ /usr/sbin/verynice -d /var/run/verynice.pid
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping verynice"
+ start-stop-daemon --stop --quiet --pidfile=/var/run/verynice.pid
+ eend $?
+}
diff --git a/app-admin/verynice/files/verynice-1.1-build.patch b/app-admin/verynice/files/verynice-1.1-build.patch
new file mode 100644
index 000000000000..a70202b99300
--- /dev/null
+++ b/app-admin/verynice/files/verynice-1.1-build.patch
@@ -0,0 +1,73 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Dec 26 19:46:44 UTC 2012
+Subject: build system
+
+respect flags, add LDFLAGS to linker line
+fix install rules
+
+--- Makefile
++++ Makefile
+@@ -15,13 +15,15 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+-CC = gcc
++CC ?= gcc
+
+
+ RPM_BUILD_ROOT=
+
+ # PREFIX is usually either /usr or /usr/local
+ PREFIX=/usr/local
++BINDIR=$(PREFIX)/sbin
++ETCDIR=/etc
+ TARGET=linux
+
+
+@@ -32,8 +34,8 @@
+ VERSION=1.1
+
+ #CFLAGS= -I../include/ -O3 -Wimplicit
+-CFLAGS= -I../include/ -g -Wimplicit -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\"
+-LINK = gcc
++CFLAGS += -Wimplicit
++CPPFLAGS = -I../include/ -DPREFIX=\"$(PREFIX)\" -DTARGET_$(TARGET) -DVERSION=\"$(VERSION)\"
+ AG = /home3/sdh4/anagram/ag_unix_dev/ag
+
+
+@@ -55,20 +57,15 @@
+ (cd .. ; tar cvzf verynice-$(VERSION).tar.gz verynice/ )
+
+ install:
+- $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/sbin
+- $(INSTALL) verynice $(RPM_BUILD_ROOT)$(PREFIX)/sbin
+- if [ $(PREFIX) = "/usr" ]; then \
+- mv -f $(RPM_BUILD_ROOT)/etc/verynice.conf $(RPM_BUILD_ROOT)/etc/verynice.conf~ ; \
+- $(INSTALL) verynice.conf $(RPM_BUILD_ROOT)/etc ; \
+- else \
+- $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \
+- mv -f $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc/verynice.conf~ ; \
+- $(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(PREFIX)/etc ; \
+- fi
++ $(INSTALL) -d $(RPM_BUILD_ROOT)$(BINDIR)
++ $(INSTALL) verynice $(RPM_BUILD_ROOT)$(BINDIR)
++ $(INSTALL) -d $(RPM_BUILD_ROOT)$(ETCDIR)
++ $(INSTALL) -m 644 verynice.conf $(RPM_BUILD_ROOT)$(ETCDIR)
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc
+ $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+- $(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
++ $(INSTALL) -d $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html
++ $(INSTALL) -m 644 verynice.html $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)/html
+ $(INSTALL) -m 644 README $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+ $(INSTALL) -m 644 README.SYN $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+ $(INSTALL) -m 644 COPYING $(RPM_BUILD_ROOT)$(PREFIX)/share/doc/verynice-$(VERSION)
+@@ -95,7 +92,7 @@
+ $(AG) $*
+
+ verynice: verynice.o config.o linklist.o stringstack.o
+- $(LINK) -g -o $@ $^ -lm
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+
+
+
diff --git a/app-admin/verynice/files/verynice.service b/app-admin/verynice/files/verynice.service
new file mode 100644
index 000000000000..e85ef4c895b2
--- /dev/null
+++ b/app-admin/verynice/files/verynice.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=A tool for dynamically adjusting the nice-level of processes
+
+[Service]
+ExecStart=/usr/sbin/verynice
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
new file mode 100644
index 000000000000..a1dec792eedb
--- /dev/null
+++ b/app-admin/verynice/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">
+ A tool that can dynamically adjust the nice-level of processes under
+ Unix-like operating systems.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/verynice/verynice-1.1-r2.ebuild b/app-admin/verynice/verynice-1.1-r2.ebuild
new file mode 100644
index 000000000000..65f4d5d73eea
--- /dev/null
+++ b/app-admin/verynice/verynice-1.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
+HOMEPAGE="http://thermal.cnde.iastate.edu/~sdh4/verynice/"
+SRC_URI="http://thermal.cnde.iastate.edu/~sdh4/verynice/down/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+ tc-export CC
+ emake RPM_BUILD_ROOT="${D}" PREFIX=/usr
+}
+
+src_install(){
+ emake RPM_BUILD_ROOT="${D}" PREFIX=/usr VERSION=${PVR} install
+ doinitd "${FILESDIR}"/verynice
+ systemd_dounit "${FILESDIR}"/verynice.service
+}
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
new file mode 100644
index 000000000000..48d766226b46
--- /dev/null
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
+HOMEPAGE="https://web.archive.org/web/20130621090315/ http://thermal.cnde.iastate.edu/~sdh4/verynice/"
+SRC_URI="http://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ default
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+ tc-export CC
+ emake RPM_BUILD_ROOT="${D}" PREFIX=/usr
+}
+
+src_install(){
+ emake RPM_BUILD_ROOT="${D}" PREFIX=/usr VERSION=${PVR} install
+ doinitd "${FILESDIR}"/verynice
+ systemd_dounit "${FILESDIR}"/verynice.service
+}
diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
new file mode 100644
index 000000000000..1c4c55dca05c
--- /dev/null
+++ b/app-admin/watchfolder/Manifest
@@ -0,0 +1,7 @@
+AUX 0.3.3-64bit.patch 450 SHA256 a6beb5fe94a21cc538f11cda3f9569ba6f24b6f44d11ba22811837ad9049ab03 SHA512 86d6e072904fed5a168398fd80f648b30a9346745dac7b6ee460122e205f8f627aa4bfff78b007726af95b711c4bb91ca8282ca1a000e6954bf6d33e399f18c0 WHIRLPOOL 4e1ff0f2d40d46081df3b6ac37fc281b50ac9364d915bc4d4ad352bdb34abadc32d1d4ea904c6553e64fa53726b06b88ee8fb0e4024364182b70650c919d244d
+AUX 0.3.3-fortify-sources.patch 410 SHA256 510d479034c0717ecc56601e0324dbefe2540a2a01fa60e7be7bd34ce47b7cce SHA512 0e3b372b9eaf1f4874ecbf7135ed67e1dcf62366516215a5d5fc5a1288893385b24f1d34855fc134eaad0dc29562ec4de0c90365ce87b7071234fcb1750e4676 WHIRLPOOL 1471793504a7f63449f8bac94ebe3737327388431a61ba90c07ae37c83eceb204934779e4cb66c7624c4c86b8a15b82191941c561e609ed7a4a60fb88beea3ad
+DIST watchfolder-0.3.3.tar.gz 86741 SHA256 fa853937d27eeae5acc492f1ade53298ae40cfc0094539dd36a9fdb87dda1846 SHA512 162a3535748d280d06db8b05ddc4c87b578ff4be08aeb7a08858c28fd4612f46c4b8ed866513283edcd6ad24207c94a02e562200ae102d1897b4b28be6717dc6 WHIRLPOOL 9f0cd5b84336530fbbd6e6c0227eb2b8f438716692aa9bec46636623bd69779daa6e851315aeaf186a70b54061a3330c283164ead833f19c6b2f50ef3a9ef60d
+EBUILD watchfolder-0.3.3-r1.ebuild 877 SHA256 2589ce6e370435fbc46f6952095bb26fd3417f14d55777dccd51cff048af5cb0 SHA512 d84172d22d08f541039e3b74816d2745ac0dd8484bd912c3e81ef20d42aed241aa3bf310c14903e6619765010bb167d343f8c8c3abec7e9949bfafd3e68a60f2 WHIRLPOOL 6c007f441a3a759530a2e779e94ecbc09aac606c6be459250ae50a4c46ccbeccf35a7b1745c8ae467dfac4b7936c1d9785373465efcb1380619235f48257a628
+MISC ChangeLog 2599 SHA256 de6d0665113bfe3fbbc6efb63341f1ddb58fb7e455616c5e2a0b02dfbfbb3df2 SHA512 c1a71d6e80ded00eec503ea0221c722470af358a10da020da7abc7cefac5cc31656cfd6e029ccaaf8265d0821ef5819c12be0ae781413a4659db19492f5fe53e WHIRLPOOL a6936a4ed329b2a8cad483d423c96bd9ec49742c226aec2addcc4750839418c7d393356c88de4e0a95dc6a62e22a7f4b0a67d32b8a1fcc548d50de2845355f03
+MISC ChangeLog-2015 2056 SHA256 4f0aec2262670b88325f9cb7bb07be94b62a6989fd7283a1da11ccd9a134fca1 SHA512 937b0124957cdefc2bcb0338921df3fff355cd997650ff5bf8284115a60accee2f9b4ffb7cec78c03fb3b5a684b8fd43cc0cbbce6b932d904438d4a46e5dde12 WHIRLPOOL 67d04dd550556556a03548db0aaf57996485c88ee1d1c3f26cc9101b856baf5fc3f5d9f516680f548d007f22199752947b73c8cfc8feb659d79b5e746c2b521c
+MISC metadata.xml 241 SHA256 652f2c2e9c03f8ec09de82cc9fb9570b84a093e4f67868d1ef7f61fa32d73923 SHA512 9e7d032c1d5e4be915c726c4a312eb2bdad6eb036827f2aceecf5f370bbc255e72ee420816646fe639a607dee0f5d112d843e897183f8c587ec866fe8248b452 WHIRLPOOL 1abc35e4601fa780d56e89d574b9406796a64eeee14b4ef142f20aed0fc889400efd4156d5b5f9c3aa6db0467786984ac06ae1996232e43767e785b52e02b60d
diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch
new file mode 100644
index 000000000000..070e9c019d26
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-64bit.patch
@@ -0,0 +1,11 @@
+--- a/watchd.c 2006-02-23 12:33:32.000000000 -0500
++++ b/watchd.c 2006-02-23 12:45:30.000000000 -0500
+@@ -176,7 +176,7 @@
+ // free(p2tmp);
+
+ p2tmp=strchr(p2,0xa); // Not very nice,
+- p2[(int)p2tmp-(int)p2]=0x00; // but in fact: It works ;)
++ *(p2+(p2tmp-p2))=0x00; // but in fact: It works ;)
+
+ while (p2[0]==' ') {p2++;} // Again, quick and dirty..
+ while (p1[strlen(p1)-1]==' ') {p1[strlen(p1)-1]=0;} // Need to say anything?;)
diff --git a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
new file mode 100644
index 000000000000..175e8ed29ec3
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
@@ -0,0 +1,11 @@
+--- a/watchd.c 2009-02-27 23:46:42.000000000 +0000
++++ b/watchd.c 2009-02-27 23:50:22.000000000 +0000
+@@ -671,7 +671,7 @@
+ {
+ if (folder->flags&FL_LOG_FILE)
+ {
+- log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND );
++ log=open(curfolder->logfile, O_CREAT | O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR );
+ if (log>0)
+ {
+ lseek(fd, SEEK_SET, 0); // Rewind temp log file..
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
new file mode 100644
index 000000000000..b837dfa17fef
--- /dev/null
+++ b/app-admin/watchfolder/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">watchd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..ff216bde996b
--- /dev/null
+++ b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="watches directories and processes files"
+HOMEPAGE="http://freshmeat.net/projects/watchd/"
+SRC_URI="http://dstunrea.sdf-eu.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${P/folder/d}"
+
+PATCHES=(
+ # patch to remove warnings on 64 bit systems
+ "${FILESDIR}"/${PV}-64bit.patch
+ # and a gcc 4.3.3 / fortify_sources fix
+ "${FILESDIR}"/${PV}-fortify-sources.patch
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e '/-c -o/s:OPT:CFLAGS:' \
+ -e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \
+ -e 's:gcc:$(CC):' \
+ Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin watchd
+ insinto /etc
+ doins watchd.conf
+ dodoc README doc/*
+}
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
new file mode 100644
index 000000000000..7aaab2eeff64
--- /dev/null
+++ b/app-admin/webalizer/Manifest
@@ -0,0 +1,14 @@
+AUX apache.webalizer 203 SHA256 9cc52c0cd26f7163388d9867f1d518abe9f0954389d64722222bece5d5adb56b SHA512 19145c1d74322f2f6724bde7c5ef0c0111489566ba3ba8dcdeba38681332250e77e26652ccc2b6ff1a41f7dc7795c34a4c5e189cf92b24fe0ad544c4afac40b0 WHIRLPOOL fc31cd0cb30112c5a4f7e969e1771e081e13f14ec01def10c20644b99cc2a1cfa6f68804c942e584fd2471da3cfb435ae5c4486d3321a3e84c1a8c74e420ed69
+AUX webalizer-language-list.txt 1520 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 SHA512 52abca2565a8d06d8bf538b8c168b32dbb065e655a4c849d6ff1e1299c4e84d6f9717b7e74ef730a9c68cd63f2d03232ae5c9d1ba391f68e3f1314444e41c29a WHIRLPOOL 6a13c2336b59a6e7f693f3133b2e080fd9d135fd837eb1811677c982ec4f5b4d35fbdf55aa22079f814ce1d8d618ec09ff2a4f58a2947332ac0cee304757b4f1
+DIST webalizer-2.23-05-RB29-patch.tar.gz 45853 SHA256 e212d1928315805b655bcb2614cf9e128373c80601ed6b7ee82ae6d050232a44 SHA512 967a5418e858adb5be8b64bac7edb52ac6eca8bce567269866f2ae7ac6e34c09d2d0ab1d7e7cfcbd92972cf5ea05ac2abaea2058e6fa9273e27cf10aacfb4759 WHIRLPOOL 2ac54d38f160e4311b240e00e6b33c0523341418a32190a3fdd2ba13a226fd53c986ea6d8e127f3444dec03c2801d984964f08141ee8e329e198dde520a6e76c
+DIST webalizer-2.23-05-src.tar.bz2 308238 SHA256 afc88b8ee0927d9ed004962cb7e3d3054ef7628c7bc8a7b2e3ea1d758a47885a SHA512 4840c2ba25e34d5e276c724c311d2c2d7a0223dcbf6dec567960f56bc4cdfe4f6a1e412e3fcab53395d6357377f4f8d2b3bcc4b23c46a3ec6a895813a681cd4b WHIRLPOOL 82e092ae6e21e3bd3f70cd53a2dc6b71ed3903f640d7e4d2aa5be81ad43cf8aea54f0dd1d3fc02f55a615b1b9208ec339ccadcfa342737e61ebb0404f7fddfe1
+DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 SHA256 cfd12f33a869e6eb2cf94165a75f733f205d85ba78345ce35b0b1bbce1a6aa93 SHA512 142674cb7de6e1833ed9bf7587d5d3b1fce64eb95b7448392d0e8ec6e89dcd69cdb6900b75db9c283b19e5423392f76565b5ad279748da656ed2061fb180c949 WHIRLPOOL 639be013978da35219f06866475268a89ae098d9ad10d43e4d03d8610c0d485c9ea47ed61ee41182d012841aa093babae334ec83ff5b941081c1afe3e0e545f2
+DIST webalizer-2.23-08-src.tar.bz2 308090 SHA256 b37524fbd98e97052a80d59f75e69f857468752cf74cc0eb0972e5fab02eb6f7 SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd WHIRLPOOL 78f16d7a0bc0eda3cc03b2f9e62d5a722d9aa0935ed17b7ce102f3b3634e3b20476c80305dc887cfcc6a858fd0898e1e456d2cf9bf3275a854c8ab7ee126f779
+DIST webalizer-geodb-20140201.tgz 733070 SHA256 27abf8f48c76e63deae2ea86cd2c2ebe8ddd41a493d57289ae3a56ba1c7e5aaf SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223 WHIRLPOOL 33ee071e70219abee3c794e3b60d18a1cfe7ed83495b41355b270398c696e8688f25155ee8e5b9d37f92da41904367d904ab91f565ba5005d32f401350a3b93d
+DIST webalizer-geodb-latest.tgz 639447 SHA256 f2a1bd7fcc9c93ed6a627bd15f2c31866d5a6c6b7dd48852d84a129386327218 SHA512 0f32d1249902e17f37cd0e7680004262bbe5b4a34a00d882319258c6aed80503e89ed192d8365731ab507fa54560082ae16c7023d0bc2232350709106be24117 WHIRLPOOL 26f1edf87ea6102c5047b41702fd273d40360bde7c481183a3303e2c89af3d6ba7470cd942d4af1574bed8822b776a26ea13c2388b7654fffccee856cc99e571
+DIST webalizer.conf.gz 8986 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b WHIRLPOOL 58c2ced08eeba65e1c7acf951e2e0e1806af58fcd37997c4d824504235303d7f75cf6c05c7ce051e2e2f3b3abff9a929f0dfd7722a995a8ab65232cfb549e83a
+EBUILD webalizer-2.23.05.ebuild 3813 SHA256 c2c7da1fb09f0e75cedc13b29239ed895f65292529db8720e3e4671defdb4040 SHA512 c81bdbb98168cb608c9eee163e71dbea85c487f16034fad1d772880f6b0b5350aa071fc5f3e870eaf49e8bfa5c6354c31c93866d8faaff9cec0843993afcde24 WHIRLPOOL 611dcb39ca3c13bb23f9d515f6b82020d3b47ed02de3e32a8715c3536dede0cf89bac240d923796183067ed92cdb51f90756a2ea8399e7e44c92fa248b56c7b1
+EBUILD webalizer-2.23.08.ebuild 4225 SHA256 09d68235077da9545f9d6da16e11869ec9529a6a0b8d6c19c94559876401cf43 SHA512 a96bd5fb52a69e9b581ace1bde54b8bf16743955cb09e130e4cf022bb77e4afb49495c9d5437a26568bd92376f24b3f545112f50c3abdfdef72c904a53aa6b11 WHIRLPOOL eb90481fd6b2911be3b8cd9ac63993481d48abfe8bb355997b7634c223f0d33cbc165a8d7bd5183fa2528d6dc01b793774475c06398db96c069234d7bcad0fc8
+MISC ChangeLog 3112 SHA256 906d60fe61fa728588a847d072435782e879a0392f1cd6f44f5d610e369f83a3 SHA512 b7748d748e8572d6ad7245c1dbd49866c919e636e94f88daf0b3d7acd945e61449692f28906213b4811c709d1ad2484c57955479d9e7b92421a2f4d62f0a44ec WHIRLPOOL 014cf0aeb13f2ae64041b56b64a16452ba167bee0f692d492f3834eb9b392bbabecbf4098b3580e8e911a11cad458a24e22bbffcbad98d5c2d210f3872ead9a5
+MISC ChangeLog-2015 15301 SHA256 5e37a935347f1ac8d4f87ff5cd8c12b348dbf8bc8eac3cc5c4f9b5517bcf96b3 SHA512 f34763f8579ea4ec1fd2d0896c5fa8714146dcb514995640def311e085626c493540716b90644c6bcc2070402199b0141e2629680d4ac22aad69309bd8b5003f WHIRLPOOL 969e84ce3490f49ee4622d7ccf9322373f456dfcf5ca36d2656f6af036d10a359f069718a43ddbc461b6fca9bf40d25c271a5e80a9c533866e26653e87eaf6f8
+MISC metadata.xml 434 SHA256 022b6104c0d41a25ba2a6e75bfcd27eb29420d8753fe7d53a6be55a5771febe3 SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149 WHIRLPOOL d153a94cf7d8636cc62fd7865d480a680838039aea5926d59fbcd184e3af318c787cd03735442bb6155414043f41b71a33def70dd33ebb80410f798c9548dd21
diff --git a/app-admin/webalizer/files/apache.webalizer b/app-admin/webalizer/files/apache.webalizer
new file mode 100644
index 000000000000..0dbab4111a92
--- /dev/null
+++ b/app-admin/webalizer/files/apache.webalizer
@@ -0,0 +1,9 @@
+# This is the config snippet for Webalizer
+<Directory "/var/www/localhost/htdocs/webalizer">
+ Options None
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+</Directory>
+
+# vim: ts=4 filetype=apache
diff --git a/app-admin/webalizer/files/webalizer-language-list.txt b/app-admin/webalizer/files/webalizer-language-list.txt
new file mode 100644
index 000000000000..ed9e3232417b
--- /dev/null
+++ b/app-admin/webalizer/files/webalizer-language-list.txt
@@ -0,0 +1,136 @@
+aa afar
+ab abkhazian
+af afrikaans
+am amharic
+ar arabic
+as assamese
+ay aymara
+az azerbaijani
+ba bashkir
+be byelorussian
+bg bulgarian
+bh bihari
+bi bislama
+bn bengali
+bo tibetan
+br breton
+ca catalan
+co corsican
+cs czech
+cy welsh
+da danish
+de german
+dz bhutani
+el greek
+en english
+eo esperanto
+es spanish
+et estonian
+eu basque
+fa persian
+fi finnish
+fj fiji
+fo faeroese
+fr french
+fy frisian
+ga irish
+gd gaelic
+gl galician
+gn guarani
+gu gujarati
+ha hausa
+hi hindi
+hr croatian
+hu hungarian
+hy armenian
+ia interlingua
+ie interlingue
+ik inupiak
+in indonesian
+is icelandic
+it italian
+iw hebrew
+ja japanese
+ji yiddish
+jw javanese
+ka georgian
+kk kazakh
+kl greenlandic
+km cambodian
+kn kannada
+ko korean
+ks kashmiri
+ku kurdish
+ky kirghiz
+la latin
+ln lingala
+lo laothian
+lt lithuanian
+lv latvian
+mg malagasy
+mi maori
+mk macedonian
+ml malayalam
+mn mongolian
+mo moldavian
+mr marathi
+ms malay
+mt maltese
+my burmese
+na nauru
+ne nepali
+nl dutch
+no norwegian
+oc occitan
+om oromo afan
+or oriya
+pa punjabi
+pl polish
+ps pashto
+pt portuguese
+qu quechua
+rm rhaeto-romance
+rn kirundi
+ro romanian
+ru russian
+rw kinyarwanda
+sa sanskrit
+sd sindhi
+sg sangro
+sh serbo-croatian
+si singhalese
+sk slovak
+sl slovenian
+sm samoan
+sn shona
+so somali
+sq albanian
+sr serbian
+ss siswati
+st sesotho
+su sudanese
+sv swedish
+sw swahili
+ta tamil
+te tegulu
+tg tajik
+th thai
+ti tigrinya
+tk turkmen
+tl tagalog
+tn setswana
+to tonga
+tr turkish
+ts tsonga
+tt tatar
+tw twi
+uk ukrainian
+ur urdu
+uz uzbek
+vi vietnamese
+vo volapuk
+wo wolof
+xh xhosa
+yo yoruba
+zh chinese
+zu zulu
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
new file mode 100644
index 000000000000..dc3cf7c59bb9
--- /dev/null
+++ b/app-admin/webalizer/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>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <use>
+ <flag name="xtended">Include the 404 extension</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/webalizer/webalizer-2.23.05.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
new file mode 100644
index 000000000000..5dbba1424e70
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.23.05.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="2"
+
+inherit versionator eutils webapp db-use
+
+WEBAPP_MANUAL_SLOT="yes"
+XTENDED_VER="RB29"
+XTENDED_URL="rb29"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.webalizer.org/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+ xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+ ftp://ftp.mrunix.net/pub/webalizer/webalizer-geodb-latest.tgz
+ mirror://gentoo/${PN}.conf.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
+IUSE="geoip nls xtended"
+SLOT="0"
+
+DEPEND=">=sys-libs/db-4.2
+ >=sys-libs/zlib-1.1.4
+ >=media-libs/libpng-1.2
+ >=media-libs/gd-1.8.3[png]
+ dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ webapp_pkg_setup
+
+ # USE=nls has no real meaning if LINGUAS isn't set
+ if use nls && [[ -z "${LINGUAS}" ]]; then
+ ewarn "you must set LINGUAS in /etc/portage/make.conf"
+ ewarn "if you want to USE=nls"
+ die "please either set LINGUAS or do not use nls"
+ fi
+}
+
+src_prepare() {
+ if use xtended; then
+ epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
+ fi
+}
+
+src_configure() {
+ # really dirty hack; necessary due to a really gross ./configure
+ # basically, it just sets the natural language the program uses
+ # unfortunatly, this program only allows for one lang, so only the first
+ # entry in LINGUAS is used
+ if use nls; then
+ local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
+ local myconf="${myconf} --with-language=${longlang:3}"
+ else
+ local myconf="${myconf} --with-language=english"
+ fi
+
+ econf --enable-dns \
+ --with-db=$(db_includedir) \
+ --with-dblib=$(db_libname) \
+ ${myconf} \
+ $(use_enable geoip) \
+ --with-geodb=/usr/share/webalizer/geodb \
+ || die "econf failed"
+}
+
+src_install() {
+ webapp_src_preinst
+
+ dobin webalizer
+ dosym webalizer /usr/bin/webazolver
+ doman webalizer.1
+
+ insinto /etc
+ doins "${WORKDIR}"/${PN}.conf
+ dosed "s/apache/apache2/g" /etc/webalizer.conf
+
+ insinto /usr/share/webalizer/geodb
+ doins "${WORKDIR}"/GeoDB.dat
+
+ dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog
+ elog "It is suggested that you restart apache before using webalizer"
+ elog "You may want to review /etc/webalizer.conf and ensure that"
+ elog "OutputDir is set correctly"
+ elog
+ elog "Then just type webalizer to generate your stats."
+ elog "You can also use cron to generate them e.g. every day."
+ elog "They can be accessed via http://localhost/webalizer"
+ elog
+ elog "A sample Apache config file has been installed into"
+ elog "/usr/share/doc/${PF}/apache.webalizer"
+ elog "Please edit and install it as necessary"
+ elog
+
+ if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
+ ewarn
+ ewarn "You have more than one language in LINGUAS"
+ ewarn "Due to the limitations of this package, it was built"
+ ewarn "only with ${LINGUAS:0:2} support. If this is not what"
+ ewarn "you intended, please place the language you desire"
+ ewarn "_first_ in the list of LINGUAS in /etc/portage/make.conf"
+ ewarn
+ fi
+
+ if use xtended; then
+ ewarn
+ ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
+ ewarn "you will need to delete webalizer.current and process all previous"
+ ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
+ ewarn "For more information about using XTENDED webalizer, see:"
+ ewarn
+ ewarn " http://www.patrickfrei.ch/webalizer/rb15/INSTALL"
+ ewarn
+ fi
+
+ webapp_pkg_postinst
+}
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
new file mode 100644
index 000000000000..d46677fe626d
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+
+EAPI="5"
+
+inherit versionator eutils webapp db-use
+
+WEBAPP_MANUAL_SLOT="yes"
+XTENDED_VER="RB30"
+XTENDED_URL="rb30"
+
+MY_PV="$(get_version_component_range 1-2)-$(get_version_component_range 3)"
+MY_P="${PN}-${MY_PV}"
+
+GEODB_DATE="20140201"
+GEODB_URL="ftp://ftp.mrunix.net/pub/webalizer/geodb/"
+GEODB_DIR="/usr/share/webalizer/geodb"
+
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.webalizer.org/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+ xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz )
+ https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz
+ ${GEODB_URL}/webalizer-geodb-${GEODB_DATE}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bzip2 xtended geoip nls"
+SLOT="0"
+
+DEPEND=">=sys-libs/db-4.2
+ >=sys-libs/zlib-1.1.4
+ >=media-libs/libpng-1.2:0=
+ >=media-libs/gd-1.8.3[png]
+ dev-libs/geoip
+ bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ webapp_pkg_setup
+
+ # USE=nls has no real meaning if LINGUAS isn't set
+ if use nls && [[ -z "${LINGUAS}" ]]; then
+ ewarn "you must set LINGUAS in /etc/portage/make.conf"
+ ewarn "if you want to USE=nls"
+ die "please either set LINGUAS or do not use nls"
+ fi
+}
+
+src_prepare() {
+ if use xtended; then
+ epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch
+ fi
+}
+
+src_configure() {
+ # really dirty hack; necessary due to a really gross ./configure
+ # basically, it just sets the natural language the program uses
+ # unfortunatly, this program only allows for one lang, so only the first
+ # entry in LINGUAS is used
+ if use nls; then
+ local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)"
+ local myconf="${myconf} --with-language=${longlang:3}"
+ else
+ local myconf="${myconf} --with-language=english"
+ fi
+
+ econf --enable-dns \
+ --with-db=$(db_includedir) \
+ --with-dblib=$(db_libname) \
+ ${myconf} \
+ $(use_enable geoip) \
+ $(use_enable bzip2 bz2) \
+ --with-geodb=${GEODB_DIR} \
+ || die "econf failed"
+}
+
+src_install() {
+ webapp_src_preinst
+
+ dobin webalizer
+ dosym webalizer /usr/bin/webazolver
+ doman webalizer.1
+
+ insinto /etc
+ doins "${WORKDIR}"/${PN}.conf
+
+ insinto ${GEODB_DIR}
+ doins "${WORKDIR}"/GeoDB.dat
+
+ dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer
+
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog
+ elog "It is suggested that you restart apache before using webalizer"
+ elog "You may want to review /etc/webalizer.conf and ensure that"
+ elog "OutputDir is set correctly"
+ elog
+ elog "Then just type webalizer to generate your stats."
+ elog "You can also use cron to generate them e.g. every day."
+ elog "They can be accessed via http://localhost/webalizer"
+ elog
+ elog "A sample Apache config file has been installed into"
+ elog "/usr/share/doc/${PF}/apache.webalizer"
+ elog "Please edit and install it as necessary"
+ elog
+
+ if [[ ${#LINGUAS} -gt 2 ]] && use nls; then
+ ewarn
+ ewarn "You have more than one language in LINGUAS"
+ ewarn "Due to the limitations of this package, it was built"
+ ewarn "only with ${LINGUAS:0:2} support. If this is not what"
+ ewarn "you intended, please place the language you desire"
+ ewarn "_first_ in the list of LINGUAS in /etc/portage/make.conf"
+ ewarn
+ fi
+
+ if use xtended; then
+ ewarn
+ ewarn "If you are upgrading webalizer from USE=-xtended to USE=xtended"
+ ewarn "you will need to delete webalizer.current and process all previous"
+ ewarn "days in the same month using 'webalizer /path/to/access_log.1'."
+ ewarn "For more information about using XTENDED webalizer, see:"
+ ewarn
+ ewarn " http://www.patrickfrei.ch/webalizer/rb30/INSTALL"
+ ewarn
+ fi
+
+ if use geoip; then
+ elog
+ elog "Note: we have installed the GeoDB.dat dated ${GEODB_DATE}."
+ elog "But you may want to upate to the latest version which is"
+ elog "available at ${GEODB_URL}. Replace the GeoDB.dat file in"
+ elog "${GEODB_DIR} with the newer version."
+ elog
+ fi
+
+ webapp_pkg_postinst
+}
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
new file mode 100644
index 000000000000..8c0fea220c17
--- /dev/null
+++ b/app-admin/webapp-config/Manifest
@@ -0,0 +1,16 @@
+AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c
+AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 SHA256 83ad478f41ee6a6035a5c3d492129cee8dc28ce068216ca36db8e7ce323e04b9 SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d WHIRLPOOL 13f4d1462456d6dd6097fe36a537a931a751056ca5e9281cd2e7476311cbe4ce776305532d876bacf86f95b137d61d3d2691d624c75fa61d4d78ea8476371fee
+AUX webapp-config-1.54-fix-bashism.patch 400 SHA256 546b22c9534946fe79a27509140f52197af2b58626f8c2149bf0d7e3f4887121 SHA512 2e5080199ded653e07cf0188ca16ad0a505e7dc8230176c2452a4b2934017d7a8696a5d4b2bfcbc92159b36602a391d9c270acf0b7178f10249f5141fa8e22af WHIRLPOOL b286e2df6c6dcfc40276cd8842feb46540910545e12fb292c9f08e0e2bc42aed89f2b2298449606df7393cf734fb72b494a2c741caf20387179c45d3be28504d
+AUX webapp-config-1.54-pvr-check.patch 2095 SHA256 58d606273b33631fcfa3a4b444811a742a6dce7c1078efbbaa124787e80f0ae1 SHA512 ee1c38e467ae4670b84d7b8d1cd8d99544898f8816dcc1cce37afb7ae3b8ecdce49f1d61f7f2e2609ec1166c5dffaa639e0705c017f18d0c3b50e72baf99aa96 WHIRLPOOL 9d2bf46d6e353fb85b3f739016d276aec1fef029617e3e72a1a72c492459c9d7bcf3737bc90210892828ddb8dd6a18943a34a29d4f15392038f1bd81b90d7697
+DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee
+DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc
+DIST webapp-config-1.54.tar.bz2 58954 SHA256 7663c4f7ae0d4e7206e349f3bf79fed479c9971365363929f431c92ebd622d17 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31 WHIRLPOOL 417944147e0bdc7eb1575b10102230306f6c76652beeb0e2866d0fbe41b12bcdeb31421dd7551961db55f4fe4544ca5600c072cb74083621745c7c74fbfeec2e
+DIST webapp-config-1.55.tar.bz2 72583 SHA256 222c41ac71b2991b078352fb8d09a0d458ff30b9c9729a2429165835c38c564b SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438 WHIRLPOOL 80d577e4398f6872129544221d58003beb5b5ce972c181a241ec96cfe0fe34975e7bef5a96acc40977320ad71cd4370ee58216c0517d78c1765f000a42d8ea56
+EBUILD webapp-config-1.52-r1.ebuild 1606 SHA256 ec375f61695e98d46bcda50ae64ee90f9b70fc408328f49bb3d2405b079c816f SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79 WHIRLPOOL d22103f01849de8fa2ff2711289ec2a4acff676ae8ebd8226cd34236ea27b6be9cef7fe687a3516475808b96354d7cf2dd2ca44b2f3f8135df8d77b2b21787d9
+EBUILD webapp-config-1.53-r2.ebuild 1690 SHA256 806fce528a6e5497c027620f1c94cdade488c01a14d6d9d1a9ff609fbe2dffc8 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46 WHIRLPOOL 320bfd49b96067fca71ecf91823f1a2a40aa7104f5cb07d22a99268e083160227e537b84f1bd6a4a29ed869b83d27b9803d6cc40410a16a7fbf37563aea46e63
+EBUILD webapp-config-1.54-r2.ebuild 1743 SHA256 034b0465d8b61799a824dc926fab906acbe51c8be14ab722cf8a7d4f872fb1d2 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3 WHIRLPOOL 600c10a60b9b92b0b77e349e70c6bf7112eaf575a2e89a95264591c7857ee5a946004662494d01d88a9eba19290a2f2fe338dbc39f6ea0c124ae5badc1b86a74
+EBUILD webapp-config-1.55.ebuild 1689 SHA256 01f04365d38566db96b75098305d2306dd0b7b24338ba2f4bdcc8a2cb85f3842 SHA512 325cff7ee1c9fb154707362ec804960ba8c811a572ed8dce385fd5459a6bc0458649e8e227d7998598a11d913c76050098c91339a0b5630224fb9cbf07aff646 WHIRLPOOL 2931c779c083dd4c05383f263d0dd06d13598b8ff1f276568682b5d1a81678568d875dabf1317e7119b95faa02c005b1f5b57726b87aaf99edad3e19d16f2521
+EBUILD webapp-config-9999.ebuild 1813 SHA256 c39bc07162d97ddc375ef523e53f110f08ef2840ec0618e60682cc0e1cf66c5a SHA512 d5a13e8be44f2f7ab00f982e13efb00b23a03031c479cc6a2b2689e2cd84863a18f16db9acd5b9125230d39ebde03d3df2d36683f450fa73c41f27224ffa98c9 WHIRLPOOL 30acae1cd46d6e329413d254e61b001246c32e7d1a5e8dc1061faa8f5cf8a4cc2a884fcda7fd9d988155aa9731904ee309b77f449b98540a48e70b145ef492b4
+MISC ChangeLog 6846 SHA256 0fb102d9f20c8e99a5b735c13c03ebe044c912def12e807f408391b585838101 SHA512 7f762477c6f040b5d1c5118edfbb0e0231066739d604770b81647535c95f15ff82f4aa48f1ed23b1921dcf0b62ed492ef6ff68aa2465782967d93ec17d890425 WHIRLPOOL f3bf810d4c58dfeeea0e752278b53a5579e4175d9a3a1cd775f47b607a1b6508d5dea9bf486f922a1993f181c4e10dddf75d82a000b242471ed72540be4ade5a
+MISC ChangeLog-2015 33731 SHA256 d4cc1f1abf8899a25b08b631c2568ca3f95e55a87361b7217e527d3cd7446e83 SHA512 b35e099b5cc42d3ac133b865196aac9a518553c0c1411d11bbe9fc00c8d0a730c8a3765154dd32343b3b8301d10ef49fea5a77051e958b96ac849c6b168564fd WHIRLPOOL cab9204309a29fa0dd7b13758a8cfcc6f3fe212bba31a56929ede46bdf456dc60203b86e2bf36096885371df2e60f992a8ec1e9f9d5a32b6bd39b7b4724291dc
+MISC metadata.xml 661 SHA256 127398f31fe1913413f39613a60345db20cf49a92337cbaa7db25fd0aef4b2c3 SHA512 bd5161502c6e93cef50b1206247f26920d011d87ca9b9d83217f30a2c29e67728262804d42b13eeb956b69432adbf27d9f42ca75b48a92b6335c9eac25a9976c WHIRLPOOL 52026ad4d9477fe718a52e5a72aa7507f2144b7ff4d6b270d3d6994c9914f2fe7003440568af028e2ec9ee93643e80097bda79f17f83b2b644b12b15ec51b0c6
diff --git a/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
new file mode 100644
index 000000000000..97c64a90df25
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.52-nulls-doctest.patch
@@ -0,0 +1,185 @@
+From 5f61d249507c3502c3c76faf3926522e6e63370d Mon Sep 17 00:00:00 2001
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Fri, 3 Jan 2014 21:03:00 -0500
+Subject: [PATCH] WebappConfig/{ebuild,content}.py: Nulls doctest code.
+
+Due to the variable nature of the returning values of the two functions
+run_vars() and add(), it is unrealistic to depend on doctest to not
+fail. It has been decided that disabling these two doctest codes would
+be the best decision to prevent failures that are not detrimental.
+
+X-Gentoo-Bug: 430010
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/430010
+---
+ WebappConfig/content.py | 36 ++++++++++++++++++------------------
+ WebappConfig/ebuild.py | 46 +++++++++++++++++++++++-----------------------
+ 2 files changed, 41 insertions(+), 41 deletions(-)
+
+diff --git a/WebappConfig/content.py b/WebappConfig/content.py
+index 8fe5be9..c635f5a 100644
+--- a/WebappConfig/content.py
++++ b/WebappConfig/content.py
+@@ -379,71 +379,71 @@ class Contents:
+ (and this is important for md5)
+ relative - 1 for storing a relative filename, 0 otherwise
+
+- >>> OUT.color_off()
+- >>> import os.path
+- >>> here = os.path.dirname(os.path.realpath(__file__))
++ OUT.color_off()
++ import os.path
++ here = os.path.dirname(os.path.realpath(__file__))
+
+ One for pretending:
+
+- >>> a = Contents(here + '/tests/testfiles/contents/app/',
++ a = Contents(here + '/tests/testfiles/contents/app/',
+ ... package = 'test', version = '1.0',
+ ... pretend = True)
+
+ And this one is for real:
+
+- >>> b = Contents(here + '/tests/testfiles/contents/app/',
++ b = Contents(here + '/tests/testfiles/contents/app/',
+ ... package = 'test', version = '1.0')
+
+ Pretend to add a file:
+
+- >>> a.add('file', 'config-owned',
++ a.add('file', 'config-owned',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/test1', relative = True)
+ * pretending to add: file 1 config-owned "test1"
+
+ Lets not pretend this time:
+
+- >>> b.add('file', 'config-owned',
++ b.add('file', 'config-owned',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/test1', relative = True)
+- >>> b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
++ b.entry(here + '/tests/testfiles/contents/app/test1') #doctest: +ELLIPSIS
+ 'file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
+
+ Lets produce an error with a file that does not exist:
+
+- >>> b.add('file', 'config-owned',
++ b.add('file', 'config-owned',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/nothere', relative = True) #doctest: +ELLIPSIS
+ * Cannot access file .../tests/testfiles/contents/app/nothere to add it as installation content. This should not happen!
+
+ Other file types:
+
+- >>> b.add('hardlink', 'config-owned',
++ b.add('hardlink', 'config-owned',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/test2', relative = True)
+- >>> b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
++ b.entry(here + '/tests/testfiles/contents/app/test2') #doctest: +ELLIPSIS
+ 'file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249 '
+- >>> b.add('dir', 'default-owned',
++ b.add('dir', 'default-owned',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/dir1', relative = True)
+- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
++ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+ 'dir 1 default-owned "dir1" ... 0 '
+- >>> b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
++ b.add('dir', 'default-owned', destination = here + '/tests/testfiles/contents/app',
+ ... path = '/dir1',
+ ... relative = False)
+- >>> b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
++ b.entry(here + '/tests/testfiles/contents/app/dir1') #doctest: +ELLIPSIS
+ 'dir 0 default-owned ".../tests/testfiles/contents/app/dir1" ... 0 '
+
+ Q: Is the full link to the target what we want?
+ A: Yes, since the link will still be ok even if we move the directory.
+
+- >>> b.add('sym', 'virtual',
++ b.add('sym', 'virtual',
+ ... destination = here + '/tests/testfiles/contents/app/',
+ ... path = '/test3', relative = True)
+- >>> b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
++ b.entry(here + '/tests/testfiles/contents/app/test3') #doctest: +ELLIPSIS
+ 'sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1'
+
+- >>> b.db_print() #doctest: +ELLIPSIS
++ b.db_print() #doctest: +ELLIPSIS
+ file 1 config-owned "test1" ... d8e8fca2dc0f896fd7cb4cb0031ba249
+ file 1 config-owned "test2" ... d8e8fca2dc0f896fd7cb4cb0031ba249
+ sym 1 virtual "test3" ... 0 .../tests/testfiles/contents/app/test1
+diff --git a/WebappConfig/ebuild.py b/WebappConfig/ebuild.py
+index 03c0c57..cc23bec 100644
+--- a/WebappConfig/ebuild.py
++++ b/WebappConfig/ebuild.py
+@@ -201,35 +201,35 @@ class Ebuild:
+ The procedure from above is repeated to set up the default
+ environment:
+
+- >>> import WebappConfig.config
+- >>> config = WebappConfig.config.Config()
+- >>> config.config.set('USER', 'my_htdocsbase', 'htdocs')
+- >>> config.config.set('USER', 'pn', 'horde')
+- >>> config.config.set('USER', 'pvr', '3.0.5')
+- >>> import os.path
+- >>> here = os.path.dirname(os.path.realpath(__file__))
+- >>> config.config.set('USER', 'my_approot', here +
+- ... '/tests/testfiles/share-webapps')
+- >>> my_approot = config.config.get('USER', 'my_approot')
+- >>> my_appdir = my_approot + "/horde/3.0.5"
+- >>> config.config.set('USER', 'my_appdir', my_appdir)
+- >>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')
+- >>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')
+- >>> config.config.set('USER', 'my_errorsbase', 'error')
+- >>> config.config.set('USER', 'my_iconsbase', 'icons')
+- >>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))
+- >>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))
+- >>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))
+- >>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))
++ "">>> import WebappConfig.config"
++ ">>> config = WebappConfig.config.Config()"
++ ">>> config.config.set('USER', 'my_htdocsbase', 'htdocs')"
++ ">>> config.config.set('USER', 'pn', 'horde')"
++ ">>> config.config.set('USER', 'pvr', '3.0.5')"
++ ">>> import os.path"
++ ">>> here = os.path.dirname(os.path.realpath(__file__))"
++ ">>> config.config.set('USER', 'my_approot', here +"
++ "... '/tests/testfiles/share-webapps')"
++ ">>> my_approot = config.config.get('USER', 'my_approot')"
++ ">>> my_appdir = my_approot + "/horde/3.0.5""
++ ">>> config.config.set('USER', 'my_appdir', my_appdir)"
++ ">>> config.config.set('USER', 'my_hookscriptsdir', my_appdir + '/hooks')"
++ ">>> config.config.set('USER', 'my_cgibinbase', 'cgi-bin')"
++ ">>> config.config.set('USER', 'my_errorsbase', 'error')"
++ ">>> config.config.set('USER', 'my_iconsbase', 'icons')"
++ ">>> config.config.set('USER', 'my_serverconfigdir', '/'.join([my_appdir,'conf']))"
++ ">>> config.config.set('USER', 'my_hostrootdir', '/'.join([my_appdir,'hostroot']))"
++ ">>> config.config.set('USER', 'my_htdocsdir', '/'.join([my_appdir,'htdocs']))"
++ ">>> config.config.set('USER', 'my_sqlscriptsdir', '/'.join([my_appdir,'sqlscripts']))"
+
+ Time to create the ebuild handler:
+
+- >>> a = Ebuild(config)
++ ">>> a = Ebuild(config)"
+
+ The dummy post-install file should display all the variables
+ that are exported here:
+
+- >>> a.show_postinst() #doctest: +ELLIPSIS
++ ">>> a.show_postinst() #doctest: +ELLIPSIS
+ <BLANKLINE>
+ =================================================================
+ POST-INSTALL INSTRUCTIONS
+@@ -270,7 +270,7 @@ class Ebuild:
+ PVR: 3.0.5
+ <BLANKLINE>
+ =================================================================
+- <BLANKLINE>
++ <BLANKLINE>"
+ '''
+
+ v_root = self.get_config('vhost_root')
+--
+1.8.3.2
+
diff --git a/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
new file mode 100644
index 000000000000..06a924a426be
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch
@@ -0,0 +1,25 @@
+From ff7ba0d89c79584f14a8137d886a656a9af6de5c Mon Sep 17 00:00:00 2001
+From: Devan Franchini <twitch153@gentoo.org>
+Date: Sat, 27 Dec 2014 20:43:08 -0500
+Subject: [PATCH] webapp-cleaner: sources function.sh from /lib/gentoo
+
+---
+ sbin/webapp-cleaner | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
+index bfec623..52e44ac 100755
+--- a/sbin/webapp-cleaner
++++ b/sbin/webapp-cleaner
+@@ -13,7 +13,7 @@ CMD="emerge -Cav"
+ WEBAPP_DIR="/usr/share/webapps"
+ WEBAPP_CONFIG=
+
+-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
++[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh
+
+ function help() {
+ echo "Remove obsolete and unused versions of web applications"
+--
+2.0.5
+
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
new file mode 100644
index 000000000000..9958c142d4a7
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-fix-bashism.patch
@@ -0,0 +1,12 @@
+diff -Naur WebappConfig.old/ebuild.py WebappConfig/ebuild.py
+--- WebappConfig/ebuild.py
++++ WebappConfig/ebuild.py
+@@ -101,7 +101,7 @@
+
+ for i in post_instructions:
+ i = i.replace('"', '\\"')
+- post.append(os.popen('echo -n "' + i + '"\n').read()[:-1])
++ post.append(os.popen('printf "' + i + '"\n').read()[:-1])
+
+ post = post + [
+ '',
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
new file mode 100644
index 000000000000..9a35ad70cafb
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
@@ -0,0 +1,49 @@
+commit 9e251c7574d074e424ea19024f743c754f321979
+Author: Devan Franchini <twitch153@gentoo.org>
+Date: Fri Jul 10 21:25:17 2015 -0400
+
+ config.py: Fixes package version checking regression
+
+ Previously webapp-config would not do any sanity checks when
+ setting the package version. After adding a sanity check in 1.54
+ I made the mistake of not being flexible enough and this caused
+ a regression that prevented web apps with versions such as
+ "20140929d"[1] to be installed. This commit fixes that while still
+ allowing for some sanity checking.
+
+ [1]: https://github.com/gentoo/webapp-config/issues/2
+
+diff --git a/WebappConfig/config.py b/WebappConfig/config.py
+index 6c915c3..3a176a0 100644
+--- a/WebappConfig/config.py
++++ b/WebappConfig/config.py
+@@ -996,17 +996,20 @@ class Config:
+ OUT.die('Invalid package name')
+
+ if len(args) > 1:
+- argsvr = args[1].split('.')
+- if len(argsvr) == 1:
+- OUT.die('Invalid package version: %(pvr)s'
++ pvr = args[1]
++ has_int = False # A package version should have at least one
++ # numerical value, but we want to allow for
++ # the flexibility of having any alphanumeric
++ # value while checking to make sure it's sane.
++
++ for char in pvr:
++ if char.isdigit():
++ has_int = True
++
++ if not has_int:
++ OUT.die('Invalid package version: "%(pvr)s"'
+ % {'pvr': args[1]})
+
+- pvr = ''
+- for i in range(0, len(argsvr)):
+- if not i == len(argsvr) - 1:
+- pvr += argsvr[i] + '.'
+- else:
+- pvr += argsvr[i]
+ self.config.set('USER', 'pvr', pvr)
+
+ if (not options['dir'] and
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
new file mode 100644
index 000000000000..bf2371089c83
--- /dev/null
+++ b/app-admin/webapp-config/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>twitch153@gentoo.org</email>
+ <name>Devan Franchini</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+ <use>
+ <flag name="portage">Propagete python_targets dependencies to sys-apps/portage</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">webapp-config</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
new file mode 100644
index 000000000000..e8c416dd5e3a
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -0,0 +1,64 @@
+# 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
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ !dev-python/configparser"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ epatch "${FILESDIR}/${P}-nulls-doctest.patch"
+}
+
+python_compile_all() {
+ emake -C doc/
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "Now that you have upgraded webapp-config, you **must** update your"
+ elog "config files in /etc/vhosts/webapp-config before you emerge any"
+ elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
new file mode 100644
index 000000000000..e7084845cb46
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ !dev-python/configparser
+ sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ epatch "${FILESDIR}/${P}-sources-function.sh-from-lib-gentoo.patch"
+}
+
+python_compile_all() {
+ emake -C doc/
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/dtest.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "Now that you have upgraded webapp-config, you **must** update your"
+ elog "config files in /etc/vhosts/webapp-config before you emerge any"
+ elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
new file mode 100644
index 000000000000..d364cbb45113
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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} pypy )
+
+inherit distutils-r1
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ epatch "${FILESDIR}/${P}-pvr-check.patch"\
+ "${FILESDIR}/${P}-fix-bashism.patch"
+}
+python_compile_all() {
+ emake -C doc/
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "webapp-config now requires that all -I/-U/-C commands be followed"
+ elog "by the package name and package version of the webapp"
+ elog "eg.) 'webapp-config -d drupal -I drupal 8.0.0_beta10'"
+ elog "See 'man 8 webapp-config' for more information"
+}
diff --git a/app-admin/webapp-config/webapp-config-1.55.ebuild b/app-admin/webapp-config/webapp-config-1.55.ebuild
new file mode 100644
index 000000000000..b83d9fcd994a
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-1.55.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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} pypy )
+
+inherit distutils-r1 prefix
+
+SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ eprefixify WebappConfig/eprefix.py config/webapp-config
+}
+
+python_compile_all() {
+ emake -C doc/
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "Now that you have upgraded webapp-config, you **must** update your"
+ elog "config files in /etc/vhosts/webapp-config before you emerge any"
+ elog "packages that use webapp-config."
+}
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
new file mode 100644
index 000000000000..409c9b0d9b1b
--- /dev/null
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 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} pypy )
+
+inherit distutils-r1 prefix
+
+if [[ ${PV} = 9999* ]]
+then
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo's installer for web-based applications"
+HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+portage"
+
+DEPEND="app-text/xmlto
+ sys-apps/gentoo-functions"
+RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ eprefixify WebappConfig/eprefix.py config/webapp-config
+}
+
+python_compile_all() {
+ emake -C doc/
+}
+
+python_install() {
+ # According to this discussion:
+ # http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
+ # distutils does not provide for specifying two different script install
+ # locations. Since we only install one script here the following should
+ # be ok
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /etc/vhosts
+ doins config/webapp-config
+
+ keepdir /usr/share/webapps
+ keepdir /var/db/webapps
+
+ dodoc AUTHORS
+ doman doc/*.[58]
+ dohtml doc/*.[58].html
+}
+
+python_test() {
+ PYTHONPATH="." "${PYTHON}" WebappConfig/tests/external.py \
+ || die "Testing failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ elog "Now that you have upgraded webapp-config, you **must** update your"
+ elog "config files in /etc/vhosts/webapp-config before you emerge any"
+ elog "packages that use webapp-config."
+}
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
new file mode 100644
index 000000000000..024cee74af4a
--- /dev/null
+++ b/app-admin/webmin/Manifest
@@ -0,0 +1,9 @@
+AUX gentoo-setup-1.791 13727 SHA256 91e011867005dcea7cf971c36e93f6eb3a3d7626a5ecee07ce2fa4525e3ebdff SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e WHIRLPOOL 93eca248ba35d30ca9e00d7f9a9b5d1ac4d71c97bef7002fd745121c4c2e061322f980efd6674b0817368154d47096d8b810a7d17cf8514493e1635d7310a701
+AUX init.d.webmin 2160 SHA256 7fc9bd0aea22f4bbe75b59be79865fb936684c540c62c17d22c01967218083e3 SHA512 9a8b11f1375be7ced1a402b97bb16b627c3459871722d52b2c471f36f103bcfe51a1598014905ac22072aff38e4baf25f53ad08b99dc3d367ce9851c489c1681 WHIRLPOOL 8575ba3b6bc379102fcef649ff5d2fef5117498b68092b4fc13b5451f9bc9e2103361d1e0b2f01afd11791b7b18ec12cdda174d3a8c5c868c3cdfe5de76b90bd
+AUX webmin.service 416 SHA256 f5e9301ad853929e15cb4c4860f8d3da5a27036bcaebce38a32ec81da798b8ef SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e WHIRLPOOL 9d4fbe570364a94516cf5f66eb968209f9731b6a1f3083071f3c299d65c28559e35dd76ca7e2ac2f3e5381b854cb8b5a561c48388b761c3dbb4d57829c59520b
+DIST webmin-1.791-minimal.tar.gz 2635024 SHA256 d269fcccf0034edff44654fb40b83f63e3274f722a8f0d5b14f1fa9f74f49b00 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2 WHIRLPOOL e8380478edf6b994e03623a9a6b84f736a6c5efd1dbe0aac3905f85457d172a783af0231d4b3606d69c63129c4c4d3d80fa10608dd47374a01f45be7fd53b281
+DIST webmin-1.791.tar.gz 28800013 SHA256 e62148a2263c016a66e7c825c5cb124614268c1da1e0f0bee75cd060c3acfa9c SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771 WHIRLPOOL 2d739e1c3ba06b04086b7d20eb646f950aa8776b4fc41bc975cb160733e70a5c7a4de6f331c294bf168e3f8fd5009c72d617eab662078f6d901087b3cfc2db36
+EBUILD webmin-1.791.ebuild 10395 SHA256 dbe7a72dba24e6271efa26f7d9c15c42adb594a2455a3ab6747ce53a0bad2046 SHA512 dc54fd107cefd1a4b08353135d72466b31b51114e2de85c82755452bdd6f50dc89796ceee273be730e65a7a3bb4fc9fc22c6e696c89fd7b893c546664007b09f WHIRLPOOL 24b575b94c717deeddf3ac1d3f9d2f6b434718df168f53c4f673df6e17552861775114d3fa4f5ffc59695778f6b56c2a12b49c8802806d35036a5c8b6ef17236
+MISC ChangeLog 4431 SHA256 38c5faf836548bcc121aee761f9e2a9ac3f7555fe71561a7eeb607f51bbe8585 SHA512 7b21d7947e91ab0e67e1d04390e1407af9306a6b41ee79701bfd2d3de4b1735219c1d0661e2cf4918ad31c53b2b3fa95b9e943b9abdd47abd987de8b060474d4 WHIRLPOOL c124e0e96aa55179cc19557ac4e806caa94e1217cea472fca7bd1b694d207593a6343d19e0d12f676ad5c43fd80afa2fec62fdf8342e96787baca3dd0893c188
+MISC ChangeLog-2015 4254 SHA256 efa22131b44fe313a9fd5a7e4fbd909e6d35c6c4611f1efcb2300a2da97a4a54 SHA512 8836feee09cf4bf9c9dea1ace319e61966de8c12a756a7fbd852ebe009a3cf6bda31a1643d4a1fcc1e70b26f056c2ca8ddb3f3706cba96c144c79f824716f790 WHIRLPOOL c19dd95150a439595aad92a7d6fa0878402338f85fbd1561cf09518e75586f8a85738d13d30cb68fe509fb622d19c8d7109e17510b15b83802ee8969246504b9
+MISC metadata.xml 245 SHA256 8122cd523d1aa235bc1d309fbae1c832243d3a506068ef7f9402e1d58b246145 SHA512 eb79433135fa9654e593b79830b2a34d158af83164c3f77c2b46950924ade8d03687ff26bb856e49c1e02bb33753c9771380480768ded4983d330f3e25f7c28a WHIRLPOOL 5c0efa073ec63c5498bb76155d5f196db6ed2a316827df25dea2418337ee1b815e407beb86e26437d1ce3d70f9f5ebe1fbf3f821a8ac74523ac82254d61d5d15
diff --git a/app-admin/webmin/files/gentoo-setup-1.791 b/app-admin/webmin/files/gentoo-setup-1.791
new file mode 100644
index 000000000000..680dfbb5303b
--- /dev/null
+++ b/app-admin/webmin/files/gentoo-setup-1.791
@@ -0,0 +1,438 @@
+#!/bin/sh
+# gentoo-setup.sh
+#
+# Version 1.2
+#
+# A modified original Webmin setup.sh script to comply with Gentoo specifics
+#
+# Modification done by: PhobosK <phobosk@kbfx.net>
+#
+# This script runs after the webmin archive is installed, and in the pkg_config() phase.
+# It does setup the various config files of Webmin depending on if it is
+# a new install, an upgrade or a reset.
+
+LANG=
+export LANG
+
+if [ -z ${wadir} ]; then
+ echo "You can't run this script outside of the 'emerge --config app-admin/webmin' command."
+ exit 1
+fi
+
+# All things we do is from the Webmin install dir - $wadir
+cd $wadir
+
+
+# Are we hard resetting everything?
+# If yes, we do:
+# 1. Run the specific Webmin $wadir/run-uninstalls.pl
+# It runs all uninstall.pl files in every module's folder.
+# They delete all the set specific Webmin cron jobs.
+# If bumping you should go through these files using the command:
+# find . -name uninstall.pl -exec cat {} \; -print
+# 2. Delete the whole /etc/webmin content, keeping only the gentoo .keep_* files
+if [ "$reset" = "hard" ]; then
+ echo "Running Webmin's specific uninstall procedures.. (Please ignore any possible errors)"
+ (WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")
+ echo "..done"
+ echo ""
+
+ echo "Deleting the content of user's config folder: $config_dir .."
+ find $config_dir ! -name '.keep_*' -delete 2>/dev/null
+ echo "..done"
+ echo ""
+fi
+
+
+# Are we soft resetting?
+# If yes we do:
+# - Delete the $config_dir/config file so we get new config values
+if [ "$reset" = "soft" ]; then
+ echo "Deleting the user's $config_dir/config file.."
+ if [ -f "$config_dir/config" ]; then
+ rm -f "$config_dir/config"
+ fi
+ echo "..done"
+ echo ""
+fi
+
+
+# Get all available modules of this version
+allmods=`echo */module.info | sed -e 's/\/module.info//g'`
+
+# Get current Webmin version
+ver=`cat "$wadir/version"`
+
+if [ -r "$config_dir/config" ]; then
+ upgrading=1
+fi
+
+
+# Check if upgrading from an old version
+if [ "$upgrading" = 1 ]; then
+ echo "Updating existant Webmin's config files.."
+
+ # Get current var path
+ if [ -r "$config_dir/var-path" ]; then
+ _var_dir=`cat $config_dir/var-path`
+ if [ -n ${_var_dir} ]; then
+ var_dir=${_var_dir}
+ fi
+ fi
+
+ # Get current perl path
+ if [ -r "$config_dir/perl-path" ]; then
+ _perl=`cat $config_dir/perl-path`
+ if [ -n ${_perl} ]; then
+ perl=${_perl}
+ fi
+ fi
+
+ # Get old os name and version
+ os_type=`grep "^os_type=" $config_dir/config | sed -e 's/os_type=//g'`
+ os_version=`grep "^os_version=" $config_dir/config | sed -e 's/os_version=//g'`
+ real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
+ real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
+
+ # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, ssl_honorcipherorder, no_tls1, no_tls1_1 and keyfile
+ port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
+ ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
+ no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
+ no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
+ ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
+ ssl_honorcipherorder=`grep "^ssl_honorcipherorder=" $config_dir/miniserv.conf | sed -e 's/ssl_honorcipherorder=//g'`
+ no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
+ no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
+ no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
+ keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
+
+ # Update ACLs
+ $perl "$wadir/newmods.pl" $config_dir $allmods
+
+ # Update miniserv.conf with new root directory, mime types file and server info
+ grep -v "^root=" $config_dir/miniserv.conf | grep -v "^mimetypes=" | grep -v "^server=" >$tempdir/$$.miniserv.conf
+ mv $tempdir/$$.miniserv.conf $config_dir/miniserv.conf
+ echo "root=$wadir" >> $config_dir/miniserv.conf
+ echo "mimetypes=$wadir/mime.types" >> $config_dir/miniserv.conf
+ echo "server=MiniServ/$ver" >> $config_dir/miniserv.conf
+ grep logout= $config_dir/miniserv.conf >/dev/null
+ if [ $? != "0" ]; then
+ echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
+ fi
+
+ # Remove old cache of module infos
+ rm -f $config_dir/module.infos.cache
+ echo "..done"
+ echo ""
+else
+ # Create webserver's new config files
+ echo "Creating Webmin's new config files.."
+
+ echo $perl > $config_dir/perl-path
+ echo $var_dir > $config_dir/var-path
+
+ # Create a totally new conf file
+ cfile=$config_dir/miniserv.conf
+ echo "port=$port" > $cfile
+ echo "root=$wadir" >> $cfile
+ echo "mimetypes=$wadir/mime.types" >> $cfile
+ echo "addtype_cgi=internal/cgi" >> $cfile
+ echo "realm=Webmin Server" >> $cfile
+ echo "logfile=$var_dir/miniserv.log" >> $cfile
+ echo "errorlog=$var_dir/miniserv.error" >> $cfile
+ echo "pidfile=$pidfile" >> $cfile
+ echo "logtime=168" >> $cfile
+ echo "ppath=$ppath" >> $cfile
+ echo "ssl=$ssl" >> $cfile
+ echo "no_ssl2=$no_ssl2" >> $cfile
+ echo "no_ssl3=$no_ssl3" >> $cfile
+ echo "ssl_redirect=$ssl_redirect" >> $cfile
+ echo "ssl_honorcipherorder=$ssl_honorcipherorder" >> $cfile
+ echo "no_sslcompression=$no_sslcompression" >> $cfile
+ echo "no_tls1=$no_tls1" >> $cfile
+ echo "no_tls1_1=$no_tls1_1" >> $cfile
+ echo "keyfile=$keyfile" >> $cfile
+ echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
+ echo "env_WEBMIN_VAR=$var_dir" >> $cfile
+ echo "atboot=$atboot" >> $cfile
+ echo "logout=$config_dir/logout-flag" >> $cfile
+ echo "listen=10000" >> $cfile
+ echo "denyfile=\\.pl\$" >> $cfile
+ echo "log=1" >> $cfile
+ echo "blockhost_failures=5" >> $cfile
+ echo "blockhost_time=60" >> $cfile
+ echo "syslog=1" >> $cfile
+ echo "session=1" >> $cfile
+ echo "premodules=WebminCore" >> $cfile
+ echo "server=MiniServ/$ver" >> $cfile
+
+ # Append package-specific info to config file.
+ # miniserv-conf can be created by upstream or by us in src_install phase (see there).
+ if [ -f "$wadir/miniserv-conf" ]; then
+ cat "$wadir/miniserv-conf" >>$cfile
+ fi
+
+ # Create the default user allowed to login - root only
+ login="root"
+
+ if [ -r /etc/shadow ]; then
+ #crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+ crypt=x
+ else
+ crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :`
+ fi
+
+ ufile=$config_dir/miniserv.users
+ echo "$login:$crypt:0" > $ufile
+ chmod 600 $ufile
+
+
+ echo "userfile=$ufile" >> $cfile
+ chmod 600 $cfile
+ echo "..done"
+ echo ""
+
+ echo "Creating access control file.."
+ afile=$config_dir/webmin.acl
+ echo "$login: $allmods" > $afile
+ chmod 600 $afile
+ echo "..done"
+ echo ""
+fi
+
+
+# Create start, stop, restart and reload Gentoo compliant Webmin scripts
+# We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
+# or systemctl if we run under systemd
+echo "Creating start and stop scripts.."
+rm -f $config_dir/{start,stop,restart,reload}
+
+# The start script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/start"
+#!/bin/sh
+
+if [ ! -f "${pidfile}" ]; then
+ if [[ -d /run/systemd/system ]] ; then
+ systemctl start webmin.service
+ else
+ rc-service --ifexists -- webmin start
+ fi
+fi
+END
+
+# The stop script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/stop"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+ systemctl stop webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted stop
+fi
+END
+
+# The restart script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/restart"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+ systemctl try-restart webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted restart
+fi
+END
+
+# The reload script in /etc/webmin (Gentoo compliant)
+cat <<END >>"$config_dir/reload"
+#!/bin/sh
+
+if [[ -d /run/systemd/system ]] ; then
+ systemctl reload-or-try-restart webmin.service
+else
+ rc-service --ifexists -- webmin --ifstarted reload
+fi
+END
+
+chmod 755 $config_dir/{start,stop,restart,reload}
+echo "..done"
+echo ""
+
+
+if [ "$upgrading" = 1 ]; then
+ echo "Updating other config files.."
+else
+ echo "Copying other config files.."
+fi
+
+# This just copies and merges the Webmin's release config files, with user's in the /etc/webmin folder
+newmods=`$perl "$wadir/copyconfig.pl" "$os_type/$real_os_type" "$os_version/$real_os_version" "$wadir" $config_dir "" $allmods`
+if [ "$upgrading" != 1 ]; then
+ # Store the OS and version
+ echo "os_type=$os_type" >> $config_dir/config
+ echo "os_version=$os_version" >> $config_dir/config
+ echo "real_os_type=$real_os_type" >> $config_dir/config
+ echo "real_os_version=$real_os_version" >> $config_dir/config
+
+ # Turn on logging by default
+ echo "log=1" >> $config_dir/config
+
+ # Disallow unknown referers by default
+ echo "referers_none=1" >>$config_dir/config
+else
+ # one-off hack to set log variable in config from miniserv.conf
+ grep log= $config_dir/config >/dev/null
+ if [ "$?" = "1" ]; then
+ grep log= $config_dir/miniserv.conf >> $config_dir/config
+ grep logtime= $config_dir/miniserv.conf >> $config_dir/config
+ grep logclear= $config_dir/miniserv.conf >> $config_dir/config
+ fi
+
+ # Disallow unknown referers if not set
+ grep referers_none= $config_dir/config >/dev/null
+ if [ "$?" != "0" ]; then
+ echo "referers_none=1" >>$config_dir/config
+ fi
+fi
+echo $ver > $config_dir/version
+echo "..done"
+echo ""
+
+# Set passwd_ fields in miniserv.conf from global config
+for field in passwd_file passwd_uindex passwd_pindex passwd_cindex passwd_mindex; do
+ grep $field= $config_dir/miniserv.conf >/dev/null
+ if [ "$?" != "0" ]; then
+ grep $field= $config_dir/config >> $config_dir/miniserv.conf
+ fi
+done
+grep passwd_mode= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo passwd_mode=0 >> $config_dir/miniserv.conf
+fi
+
+grep ssl_honorcipherorder= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo ssl_honorcipherorder=1 >> $config_dir/miniserv.conf
+fi
+
+# Disable SSL compression to defeat BEAST attack
+grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_sslcompression=1 >> $config_dir/miniserv.conf
+fi
+
+# Tighten SSL security
+grep no_ssl2= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_ssl2=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_ssl3= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_ssl3=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_tls1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_tls1=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_tls1_1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_tls1_1=1 >> $config_dir/miniserv.conf
+fi
+
+# Make Perl crypt MD5 the default
+grep md5pass= $config_dir/config >/dev/null
+if [ "$?" != "0" ]; then
+ echo md5pass=1 >> $config_dir/config
+fi
+
+# Set a special theme if none was set before
+if [ "$theme" = "" ]; then
+ theme=`cat "$wadir/defaulttheme" 2>/dev/null`
+fi
+oldthemeline=`grep "^theme=" $config_dir/config`
+oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
+if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
+ themelist=$theme
+fi
+
+# Set a special overlay if none was set before
+if [ "$overlay" = "" ]; then
+ overlay=`cat "$wadir/defaultoverlay" 2>/dev/null`
+fi
+if [ "$overlay" != "" ] && [ "$theme" != "" ] && [ -d "$wadir/$overlay" ]; then
+ themelist="$themelist $overlay"
+fi
+
+# Apply the theme and maybe overlay
+if [ "$themelist" != "" ]; then
+ echo "theme=$themelist" >> $config_dir/config
+ echo "preroot=$themelist" >> $config_dir/miniserv.conf
+fi
+
+# If the old blue-theme is still in use, change it (new in 1.730)
+oldtheme=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'`
+if [ "$oldtheme" = "blue-theme" ]; then
+ sed -i -e 's/theme=blue-theme/theme=gray-theme/g' $config_dir/config
+ sed -i -e 's/preroot=blue-theme/preroot=gray-theme/g' $config_dir/miniserv.conf
+fi
+
+# Set the product field in the global config
+grep product= $config_dir/config >/dev/null
+if [ "$?" != "0" ]; then
+ echo product=webmin >> $config_dir/config
+fi
+
+# If password delays are not specifically disabled, enable them
+grep passdelay= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo passdelay=1 >> $config_dir/miniserv.conf
+fi
+
+
+echo "Changing ownership and permissions.."
+# Make all config dirs non-world-readable
+for m in $newmods; do
+ chown -R root:root $config_dir/$m
+ chmod -R og-rw $config_dir/$m
+done
+
+# Make miniserv config files non-world-readable
+for f in miniserv.conf miniserv.users; do
+ chown -R root:root $config_dir/$f
+ chmod -R og-rw $config_dir/$f
+done
+chmod +r $config_dir/version
+
+# Fix up bad permissions from some older installs
+for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
+ if [ -d "$config_dir/$m" ]; then
+ chown root:root $config_dir/$m
+ chmod og-rw $config_dir/$m
+ chmod og-rw $config_dir/$m/config 2>/dev/null
+ fi
+done
+echo "..done"
+echo ""
+
+
+# This executes all postinstall.pl for every module
+# If you do bump, you should look at the specific changes they do with this command in root folder:
+# find . -name postinstall.pl -exec cat {} \; -print
+# Generally they are safe to run 'cause they change only user's config in /etc/webmin
+# or setup some cron jobs
+if [ "$nopostinstall" = "" ]; then
+ echo "Running postinstall scripts.. (Please ignore any possible errors)"
+ (cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/run-postinstalls.pl")
+ echo "..done"
+ echo ""
+fi
+
+# Enable background collection
+if [ "$upgrading" != 1 -a -r $config_dir/system-status/enable-collection.pl ]; then
+ echo "Enabling background status collection.. (Please ignore any possible errors)"
+ $config_dir/system-status/enable-collection.pl 5
+ echo "..done"
+ echo ""
+fi
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
new file mode 100644
index 000000000000..0c9dcc08831a
--- /dev/null
+++ b/app-admin/webmin/files/init.d.webmin
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+# We do not give a choice to user for configuring these 'cause it will mess up
+# Webmin's configuration
+WEBMIN_EXE="%exe%"
+WEBMIN_PID="%pid%"
+WEBMIN_CONF="%conf%"
+WEBMIN_CONFIG="%config%"
+
+extra_started_commands="reload"
+
+depend() {
+ use net logger
+}
+
+checkconfig() {
+ # Check if Webmin setup has been done
+ if [ ! -f ${WEBMIN_CONFIG} ]; then
+ eerror "Error in Webmin's configuration. The ${WEBMIN_CONFIG} is not present."
+ eerror "Please run 'emerge --config app-admin/webmin' to fix this."
+ return 1
+ fi
+
+ # Check if ssl cert is present
+ local key ssl
+ key=`grep "^keyfile=" ${WEBMIN_CONF} | sed -e 's/keyfile=//g'`
+ ssl=`grep "^ssl=" ${WEBMIN_CONF} | sed -e 's/ssl=//g'`
+
+ if [ ! -f "${key}" ] ; then
+ if [ "${ssl}" = "0" ]; then
+ ewarn "Your SSL certificate is not present."
+ ewarn "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
+ ewarn "OR run 'emerge --config app-admin/webmin'"
+ else
+ eerror "Error in Webmin's configuration. No SSL certificate is present."
+ eerror "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
+ eerror "OR change the 'ssl=' option of your ${WEBMIN_CONF} to 'ssl=0'"
+ eerror "OR run 'emerge --config app-admin/webmin'"
+ return 1
+ fi
+ fi
+
+ return 0
+}
+
+reload() {
+ if [ ! -f "${WEBMIN_PID}" ]; then
+ eerror "Webmin is not running"
+ return 1
+ fi
+
+ checkconfig || return 1
+
+ ebegin "Reloading Webmin's configuration files"
+ start-stop-daemon --signal USR1 --pidfile "$WEBMIN_PID"
+ eend $?
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting Webmin"
+
+ start-stop-daemon --start --background --interpreted \
+ --env LANG= \
+ --env PERLLIB="%perllib%" \
+ --exec "$WEBMIN_EXE" \
+ --pidfile "$WEBMIN_PID" \
+ -- "$WEBMIN_CONF"
+ eend $?
+ # Leave time to spawn, so no stop is received while spawning
+ sleep 3
+}
+
+stop() {
+ ebegin "Stopping Webmin"
+ start-stop-daemon --stop --interpreted --quiet \
+ --exec "$WEBMIN_EXE" \
+ --pidfile "$WEBMIN_PID"
+ eend $?
+ # Leave time to stop because of the scripts that use this
+ sleep 3
+}
diff --git a/app-admin/webmin/files/webmin.service b/app-admin/webmin/files/webmin.service
new file mode 100644
index 000000000000..5bec85b97c8c
--- /dev/null
+++ b/app-admin/webmin/files/webmin.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Webmin Administration Tool
+After=network.target remote-fs.target nss-lookup.target
+ConditionFileNotEmpty=%config%
+ConditionFileNotEmpty=%conf%
+
+[Service]
+RemainAfterExit=yes
+KillMode=mixed
+# Webmin is exiting with 1 on SIGTERM
+SuccessExitStatus=1
+ExecStart=%exe% %conf%
+PIDFile=%pid%
+Environment="PERLLIB=%perllib%" LANG=
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
new file mode 100644
index 000000000000..e12b2ca96ebf
--- /dev/null
+++ b/app-admin/webmin/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">webadmin</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.791.ebuild b/app-admin/webmin/webmin-1.791.ebuild
new file mode 100644
index 000000000000..c69abb400e6a
--- /dev/null
+++ b/app-admin/webmin/webmin-1.791.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils pam ssl-cert systemd
+
+DESCRIPTION="A web-based Unix systems administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+ !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-MIME-Base64
+ virtual/perl-Socket
+ virtual/perl-Sys-Syslog
+ virtual/perl-Time-HiRes
+ virtual/perl-Time-Local
+ dev-perl/Authen-Libwrap
+ dev-perl/IO-Tty
+ dev-perl/MD5
+ dev-perl/Net-SSLeay
+ dev-perl/Authen-PAM
+ dev-perl/Sys-Hostname-Long
+ >=net-dns/dnssec-tools-1.13
+ !minimal? (
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ ldap? ( dev-perl/perl-ldap )
+ dev-perl/XML-Generator
+ dev-perl/XML-Parser
+ )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ local perl="$( which perl )"
+
+ # Remove the unnecessary and incompatible files
+ rm -rf acl/Authen-SolarisRBAC-0.1*
+ if ! use minimal ; then
+ rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+ rm -f mount/{free,net,open}bsd-mounts*
+ rm -f mount/macos-mounts*
+ fi
+
+ # For security reasons remove the SSL certificate that comes with Webmin
+ # We will create our own later
+ rm -f miniserv.pem
+
+ # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+ # We will use our own later
+ rm -f setup.{sh,pl}
+
+ # Set the installation type/mode to Gentoo
+ echo "gentoo" > install-type
+
+ # Fix the permissions of the install files
+ chmod -R og-w "${S}"
+
+ # Since we should not modify any files after install
+ # we set the perl path in all cgi and pl files here using Webmin's routines
+ # The pl file is Prefix safe and works only on provided input, no other filesystem files
+ ebegin "Fixing perl path in source files"
+ (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+ eend $?
+}
+
+src_install() {
+ # Create config dir and keep
+ diropts -m0755
+ dodir /etc/webmin
+ keepdir /etc/webmin
+
+ # Create install dir
+ # Third party modules installed through Webmin go here too, so keep
+ dodir /usr/libexec/webmin
+ keepdir /usr/libexec/webmin
+
+ # Copy our own setup script to installation folder
+ insinto /usr/libexec/webmin
+ newins "${FILESDIR}"/gentoo-setup-${PV} gentoo-setup.sh
+ fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+ # This is here if we ever want in future ebuilds to add some specific
+ # config values in the /etc/webmin/miniserv.conf
+ # The format of this file should be the same as the one of miniserv.conf:
+ # var=value
+ #
+ # Uncomment it if you use such file. Before that check if upstream
+ # has this file in root dir too.
+ #newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+ # Create the log dir and keep
+ diropts -m0700
+ dodir /var/log/webmin
+ keepdir /var/log/webmin
+
+ # Create the init.d file and put the neccessary variables there
+ newinitd "${FILESDIR}"/init.d.webmin webmin
+ sed -i \
+ -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+ -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+ -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%config%:${EROOT}etc/webmin/config:" \
+ -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+ "${ED}etc/init.d/webmin" \
+ || die "Failed to patch the webmin init file"
+
+ # Create the systemd service file and put the neccessary variables there
+ systemd_newunit "${FILESDIR}"/webmin.service webmin.service
+ sed -i \
+ -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+ -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+ -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+ -e "s:%config%:${EROOT}etc/webmin/config:" \
+ -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+ "${ED}$(_systemd_get_systemunitdir)/webmin.service" \
+ || die "Failed to patch the webmin systemd service file"
+
+ # Setup pam
+ pamd_mimic system-auth webmin auth account session
+
+ # Copy files to installation folder
+ ebegin "Copying install files to destination"
+ cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+ eend $?
+}
+
+pkg_preinst() {
+ # First stop service if running so Webmin to not messup our config
+ ebegin "Stopping any running Webmin instance prior merging"
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
+ eend $?
+}
+
+pkg_postinst() {
+ # Run pkg_config phase first - non interactively
+ export INTERACTIVE="no"
+ pkg_config
+ # Every next time pkg_config should be interactive
+ INTERACTIVE="yes"
+
+ ewarn
+ ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+ ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+ ewarn "To avoid problems, please before using any module, look at its configuration options first."
+ ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+ ewarn
+ if systemd_is_booted ; then
+ elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
+ else
+ elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+ fi
+ elog "- The default URL to connect to Webmin is: https://localhost:10000"
+ elog "- The default user that can login is: root"
+ elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+ # First stop service if running - we do not want Webmin to mess up config
+ ebegin "Stopping any running Webmin instance prior unmerging"
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
+ eend $?
+}
+
+pkg_postrm() {
+ # If removing webmin completely, remind the user for the Webmin's own cron jobs.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ ewarn
+ ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+ ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+ ewarn "To fix this just disable them if you intend to use Webmin again,"
+ ewarn "OR delete them if not."
+ ewarn
+ fi
+}
+
+pkg_config(){
+ # First stop service if running
+ ebegin "Stopping any running Webmin instance"
+ if systemd_is_booted ; then
+ systemctl stop webmin.service 2>/dev/null
+ else
+ rc-service --ifexists -- webmin --ifstarted stop
+ fi
+ eend $?
+
+ # Next set the default reset variable to 'none'
+ # reset/_reset can be:
+ # 'none' - does not reset anything, just upgrades if a conf is present
+ # OR installs new conf if a conf is missing
+ # 'soft' - deletes only $config_dir/config file and thus resetting most
+ # conf values to their defaults. Keeps the specific Webmin cron jobs
+ # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+ # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+ local _reset="none"
+
+ # If in interactive mode ask user what should we do
+ if [[ "${INTERACTIVE}" = "yes" ]]; then
+ einfo
+ einfo "Please enter the number of the action you would like to perform?"
+ einfo
+ einfo "1. Update configuration"
+ einfo " (keeps old config options and adds the new ones)"
+ einfo "2. Soft reset configuration"
+ einfo " (keeps some old config options, the other options are set to default)"
+ ewarn " All Webmin users will be reset"
+ einfo "3. Hard reset configuration"
+ einfo " (all options including module options are set to default)"
+ ewarn " You will lose all Webmin configuration options you have done till now"
+ einfo "4. Exit this configuration utility (default)"
+ while [ "$correct" != "true" ] ; do
+ read answer
+ if [[ "$answer" = "1" ]] ; then
+ _reset="none"
+ correct="true"
+ elif [[ "$answer" = "2" ]] ; then
+ _reset="soft"
+ correct="true"
+ elif [[ "$answer" = "3" ]] ; then
+ _reset="hard"
+ correct="true"
+ elif [ "$answer" = "4" -o "$answer" = "" ] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter a number from 1 to 4"
+ fi
+ done
+
+ if [[ "$_reset" = "hard" ]]; then
+ while [ "$sure" != "true" ] ; do
+ ewarn "You will lose all Webmin configuration options you have done till now."
+ ewarn "Are you sure you want to do this? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ sure="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "User aborted configuration."
+ else
+ echo "Answer not recognized. Enter 'y' or 'n'"
+ fi
+ done
+ fi
+ fi
+
+ export reset=$_reset
+
+ # Create ssl certificate for Webmin if there is not one in the proper place
+ if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+ install_cert "${EROOT}/etc/ssl/webmin/server"
+ fi
+
+ # Ensure all paths passed to the setup script use EROOT
+ export wadir="${EROOT}usr/libexec/webmin"
+ export config_dir="${EROOT}etc/webmin"
+ export var_dir="${EROOT}var/log/webmin"
+ export tempdir="${T}"
+ export pidfile="${EROOT}var/run/webmin.pid"
+ export perl="$( which perl )"
+ export os_type='gentoo-linux'
+ export os_version='*'
+ export real_os_type='Gentoo Linux'
+ export real_os_version='Any version'
+ # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
+ # 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
+ export ssl=1
+ export no_ssl2=1
+ export no_ssl3=1
+ export ssl_redirect=1
+ export ssl_honorcipherorder=1
+ export no_sslcompression=1
+ export no_tls1=1
+ export no_tls1_1=1
+ export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+ export port=10000
+
+ export atboot=0
+
+ einfo "Executing Webmin's configure script"
+ $wadir/gentoo-setup.sh
+
+ einfo "Configuration of Webmin done"
+}
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
new file mode 100644
index 000000000000..ae3090264d9d
--- /dev/null
+++ b/app-admin/whowatch/Manifest
@@ -0,0 +1,7 @@
+AUX whowatch-1.8.4-select.patch 348 SHA256 9aa270ad6a28f629ec6f063106f9760ded21659f0170015081251e2f28c449fe SHA512 ab2b9aef685c68b913b14d083e95f2b105b8d36e50a40da98f4d35ab173df21a931571d6052b8bb177678561f528175c4a6970c30f8f7aa9a29da2b528cd1e9f WHIRLPOOL e6c07f4f03acacaca0e593ee0d9678d67c12de5befdeb24b2cdeb94a736c3fbfa6d4b063db6825bdde28e63243bf4dd3a22597627f8b4a4d60a86c1813dc2a73
+AUX whowatch-1.8.4-tinfo.patch 627 SHA256 609e4c654852b7c92d22a24e9a3d7ca3987f35a22a93c8d82085152fbedf426f SHA512 7d256fc59184839a1ce6168689763c0b2a1e32c841438979c00ab8c2c2fc0e87e5e8f6002e1433326b94ebf9b917348b2f19b126562e01ab387bfbed79184c7a WHIRLPOOL 6fa17e10f81648be1b0eca002127e4461f62c3c4b12f93082d252f092fadb98a14c5b3b62b73a3ffe024501c93a5684058bdce96bfaab535f5ed5c85e37da46f
+DIST whowatch-1.8.5.tar.gz 133845 SHA256 5e77107c2bd31eee5609d80caf3f07fb4b913b4b2e71c1d0e73204937ffc9c8a SHA512 9a534dcc859101e3f6636fcfc191be3c0a66b843225dbace0d851f8cca7bbf1374929f604414556c651167c24a223525304fe2963a92b97ba97a8f57179ec738 WHIRLPOOL 0048cf078d9cc4c467b3df6017d541cffe45f5b9b6f58a2b83fda13f7cddacbe7b1bdc2161efb5538b7c3f18f117b10b52157738bb553fd6ea2d58b6007e58bb
+EBUILD whowatch-1.8.5.ebuild 694 SHA256 a1ddc390a67748ce662782089c790970f188ad8fbed4eb0cedc37c70ea2f7682 SHA512 2c3ceebdbbec7055dd7bcea688a3cea207b4545672f05eb8a2996a181b96dd87cdbb6f53cb3b479f1e9a15954bfd2b5d580926ed3bc3b95072d1cb9ec5185a83 WHIRLPOOL 9403042757784f5c1888938071bd578ef52b908f5e881fe762e9f8fbbbd4c32ed32e473362049f2cff2a52b626ab5aaeb7a461f688945d42a3a38e0fdaab4d36
+MISC ChangeLog 2808 SHA256 da2254de13df312b5f73b749c08237c71249c9b686f400cc3844a5b04a277389 SHA512 269f91df0b4bddfaae3129a5512690fcfdff1db231fd85096263b13ab8bd15b8663fb73f960d4b26a57d98a203c905eeef202c0d3301e7e1f5fa22d9109facb0 WHIRLPOOL c97fbdcb9bab1ef789c3265bd7156c47bca6c04f53e30742f6294c486260111ea187b9d456d8d3f26756e4fdff95db5b4db0c697be40f31d7a5fe1b2e1350c66
+MISC ChangeLog-2015 7858 SHA256 d90d3241ba3145ddc269009a4fa9c3846fb5694e2372c79ab866e5473cf4e516 SHA512 085bb2c4893e34b680f4eb7055f14def9dcc19ff8fc9a8a4d8ad22630ef4d29a59b001ec08d9b646ec140fb17f625e81c89172fdeba910a7957dc6be2aa8058a WHIRLPOOL 46491277ebc500ef7b777033fe5ee161cbd6d4ddc706161b13b0b245c1ab20550877a7422e9242c1f9e24c47832f02ac998794eb1bb4d541fb76e72eaf5946dc
+MISC metadata.xml 388 SHA256 e10dcbf07afb8dc14a829f4a510bb39ce150f0e6d8901721d345c61ff03964a6 SHA512 6f9e4b4105915444690434f721d6fcfdc78fff506927a854c13a67d06d81293361f44f19c55fb78e32daa9b70a07410f844924f94a251cbd0aa71adefd9de5f3 WHIRLPOOL cdbefb6af6b4cc6794800a7b641d374a386c274c49873efffd49803efa89e3913e5ed1efa924483ce95a538b5e5ebed97f0224acaad6b37b047ca51913fb013f
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-select.patch b/app-admin/whowatch/files/whowatch-1.8.4-select.patch
new file mode 100644
index 000000000000..0907c70e6750
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.8.4-select.patch
@@ -0,0 +1,17 @@
+--- a/src/whowatch.c
++++ b/src/whowatch.c
+@@ -436,12 +436,12 @@
+ gettimeofday(&after, 0);
+ tv.tv_sec -= (after.tv_sec - before.tv_sec);
+ if(retval > 0) {
+- int key = read_key();
++ int key = getkey();
+ key_action(key);
+ }
+ if(tv.tv_sec <= 0) {
+ ticks++;
+- periodic();
++ main_periodic();
+ tv.tv_sec = TIMEOUT;
+ }
+ #endif
diff --git a/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch b/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch
new file mode 100644
index 000000000000..6ad7849ac037
--- /dev/null
+++ b/app-admin/whowatch/files/whowatch-1.8.4-tinfo.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,14 +16,8 @@
+ dnl Replace `main' with a function in -lkvm:
+ AC_CHECK_LIB(kvm, kvm_openfiles)
+ dnl Replace `main' with a function in -lncurses:
+-CURS=0
+-AC_CHECK_LIB(ncurses, scrollok, [CURS=1 ; LIBS="$LIBS -lncurses"])
+-if test "$CURS" != "1"; then
+- AC_CHECK_LIB(curses, scrollok, [CURS=1 ; LIBS="$LIBS -lcurses"])
+-fi
+-if test "$CURS" != "1"; then
+- AC_MSG_ERROR([Could not find proper curses library])
+-fi
++PKG_CHECK_MODULES(NCURSES, ncurses, [LIBS="$LIBS $NCURSES_LIBS"],
++ AC_MSG_ERROR([Could not find proper curses library]))
+
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
new file mode 100644
index 000000000000..740b2bc5107f
--- /dev/null
+++ b/app-admin/whowatch/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>jer@gentoo.org</email>
+ <name>Jeroen Roovers</name>
+ </maintainer>
+ <longdescription>
+ A interactive who program that displays information about the users currently logged into the machine.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/whowatch/whowatch-1.8.5.ebuild b/app-admin/whowatch/whowatch-1.8.5.ebuild
new file mode 100644
index 000000000000..e63c78391d8a
--- /dev/null
+++ b/app-admin/whowatch/whowatch-1.8.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Displays information about users currently logged on in real time"
+HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
+SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ~mips ppc x86"
+IUSE=""
+
+RDEPEND="
+ sys-libs/ncurses:0=
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.8.4-tinfo.patch
+ epatch "${FILESDIR}"/${PN}-1.8.4-select.patch
+ eautoreconf
+}
+
+src_install() {
+ dobin src/${PN}
+ doman ${PN}.1
+ dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
new file mode 100644
index 000000000000..6f86f4ca4aba
--- /dev/null
+++ b/app-admin/xstow/Manifest
@@ -0,0 +1,7 @@
+AUX 99xstow 65 SHA256 68103af0c35467cf1a726d7a7ac7815d1e4f7ed5c62058d87904829b2081bd76 SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476 WHIRLPOOL 1eed3b955957af4e32417cb25919f17580ddbd10a2908bd3c8bf9f1ada619043ffda23fa5b71a64ff3287c01585103abe8a1ca79aef6d13534dea1a494dd15d3
+AUX xstow-1.0.1-ncurses.patch 1070 SHA256 823c85526d502c6cd5921b990f85110b7b6c67cee189b0e0895eeeec14f34bc0 SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389 WHIRLPOOL d7e7a03840dc94da9244b009b2b68c444532ef24ccff75cafd669bfe4ecb3178bcfee943dcc998f29d97ad70cdf93f313dab1fb0161c01d349efe02f598e4307
+DIST xstow-1.0.1.tar.bz2 153530 SHA256 b25279134689519c15fa5caea3d437c0e8c49d9cfa0c91cc45fb842025b1bf35 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b WHIRLPOOL 052f3ed2ddf3b6612d898a596aec4547578253aca1e1fa2dc7b3209646c029d59b589ede80ad40586b5c926e6e7826591f98d0137feddfcd4aa5fea66218a23a
+EBUILD xstow-1.0.1.ebuild 1230 SHA256 e503ba62a7d86b2a0bddae842a5e3c380f6b5808d6d7e350aa26f6102c695048 SHA512 9253efe7685288362f64b416eacedcf91440a489f3f6f8ed5139612fec54aada75244a8caaf65490534b7864a2f21957aafe4dba420300be0f21a245e2de7055 WHIRLPOOL e80e532f177ede971ba23cf86eb93cc1481d7443ff836066f17faebeece84c6b670f71effa764c23103608957145966924f9b1e1c5d265136760ae3506f2f2ca
+MISC ChangeLog 2890 SHA256 bbc5598c135ebb784ae3489210d413aff284b9c5c018b1c6d6df600537430881 SHA512 54e58beebb9f8a15a62925cc4587a361959bf6b2a819f027a83f368462b675dd7e850e9b2786e034f1f2a266448ea27d7f8a0e0e86071405f419fcff4d29c2d0 WHIRLPOOL 7f5003b9e15aacde6ba426e01e71c3bab12cd3f88df5882dfa5837816e14a6ae995e731d77426261b254f5ecc884d69f2adbcd737857eefcf635a9017a28b707
+MISC ChangeLog-2015 3340 SHA256 c6c6a73b95afc4bafd9f04fa8494d967a5017acec154ec6df9233fe028a26664 SHA512 c0c44811ac860bd77951605dcb94b5d68d17a3c43bdb321ea52e18594501926037d62054c4b4eee77c517a6eb343a747c48a9559bb6af25c164dfbe168232806 WHIRLPOOL 0ac996477690e324b8b69d9352f83062dcfbadb25d3d5b189d1dc41fbf851d6264bc2c04e25c632d799a863c8876983c835b2aa305ccf5226bfc942baa75ae79
+MISC metadata.xml 720 SHA256 86425cc81389168d1f204e6bbea39178d4e178ee3f3b4198bb65fd2656a98b84 SHA512 88c7660afcdb65fd3f7593017ac3e65dca0ced73362c5ec3467a86783026720314d0ba91ae4d512b767bef13ee7a46379f04dccc733dec70f8cf8bfe8acd0217 WHIRLPOOL 38ea53392cb42bb214088351e2d1b781e58ea467577f59a23ed289686cff541e93b3a34475c9f94d57bde9c6142e1513dc52a0126ede898f6745f1074f2b8ab8
diff --git a/app-admin/xstow/files/99xstow b/app-admin/xstow/files/99xstow
new file mode 100644
index 000000000000..07625f392537
--- /dev/null
+++ b/app-admin/xstow/files/99xstow
@@ -0,0 +1,3 @@
+LDPATH=/var/lib/lib
+PATH=/var/lib/bin
+MANPATH=/var/lib/share/man
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
new file mode 100644
index 000000000000..b7d29f287e7f
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
@@ -0,0 +1,56 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,11 +91,12 @@
+ AC_MSG_RESULT(disabled)
+ support_curses=0
+ else
++ AC_MSG_RESULT(enabled)
+ support_curses=1
+ fi
+ ],
+- [
+- AC_MSG_RESULT(enabled)
++ [])
++if test $support_curses -eq 1; then
+ AC_CHECK_HEADER([curses.h],
+ [
+ # test which libraray to use
+@@ -146,7 +147,7 @@
+ fi
+
+ if test $support_curses -eq 1; then
+- AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
++ AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
+ AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
+ fi
+
+@@ -154,8 +155,7 @@
+ [
+ support_curses=0
+ ])
+- ])
+-
++fi
+
+ NO_STL_SSTREAM=0
+ NO_STL_STRSTREAM=0
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,7 +46,7 @@
+ backtrace.h \
+ backtrace.cpp
+
+-xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++xstow_LDADD= $(LDFLAGS_DYNAMIC)
+
+ if ENABLE_MERGE
+
+@@ -63,7 +63,7 @@
+ backtrace.h \
+ backtrace.cpp
+
+-merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
++merge_info_LDADD= $(LDFLAGS_DYNAMIC)
+
+ endif
+
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
new file mode 100644
index 000000000000..402abfd0dd84
--- /dev/null
+++ b/app-admin/xstow/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>ewfalor@gmail.com</email>
+ <name>Erik Falor</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>A program that manages the installation of software packages.</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">xstow</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
new file mode 100644
index 000000000000..34a6c3f81440
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="replacement for GNU stow with extensions"
+HOMEPAGE="http://xstow.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ncurses.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with ncurses curses)
+}
+
+src_install() {
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ # create new STOWDIR
+ dodir /var/lib/xstow
+
+ # install env.d file to add STOWDIR to PATH and LDPATH
+ doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
+}
+
+pkg_postinst() {
+ elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
+ elog "instead of /usr/local in order to avoid conflicts with the"
+ elog "symlink from /usr/lib64 -> /usr/lib. See Bug 246264"
+ elog "(regarding app-admin/stow, equally applicable to XStow) for"
+ elog "more details on this change."
+ elog "For your convenience, PATH has been updated to include"
+ elog "/var/lib/bin."
+}
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
new file mode 100644
index 000000000000..b02aea6647a5
--- /dev/null
+++ b/app-admin/xtail/Manifest
@@ -0,0 +1,7 @@
+DIST 20120219-patch-aalto.zip 4991 SHA256 e9904a74aa2309be1ea1d4039fa257d6e7f32bb176dbc0cdf2daa6d3d2390b1b SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2 WHIRLPOOL b3e8e6c5b686acd2c502f7d09f88acce9a5785878a767a4b24a35a0ded49ecd3ed0922075c8fc9bdaea1108a8b9ecd6d330e4671f6b1e8f0ddf1fff530f0e6d0
+DIST xtail-2.1.tar.gz 26769 SHA256 75184926dffd89e9405769b24f01c8ed3b25d3c4a8eac60271fc5bb11f6c2d53 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f WHIRLPOOL 39ab0e4c5379a2acd43bcb29bcd2fce42c7581aea6173fc01bf3ab0075d76ccdbcdaa2c6b8614ee9720c1ac456d9ce3ce0dd4a0078ced413c28d0f599f0fdcf5
+EBUILD xtail-2.1-r1.ebuild 753 SHA256 255f4e23f8ba2404b06a944fe039cd72d94a0ac3cc551cb870ac8d4400b000ba SHA512 f238d06a5039d06dd361681eba12a420cba02886e0b78fedba469b4b9a680876fc1c647fc3fb7d4e77aa5e8b02628d7d486f21f556c02211e90250218d4382ef WHIRLPOOL d0a44e430b3d16113ce250781b1523618103a22a72b39b192bd145e59a6f8dfae69db469c2b8299941779b5a18b7ba6fdca1e6bc4834ec8d38995e8183cb1f16
+EBUILD xtail-2.1.ebuild 498 SHA256 ccc5ed4fb546ade8f04fcc3768c3fc76b3c46f761c66658242e1ef0906742bb7 SHA512 5e94c8561c2f633cf07d5f144029562c99084fa905f49ab1f3c0292bcf945506fb1f1c95ee63aa785ce9809583661743cd104ae2018e7e27c316fc353db2cfac WHIRLPOOL 2548ed52ca2ff6670a2e912590a3aef24ad2df94c67931405932265bb20e7b8d4ec0665279b2632fb800588eca657af703e6fb6f2ef8a3d0f894adcf936ca85a
+MISC ChangeLog 2630 SHA256 cac62836770e1adc1347662faee76b09f576967df023d1f19f8515d0ac84e4cc SHA512 04269f20cb6f612a15f4a38e30a73df62ac82b8b040215f833206d5f35f229bd7d7317e604ea31732c1533afd32c9714f1f34fa7956eae8db9d21e505eecf6a4 WHIRLPOOL fdeed0c796abc632f373e02bb19d0c66dec32ce5bddadbe5fb4012fed2b394ac8a599c4c1f9f6ce2f54f089e8e8ff6eb1d790d5b055b70e877748a8dccb9017f
+MISC ChangeLog-2015 2479 SHA256 b587773d31c00df9ad01c9b9d7a8c2cc2d207c7addba7e740ef7a92960fb6849 SHA512 a328cd0b7c7fb33512e9ae69c0910c0cce4cbe7b7441fba8c42c6afe6c81514f55acff8a62fbb20e8f769bcabd40c1603b9e59874b4a9ac0757f449d2096f767 WHIRLPOOL cd0961f2eee2607eb27fa25f87e6b429ed13b687d7c7b64baeb30c8a8c02b9a77f84657da0b3c463a2c7b46861d039a0e76b6217b3e4c263c392387e0f62380d
+MISC metadata.xml 437 SHA256 86e5b2d51378083dc6bba31e0c676359b9c317a4fe34df7e2e583b4ae02c2504 SHA512 473485579b4adafbd9f25cfb9e301e08c6c92d145c8028f3860962ee37be59491686bd413c744674a5a91345d398afa7ada96e96ea5af9200e7cfde38b10f7e1 WHIRLPOOL f7db072b38ecad303e02e35d37679026017d2018c6742cd0a0f22d5f1112012ec0ef85b92e22805f6df2f3c8acf40f78ba4d5a2d7001eebc0a23cc88fd179e3f
diff --git a/app-admin/xtail/metadata.xml b/app-admin/xtail/metadata.xml
new file mode 100644
index 000000000000..f85171d7d138
--- /dev/null
+++ b/app-admin/xtail/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>gentoo.power@gmail.com</email>
+ <name>Iván</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
new file mode 100644
index 000000000000..9506b3e7e06c
--- /dev/null
+++ b/app-admin/xtail/xtail-2.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 eutils toolchain-funcs
+
+DESCRIPTION="Tail multiple logfiles at once, even if rotated"
+HOMEPAGE="http://www.unicom.com/sw/xtail/"
+SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz
+ http://www.unicom.com/files/20120219-patch-aalto.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+ epatch ../0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
+ epatch ../0001-xtail.1-remove-SIGQUIT.patch
+ epatch ../xtail_2.1-5-debian-local-changes.patch
+}
+
+src_compile() {
+ tc-export CC
+ emake
+}
+
+src_install() {
+ dobin xtail
+ doman xtail.1
+ dodoc README
+ newdoc ../README README.patches
+}
diff --git a/app-admin/xtail/xtail-2.1.ebuild b/app-admin/xtail/xtail-2.1.ebuild
new file mode 100644
index 000000000000..656f0b7240e3
--- /dev/null
+++ b/app-admin/xtail/xtail-2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="Tail multiple logfiles at once, even if rotated"
+HOMEPAGE="http://www.unicom.com/sw/xtail/"
+SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+src_compile() {
+ tc-export CC
+ emake || die "emake failed"
+}
+
+src_install() {
+ dobin xtail || die
+ doman xtail.1 || die
+ dodoc README
+}
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
new file mode 100644
index 000000000000..305284bc07e1
--- /dev/null
+++ b/app-admin/yaala/Manifest
@@ -0,0 +1,7 @@
+AUX yaala-0.7.3-r1-correct-paths.patch 1095 SHA256 b7ef7b26c1949e066088402a320786c7035759e566f7e57969203052a47ccc13 SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7 WHIRLPOOL 4da98c2685be166fcc6a58952137c664570635662fc962778ef81c2306f496aafd2d5d847d374de0580ac21666e1a628a9fd6d2bcf20c13c98fc55166db124f4
+DIST yaala-0.7.3.tar.bz2 41528 SHA256 a2c3a2173ed2f09aae7992ed11c8257ffce631fbe1dc99c286a911f1743ff936 SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01 WHIRLPOOL 949159522a230ce9892bd64537afc8c826dff0496f68e2dd30660ebe099d9dbd59e83cda9acbbd8501026532bd9eb02fe3da3fce3b98a7242eb269c04469d2da
+EBUILD yaala-0.7.3-r1.ebuild 1681 SHA256 0b55a150e6453714d479065aed1b0f3e7b0e7fb0641fb8bc7f06090d814a61d2 SHA512 babadaca079b88ab4a0f8c97b7dbacd36f716c3978fb81fdd8da3f0c441ed5bd05e03602d71f9dc4da2e4b7a4bdc2a3d397acd089d869627a9e6f44138841118 WHIRLPOOL 479b4b211bca1fe2dc24f33c2ec47165fd43d9d9943312daf68659e78e26a369b1669d4344796e81fa1922dafe3cfc34fff2f96332ef821bee25ed8cab84c01f
+EBUILD yaala-0.7.3-r2.ebuild 1629 SHA256 84e3faf6ac4c58a75d7410fab5198a133929927514dce57ba80a0382a84e96af SHA512 776f8319d1ff37d5f64a9b64e8a181716260c8cd8cc69391eac41ac676c59b2e53da093de45d5fcb9f0af2693565c3905d7aefbf687df81497894a7242ec300a WHIRLPOOL a54d8ced2459c74dca735c47ec847e41947240e3f58648e665e43a7da01f8786387f45f3a8b48e0a1d9a0a411700d1094d54f4c73ba843fd5b50084d6d9ac09f
+MISC ChangeLog 3432 SHA256 b384e321425da625f98ad35f834008cc7cac4cc119f3f1658927990b7adfea69 SHA512 e01e5199c20d23cee570a4b3172ad5d39cc9753e7d69062fe2a688965637ab9e2678ca9ca4cca3ccfb3e7327515edd7c978ed7474ada6a6580d3c29559b37565 WHIRLPOOL b343690761a01a649c44380658fb210b8cd5575d86246aba489392c14e89ab3a7c48c62f827946ee1f078c134220738362a0ad772820650ea585f429eeab2eb6
+MISC ChangeLog-2015 3092 SHA256 6b5fc12e2585eddc30cd3364b9c330af13ee24f5292c0b59c0bba537d14cd604 SHA512 3747f10a723b20a11698b265d08ffc58317d67e1afaed04b562af030519e0e0b3f34867d74bfefaf3e9f023eb06ed8c53b854562dd5dc0b696aad7f671523cca WHIRLPOOL 0bc1ac485ed3a454500cf3c3315b006f1f2ee2f854dde4ee4d56d8f6cb92801d797aab40037362cdb7b30de07133efd59654d1fab253e0bde8ad6d41d57030e9
+MISC metadata.xml 337 SHA256 d69e0f2a43f0943a96d59adeb12a921e769c21378982b91f686597b177b02237 SHA512 a24db5faa68733175428ecdfc9c333e5209cfdbaee9e40a23af29d188068d5400d14d60c7239d890d7e66f640c4a2023cabf9b6d131d2abe58f0e90b221119c6 WHIRLPOOL 081d787ae57dad565b17266df8b3635cd4a4d354cce3d1877f421b91227984f43c46b9ab67e69d20204760aa0bd5a31b3585b38356ac2a2d6fce44f00cb21cd7
diff --git a/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
new file mode 100644
index 000000000000..e938abf4b802
--- /dev/null
+++ b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch
@@ -0,0 +1,31 @@
+--- a/yaala 2013-04-03 15:50:03.909024254 +0200
++++ b/yaala 2013-04-03 15:49:46.545691028 +0200
+@@ -58,6 +58,6 @@
+
+ parse_argv (@ARGV);
+-read_config (get_config ('config') ? get_config ('config') : 'config');
++read_config (get_config ('config') ? get_config ('config') : '/etc/yaala/config');
+
+ unless (get_config ('input'))
+ {
+--- a/lib/Yaala/Parser/WebserverTools.pm 2013-04-03 16:04:02.665685730 +0200
++++ b/lib/Yaala/Parser/WebserverTools.pm 2013-04-03 16:04:36.729018853 +0200
+@@ -11,7 +11,7 @@
+ detect_browser detect_os extract_data);
+ @Yaala::Parser::WebserverTools::ISA = ('Exporter');
+
+-read_config ('webserver.config');
++read_config ('/etc/yaala/webserver.config');
+
+ our $referer_format = get_config ('referer_format');
+ our $localhost_name = '';
+--- a/lib/Yaala/Data/Persistent.pm 2013-04-03 16:08:06.935684219 +0200
++++ b/lib/Yaala/Data/Persistent.pm 2013-04-03 16:07:54.229017631 +0200
+@@ -18,5 +18,5 @@
+ our $HAVE_STORABLE = 0;
+ our $WANT_PERSISTENCY = 1;
+ our $DATA_STRUCTURE = {};
+-our $FILENAME = 'persistency.data';
++our $FILENAME = '/var/lib/yaala/persistency.data';
+
+
diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
new file mode 100644
index 000000000000..893290974a28
--- /dev/null
+++ b/app-admin/yaala/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>
+ Yet Another Log Analyzer
+ </longdescription>
+ <use>
+ <flag name="storable">Support for persistence of Perl data structures.</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..e974cd81bf30
--- /dev/null
+++ b/app-admin/yaala/yaala-0.7.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://www.yaala.org/"
+SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gd storable"
+
+RDEPEND="dev-lang/perl
+ gd? ( dev-perl/GDGraph )
+ storable? ( virtual/perl-Storable )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PF}-correct-paths.patch
+
+ sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
+}
+
+src_install() {
+ dobin ${PN}
+
+ # Switch to ^y when we switch to EAPI=6.
+ local mod="Y${PN:1}"
+
+ exeinto /usr/lib64/perl5/vendor_perl/${mod}/
+ doexe lib/${mod}/*.pm
+
+ exeinto /usr/lib64/perl5/vendor_perl/${mod}/Data/
+ doexe lib/${mod}/Data/*.pm
+
+ exeinto /usr/lib64/perl5/vendor_perl/${mod}/Parser/
+ doexe lib/${mod}/Parser/*.pm
+
+ exeinto /usr/lib64/perl5/vendor_perl/${mod}/Report/
+ doexe lib/${mod}/Report/*.pm
+
+ dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
+
+ insinto /usr/share/${PN}
+ doins -r reports
+ doins -r sample_configs
+
+ insinto /etc/${PN}
+ doins {,webserver.}config
+
+ insinto /etc/logrotate.d
+ doins packaging/${PN}.cron
+
+ if use storable ; then
+ dodir /var/lib/${PN}
+ keepdir /var/lib/${PN}
+ chmod 777 /var/lib/${PN}
+ fi
+}
+
+pkg_postinst() {
+ ewarn "It is required that you change the configuration files in /etc/${PN}"
+ ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
+ ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
+ echo ""
+ elog "Example configuration files can be found in /usr/share/${PN}."
+}
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..9265cdda0f52
--- /dev/null
+++ b/app-admin/yaala/yaala-0.7.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils perl-module
+
+DESCRIPTION="Yet Another Log Analyzer"
+HOMEPAGE="http://www.yaala.org/"
+SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gd"
+
+RDEPEND="
+ dev-lang/perl
+ virtual/perl-Storable
+ gd? ( dev-perl/GDGraph )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.7.3-r1-correct-paths.patch
+
+ sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
+}
+
+src_install() {
+ dobin ${PN}
+
+ # Switch to ^y when we switch to EAPI=6.
+ local mod="Y${PN:1}"
+
+ perl_set_version
+
+ insinto "${VENDOR_LIB}/${mod}/"
+ doins lib/${mod}/*.pm
+
+ insinto "${VENDOR_LIB}/${mod}/Data/"
+ doins lib/${mod}/Data/*.pm
+
+ insinto "${VENDOR_LIB}/${mod}/Parser/"
+ doins lib/${mod}/Parser/*.pm
+
+ insinto "${VENDOR_LIB}/${mod}/Report/"
+ doins lib/${mod}/Report/*.pm
+
+ dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
+
+ insinto /usr/share/${PN}
+ doins -r reports
+ doins -r sample_configs
+
+ insinto /etc/${PN}
+ doins {,webserver.}config
+
+ insinto /etc/logrotate.d
+ doins packaging/${PN}.cron
+
+ keepdir /var/lib/${PN}
+ fperms 777 /var/lib/${PN}
+}
+
+pkg_postinst() {
+ ewarn "It is required that you change the configuration files in /etc/${PN}"
+ ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
+ ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
+ echo ""
+ elog "Example configuration files can be found in /usr/share/${PN}."
+}
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
new file mode 100644
index 000000000000..b54d4377cfe3
--- /dev/null
+++ b/app-admin/yadm/Manifest
@@ -0,0 +1,4 @@
+DIST yadm-1.07.tar.gz 34240 SHA256 39f3974c7d8f3930b9dee00d5b1b2181976e60a4e2cd26c35597951c5919a4f6 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144 WHIRLPOOL 615c2411f86f284159e1d9623fabc1600ed1c532bcac31b3a06e8ef11ae6685e11fe14a1b914c10eac1802f8edcd8f9e6f8b67a74b0b121f55243e846886e70a
+EBUILD yadm-1.07.ebuild 895 SHA256 97ef54365bc7ce5d8bb0e1d093941f9247d89cbcd828e532b2c2fb8f1f0da4f9 SHA512 7313f9adeb78b32db14351ddead4d8c13cc81c49ec3cc7ea9d78ed4318bee9704d99890a9fc403679069e830583acbe8e37d32bcf91cf4fc25839f9715a239fa WHIRLPOOL c155e08e9372d9ca97c228063edeaa0b3065aa8d2b812c60a84e0c8b352ee5959a5a9e3be8f1c870d171c90b792524016223e3ba21931be70244412a45249470
+MISC ChangeLog 932 SHA256 d532de1b20c1f7042dd86143c291d6000be208f63236c3d9588aa9a193b3bf4b SHA512 1a20ce8fc829ef5cbddd1ef24eb14e85284ed25a7ac71b4a6b01b249bda7d40b61b7e1c839aed5c99aae34283ae241be6ee0815d35184d15391934529668ae9b WHIRLPOOL e0b4aeaa514edbd8f4c2c5f93230e5cf9db728368d28fe8b058895087b804d9caadc21968ff5fd431269b8acce12d431045e2143e37de6e7855bd4bed210f96e
+MISC metadata.xml 825 SHA256 f41c06318b490ddf8b64c83d54cd5e979f4b1147536c296639c7feeb87b1ac34 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb WHIRLPOOL bf83415335e09f9b591eda821f521559e0c8232babb22db27300327b12817190b5bc3fca762fa2d25f63d3918fab6bea54888177145bdeddc5a0874383684e1d
diff --git a/app-admin/yadm/metadata.xml b/app-admin/yadm/metadata.xml
new file mode 100644
index 000000000000..1151270bb4ea
--- /dev/null
+++ b/app-admin/yadm/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 -->
+ <upstream>
+ <remote-id type="github">TheLocehiliosan/yadm</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ yadm is a dotfile manager that handles the hassle of synchronizing the
+ dotfiles in your home folder across different workstations. It has a
+ philosophy using git and getting out of git's way to ensure it does what it
+ does best. What sets it apart is that it supports encryption, which enables
+ you to add files like mutt configuration with passwords and host it
+ publicly. It also enables you to add suffixes to your files like
+ ##Linux.hostname, and yadm will automatically symlink the file if you are
+ on that hostname.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-admin/yadm/yadm-1.07.ebuild b/app-admin/yadm/yadm-1.07.ebuild
new file mode 100644
index 000000000000..7c5907088202
--- /dev/null
+++ b/app-admin/yadm/yadm-1.07.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 dotfile manager for the config files in your home folder"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DOCS=( CHANGES CONTRIBUTORS README.md )
+
+DEPEND="
+ test? (
+ dev-tcltk/expect
+ dev-util/bats
+ dev-vcs/git
+ )"
+RDEPEND="
+ app-crypt/gnupg
+ dev-vcs/git"
+
+src_compile() {
+ emake yadm.md
+}
+
+src_test() {
+ # 109_accept_encryption tests are interactive, thus fail. Skip them
+ while IFS="" read -d $'\0' -r f ; do
+ bats "${f}" || die "Test ${f} failed"
+ done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -print0)
+}
+
+src_install() {
+ einstalldocs
+
+ dobin "${PN}"
+ doman "${PN}.1"
+}