summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/389-admin-console/389-admin-console-1.1.8-r1.ebuild74
-rw-r--r--app-admin/389-admin-console/Manifest1
-rw-r--r--app-admin/389-admin-console/metadata.xml8
-rw-r--r--app-admin/389-console/389-console-1.1.7-r1.ebuild54
-rw-r--r--app-admin/389-console/Manifest2
-rw-r--r--app-admin/389-console/metadata.xml8
-rw-r--r--app-admin/389-ds-console/389-ds-console-1.2.6-r1.ebuild74
-rw-r--r--app-admin/389-ds-console/Manifest1
-rw-r--r--app-admin/389-ds-console/metadata.xml8
-rw-r--r--app-admin/abrt/Manifest1
-rw-r--r--app-admin/abrt/abrt-2.0.12-r2.ebuild116
-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-init77
-rw-r--r--app-admin/abrt/files/abrt-2.0.6-format-security.patch27
-rw-r--r--app-admin/abrt/metadata.xml5
-rw-r--r--app-admin/amazon-ec2-init/amazon-ec2-init-20101127.ebuild30
-rw-r--r--app-admin/amazon-ec2-init/files/amazon-ec2.init35
-rw-r--r--app-admin/amazon-ec2-init/metadata.xml7
-rw-r--r--app-admin/analog/Manifest1
-rw-r--r--app-admin/analog/analog-6.0-r4.ebuild56
-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.xml8
-rw-r--r--app-admin/ansible/Manifest1
-rw-r--r--app-admin/ansible/ansible-1.9.2.ebuild63
-rw-r--r--app-admin/ansible/ansible-9999.ebuild62
-rw-r--r--app-admin/ansible/files/README.gentoo8
-rw-r--r--app-admin/ansible/files/ansible.env2
-rw-r--r--app-admin/ansible/metadata.xml21
-rw-r--r--app-admin/apache-tools/Manifest4
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.29.ebuild90
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.31.ebuild90
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.12.ebuild93
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.16.ebuild93
-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/Manifest1
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r1.ebuild45
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r2.ebuild37
-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.xml8
-rw-r--r--app-admin/apg/Manifest1
-rw-r--r--app-admin/apg/apg-2.3.0b-r5.ebuild52
-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.xml11
-rw-r--r--app-admin/augeas/Manifest3
-rw-r--r--app-admin/augeas/augeas-0.10.0-r1.ebuild49
-rw-r--r--app-admin/augeas/augeas-0.10.0-r2.ebuild50
-rw-r--r--app-admin/augeas/augeas-0.10.0.ebuild43
-rw-r--r--app-admin/augeas/augeas-1.1.0.ebuild49
-rw-r--r--app-admin/augeas/augeas-1.3.0.ebuild49
-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-bunch-of-them-symlink.patch76
-rw-r--r--app-admin/augeas/metadata.xml17
-rw-r--r--app-admin/authbind/Manifest1
-rw-r--r--app-admin/authbind/authbind-2.1.1.ebuild52
-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/Manifest1
-rw-r--r--app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild64
-rw-r--r--app-admin/aws-as-tools/metadata.xml13
-rw-r--r--app-admin/aws-cw-tools/Manifest1
-rw-r--r--app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild62
-rw-r--r--app-admin/aws-cw-tools/metadata.xml13
-rw-r--r--app-admin/aws-elb-tools/Manifest1
-rw-r--r--app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild61
-rw-r--r--app-admin/aws-elb-tools/metadata.xml7
-rw-r--r--app-admin/aws-iam-tools/Manifest1
-rw-r--r--app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild61
-rw-r--r--app-admin/aws-iam-tools/metadata.xml13
-rw-r--r--app-admin/aws-rds-tools/Manifest1
-rw-r--r--app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild61
-rw-r--r--app-admin/aws-rds-tools/metadata.xml13
-rw-r--r--app-admin/bastille/Manifest2
-rw-r--r--app-admin/bastille/bastille-3.0.9-r1.ebuild70
-rw-r--r--app-admin/bastille/files/bastille-3.0.9-perl.patch25
-rw-r--r--app-admin/bastille/metadata.xml9
-rw-r--r--app-admin/bcfg2/Manifest1
-rw-r--r--app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild67
-rw-r--r--app-admin/bcfg2/files/bcfg2-server-1.2.0.rc23
-rw-r--r--app-admin/bcfg2/metadata.xml19
-rw-r--r--app-admin/calamares/Manifest1
-rw-r--r--app-admin/calamares/calamares-1.1.2-r1.ebuild77
-rw-r--r--app-admin/calamares/files/calamares-pkexec2
-rw-r--r--app-admin/calamares/metadata.xml21
-rw-r--r--app-admin/cancd/Manifest1
-rw-r--r--app-admin/cancd/cancd-0.1.0-r3.ebuild38
-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.d20
-rw-r--r--app-admin/cancd/files/cancd-init.d23
-rw-r--r--app-admin/cancd/files/netconsole-conf.d28
-rw-r--r--app-admin/cancd/files/netconsole-init.d68
-rw-r--r--app-admin/cancd/metadata.xml8
-rw-r--r--app-admin/ccze/Manifest1
-rw-r--r--app-admin/ccze/ccze-0.2.1-r3.ebuild45
-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.xml15
-rw-r--r--app-admin/cdist/Manifest1
-rw-r--r--app-admin/cdist/cdist-3.1.9.ebuild26
-rw-r--r--app-admin/cdist/metadata.xml13
-rw-r--r--app-admin/cgmanager/Manifest2
-rw-r--r--app-admin/cgmanager/cgmanager-0.36-r1.ebuild41
-rw-r--r--app-admin/cgmanager/cgmanager-0.37.ebuild41
-rw-r--r--app-admin/cgmanager/files/cgmanager.initd28
-rw-r--r--app-admin/cgmanager/files/cgproxy.initd37
-rw-r--r--app-admin/cgmanager/metadata.xml8
-rw-r--r--app-admin/checkrestart/Manifest1
-rw-r--r--app-admin/checkrestart/checkrestart-0.47-r3.ebuild38
-rw-r--r--app-admin/checkrestart/files/checkrestart-0.47-list-comprehension-fix.patch11
-rw-r--r--app-admin/checkrestart/metadata.xml7
-rw-r--r--app-admin/chroot_safe/Manifest1
-rw-r--r--app-admin/chroot_safe/chroot_safe-1.4.ebuild36
-rw-r--r--app-admin/chroot_safe/files/chroot_safe-1.4-ldflags.patch13
-rw-r--r--app-admin/chroot_safe/metadata.xml10
-rw-r--r--app-admin/chrootuid/Manifest1
-rw-r--r--app-admin/chrootuid/chrootuid-1.3-r1.ebuild30
-rw-r--r--app-admin/chrootuid/chrootuid-1.3.ebuild30
-rw-r--r--app-admin/chrootuid/metadata.xml7
-rw-r--r--app-admin/chrpath/Manifest1
-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.xml8
-rw-r--r--app-admin/clog/Manifest1
-rw-r--r--app-admin/clog/clog-1.1.0.ebuild38
-rw-r--r--app-admin/clog/metadata.xml8
-rw-r--r--app-admin/clsync/Manifest2
-rw-r--r--app-admin/clsync/clsync-0.4.1.ebuild115
-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.initd18
-rw-r--r--app-admin/clsync/metadata.xml31
-rw-r--r--app-admin/clustershell/Manifest1
-rw-r--r--app-admin/clustershell/clustershell-1.6.ebuild46
-rw-r--r--app-admin/clustershell/metadata.xml10
-rw-r--r--app-admin/collectd/Manifest2
-rw-r--r--app-admin/collectd/collectd-5.4.0.ebuild374
-rw-r--r--app-admin/collectd/collectd-5.4.1-r1.ebuild379
-rw-r--r--app-admin/collectd/collectd-5.4.1.ebuild372
-rw-r--r--app-admin/collectd/files/collectd-4.10.2-libocci.patch20
-rw-r--r--app-admin/collectd/files/collectd-4.10.2-nohal.patch23
-rw-r--r--app-admin/collectd/files/collectd-4.10.3-werror.patch24
-rw-r--r--app-admin/collectd/files/collectd-5.1.0-libperl.patch30
-rw-r--r--app-admin/collectd/files/collectd-5.1.1-lt.patch32
-rw-r--r--app-admin/collectd/files/collectd-5.4.1-libocci.patch21
-rw-r--r--app-admin/collectd/files/collectd-5.4.1-libperl.patch29
-rw-r--r--app-admin/collectd/files/collectd-5.4.1-lt.patch32
-rw-r--r--app-admin/collectd/files/collectd-5.4.1-nohal.patch24
-rw-r--r--app-admin/collectd/files/collectd.confd22
-rw-r--r--app-admin/collectd/files/collectd.initd60
-rw-r--r--app-admin/collectd/files/logrotate9
-rw-r--r--app-admin/collectd/metadata.xml115
-rw-r--r--app-admin/conky/Manifest1
-rw-r--r--app-admin/conky/conky-1.9.0-r3.ebuild145
-rw-r--r--app-admin/conky/files/conky-1.8.1-utf8-scroll.patch104
-rw-r--r--app-admin/conky/files/conky-1.9.0-apcupsd.patch106
-rw-r--r--app-admin/conky/files/conky-1.9.0-default-graph-size.patch18
-rw-r--r--app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch23
-rw-r--r--app-admin/conky/files/conky-1.9.0-lines-fix.patch36
-rw-r--r--app-admin/conky/files/conky-1.9.0-ncurses.patch31
-rw-r--r--app-admin/conky/files/conky-1.9.0-tinfo.patch22
-rw-r--r--app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch75
-rw-r--r--app-admin/conky/metadata.xml36
-rw-r--r--app-admin/conkyforecast/Manifest1
-rw-r--r--app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild45
-rw-r--r--app-admin/conkyforecast/metadata.xml11
-rw-r--r--app-admin/conserver/Manifest1
-rw-r--r--app-admin/conserver/conserver-8.1.18-r1.ebuild87
-rw-r--r--app-admin/conserver/conserver-8.1.18.ebuild87
-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.confd7
-rw-r--r--app-admin/conserver/files/conserver.initd38
-rw-r--r--app-admin/conserver/files/conserver.initd-r138
-rw-r--r--app-admin/conserver/files/conserver.pam-pambase6
-rw-r--r--app-admin/conserver/metadata.xml23
-rw-r--r--app-admin/consolehm/Manifest1
-rw-r--r--app-admin/consolehm/consolehm-1.31.ebuild46
-rw-r--r--app-admin/consolehm/files/consolehm-gcc4.patch10
-rw-r--r--app-admin/consolehm/metadata.xml5
-rw-r--r--app-admin/consul-template/Manifest14
-rw-r--r--app-admin/consul-template/consul-template-0.9.0-r1.ebuild103
-rw-r--r--app-admin/consul-template/consul-template-0.9.0.ebuild103
-rw-r--r--app-admin/consul-template/consul-template-9999.ebuild69
-rw-r--r--app-admin/consul-template/files/consul-template.confd7
-rw-r--r--app-admin/consul-template/files/consul-template.initd25
-rw-r--r--app-admin/consul-template/files/consul-template.service15
-rw-r--r--app-admin/consul-template/files/localhost.json.example1
-rw-r--r--app-admin/consul-template/metadata.xml10
-rw-r--r--app-admin/consul/Manifest27
-rw-r--r--app-admin/consul/consul-0.5.2-r1.ebuild159
-rw-r--r--app-admin/consul/consul-0.5.2.ebuild159
-rw-r--r--app-admin/consul/consul-9999.ebuild115
-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.initd40
-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-dir.json.example3
-rw-r--r--app-admin/consul/metadata.xml13
-rw-r--r--app-admin/cpulimit/Manifest1
-rw-r--r--app-admin/cpulimit/cpulimit-1.8.ebuild30
-rw-r--r--app-admin/cpulimit/files/cpulimit.849
-rw-r--r--app-admin/cpulimit/metadata.xml11
-rw-r--r--app-admin/cronolog/Manifest1
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r3.ebuild29
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r4.ebuild31
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-define-strptime.patch.txt11
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-doc.patch.txt12
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-getopt-long.patch.txt24
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-large-file-patch.txt27
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-missing-symlink-patch.txt11
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-setugid-patch.txt390
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-sigusr1-patch.txt46
-rw-r--r--app-admin/cronolog/files/1.6.2-patches/cronolog-strftime-patch.txt26
-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/Manifest3
-rw-r--r--app-admin/denyhosts/denyhosts-2.6-r10.ebuild92
-rw-r--r--app-admin/denyhosts/denyhosts-2.6-r9.ebuild92
-rw-r--r--app-admin/denyhosts/denyhosts-2.9.ebuild73
-rw-r--r--app-admin/denyhosts/denyhosts-3.0.ebuild64
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-cve-2013-6890.patch60
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-daemon-control.patch12
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-defconffile.patch12
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-foreground_mode.patch137
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-gentoo.patch42
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-hostname.patch21
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-log-injection-regex.patch21
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-plugin_deny.patch23
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.6-single_config_switch.patch24
-rw-r--r--app-admin/denyhosts/files/denyhosts.init-r228
-rw-r--r--app-admin/denyhosts/files/denyhosts.logrotate12
-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.xml11
-rw-r--r--app-admin/diamond/Manifest1
-rw-r--r--app-admin/diamond/diamond-4.0-r1.ebuild77
-rw-r--r--app-admin/diamond/diamond-9999.ebuild67
-rw-r--r--app-admin/diamond/files/diamond-4.0-psutil.patch48
-rw-r--r--app-admin/diamond/files/diamond.confd2
-rwxr-xr-xapp-admin/diamond/files/diamond.initd20
-rw-r--r--app-admin/diamond/metadata.xml22
-rw-r--r--app-admin/dio/Manifest1
-rw-r--r--app-admin/dio/dio-1.5.2.ebuild29
-rw-r--r--app-admin/dio/metadata.xml12
-rw-r--r--app-admin/diradm/Manifest1
-rw-r--r--app-admin/diradm/diradm-2.9.7.1.ebuild76
-rw-r--r--app-admin/diradm/metadata.xml12
-rw-r--r--app-admin/drush/Manifest2
-rw-r--r--app-admin/drush/drush-5.8.ebuild58
-rw-r--r--app-admin/drush/drush-6.5.0.ebuild64
-rw-r--r--app-admin/drush/files/update-bash-completion-script-for-2.1.patch39
-rw-r--r--app-admin/drush/metadata.xml17
-rw-r--r--app-admin/durep/Manifest1
-rw-r--r--app-admin/durep/durep-0.9-r4.ebuild34
-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.xml8
-rw-r--r--app-admin/ec2-ami-tools/Manifest1
-rw-r--r--app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6.ebuild52
-rw-r--r--app-admin/ec2-ami-tools/metadata.xml10
-rw-r--r--app-admin/ec2-api-tools/Manifest1
-rw-r--r--app-admin/ec2-api-tools/ec2-api-tools-1.6.7.2-r4.ebuild90
-rw-r--r--app-admin/ec2-api-tools/metadata.xml10
-rw-r--r--app-admin/eclean-kernel/Manifest2
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild19
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.ebuild19
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-9999.ebuild29
-rw-r--r--app-admin/eclean-kernel/metadata.xml16
-rw-r--r--app-admin/elektra/Manifest5
-rw-r--r--app-admin/elektra/elektra-0.7.1-r5.ebuild81
-rw-r--r--app-admin/elektra/elektra-0.8.12.ebuild120
-rw-r--r--app-admin/elektra/elektra-0.8.3-r3.ebuild92
-rw-r--r--app-admin/elektra/elektra-0.8.6.ebuild69
-rw-r--r--app-admin/elektra/elektra-0.8.7.ebuild86
-rw-r--r--app-admin/elektra/elektra-9999.ebuild120
-rw-r--r--app-admin/elektra/files/elektra-0.7.1-automake-1.12.patch24
-rw-r--r--app-admin/elektra/files/elektra-0.7.1-ltdl.patch21
-rw-r--r--app-admin/elektra/files/elektra-0.7.1-remove-ddefault-link.patch16
-rw-r--r--app-admin/elektra/files/elektra-0.7.1-test.patch123
-rw-r--r--app-admin/elektra/files/elektra-0.8.11-conditional-glob-tests.patch22
-rw-r--r--app-admin/elektra/files/elektra-0.8.3-fix-yajl-if-user-config.patch31
-rw-r--r--app-admin/elektra/files/elektra-0.8.3-introduce-attributes.patch27
-rw-r--r--app-admin/elektra/files/elektra-0.8.7-conditional-glob-tests.patch21
-rw-r--r--app-admin/elektra/metadata.xml18
-rw-r--r--app-admin/emacs-updater/Manifest2
-rw-r--r--app-admin/emacs-updater/emacs-updater-1.13.ebuild30
-rw-r--r--app-admin/emacs-updater/emacs-updater-1.14.ebuild36
-rw-r--r--app-admin/emacs-updater/metadata.xml5
-rw-r--r--app-admin/equo/Manifest1
-rw-r--r--app-admin/equo/equo-254.ebuild39
-rw-r--r--app-admin/equo/metadata.xml11
-rw-r--r--app-admin/eselect/Manifest2
-rw-r--r--app-admin/eselect/eselect-1.3.8.ebuild60
-rw-r--r--app-admin/eselect/eselect-1.4.4.ebuild60
-rw-r--r--app-admin/eselect/eselect-9999.ebuild63
-rw-r--r--app-admin/eselect/metadata.xml5
-rw-r--r--app-admin/evtxtools/Manifest1
-rw-r--r--app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild33
-rw-r--r--app-admin/evtxtools/metadata.xml8
-rw-r--r--app-admin/fam/Manifest2
-rw-r--r--app-admin/fam/fam-2.7.0-r6.ebuild47
-rw-r--r--app-admin/fam/fam-2.7.0-r7.ebuild53
-rw-r--r--app-admin/fam/files/famd27
-rw-r--r--app-admin/fam/metadata.xml8
-rw-r--r--app-admin/fetchlog/Manifest2
-rw-r--r--app-admin/fetchlog/fetchlog-1.0.ebuild40
-rw-r--r--app-admin/fetchlog/fetchlog-1.4.ebuild41
-rw-r--r--app-admin/fetchlog/metadata.xml10
-rw-r--r--app-admin/fifo-cronolog/Manifest1
-rw-r--r--app-admin/fifo-cronolog/fifo-cronolog-1.1.1.ebuild32
-rw-r--r--app-admin/fifo-cronolog/metadata.xml7
-rw-r--r--app-admin/filewatcher/Manifest1
-rw-r--r--app-admin/filewatcher/files/filewatcher.conf24
-rw-r--r--app-admin/filewatcher/filewatcher-2.4.6.ebuild39
-rw-r--r--app-admin/filewatcher/metadata.xml11
-rw-r--r--app-admin/fleet/Manifest2
-rw-r--r--app-admin/fleet/files/fleet.service14
-rw-r--r--app-admin/fleet/files/fleet.socket2
-rw-r--r--app-admin/fleet/files/fleetd.service9
-rw-r--r--app-admin/fleet/fleet-0.11.0-r1.ebuild55
-rw-r--r--app-admin/fleet/fleet-0.11.0.ebuild56
-rw-r--r--app-admin/fleet/fleet-0.11.1.ebuild45
-rw-r--r--app-admin/fleet/fleet-9999.ebuild55
-rw-r--r--app-admin/fleet/metadata.xml17
-rw-r--r--app-admin/fsvs/Manifest1
-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.ebuild56
-rw-r--r--app-admin/fsvs/metadata.xml7
-rw-r--r--app-admin/gam-server/Manifest3
-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.ebuild85
-rw-r--r--app-admin/gam-server/metadata.xml8
-rw-r--r--app-admin/gamin/gamin-0.1.10-r1.ebuild22
-rw-r--r--app-admin/gamin/metadata.xml8
-rw-r--r--app-admin/genromfs/Manifest1
-rw-r--r--app-admin/genromfs/files/genromfs-0.5.2-build.patch28
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild27
-rw-r--r--app-admin/genromfs/metadata.xml12
-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.conf26
-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-r4.ebuild50
-rw-r--r--app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild54
-rw-r--r--app-admin/gentoo-rsync-mirror/metadata.xml9
-rw-r--r--app-admin/geolizer/Manifest3
-rw-r--r--app-admin/geolizer/files/apache.geolizer9
-rw-r--r--app-admin/geolizer/files/geolizer-2.01.10_p20070115-etc-geolizer-conf.patch81
-rw-r--r--app-admin/geolizer/files/geolizer-2.01.10_p20070115-strip.patch10
-rw-r--r--app-admin/geolizer/files/geolizer-language-list.txt136
-rw-r--r--app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild119
-rw-r--r--app-admin/geolizer/metadata.xml5
-rw-r--r--app-admin/gkrellm/Manifest1
-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/gkrellmd22
-rw-r--r--app-admin/gkrellm/files/gkrellmd.conf8
-rw-r--r--app-admin/gkrellm/files/gkrellmd.service10
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild129
-rw-r--r--app-admin/gkrellm/metadata.xml19
-rw-r--r--app-admin/glance/Manifest2
-rw-r--r--app-admin/glance/files/CVE-2015-3289_2015.1.0.patch50
-rw-r--r--app-admin/glance/files/glance-2013.2-sphinx_mapping.patch12
-rw-r--r--app-admin/glance/files/glance.confd1
-rw-r--r--app-admin/glance/files/glance.initd22
-rw-r--r--app-admin/glance/glance-2015.1.0-r1.ebuild186
-rw-r--r--app-admin/glance/glance-2015.1.1.ebuild188
-rw-r--r--app-admin/glance/glance-2015.1.9999.ebuild189
-rw-r--r--app-admin/glance/metadata.xml20
-rw-r--r--app-admin/gnome-system-log/Manifest1
-rw-r--r--app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild39
-rw-r--r--app-admin/gnome-system-log/metadata.xml5
-rw-r--r--app-admin/grubconfig/Manifest1
-rw-r--r--app-admin/grubconfig/grubconfig-1.28-r1.ebuild29
-rw-r--r--app-admin/grubconfig/metadata.xml5
-rw-r--r--app-admin/gtkdiskfree/Manifest1
-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.ebuild46
-rw-r--r--app-admin/gtkdiskfree/metadata.xml19
-rw-r--r--app-admin/hardening-check/Manifest3
-rw-r--r--app-admin/hardening-check/hardening-check-2.5.ebuild27
-rw-r--r--app-admin/hardening-check/hardening-check-2.6.ebuild28
-rw-r--r--app-admin/hardening-check/hardening-check-2.7.ebuild28
-rw-r--r--app-admin/hardening-check/metadata.xml14
-rw-r--r--app-admin/hardinfo/Manifest1
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch64
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch53
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-clang.patch24
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-underlinking.patch16
-rw-r--r--app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild24
-rw-r--r--app-admin/hardinfo/metadata.xml7
-rw-r--r--app-admin/haskell-updater/Manifest6
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.1.ebuild51
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.3.ebuild46
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.6.ebuild46
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.7.ebuild46
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.8.ebuild46
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.9.ebuild46
-rw-r--r--app-admin/haskell-updater/metadata.xml5
-rw-r--r--app-admin/hddtemp/Manifest2
-rw-r--r--app-admin/hddtemp/files/hddgentoo.db236
-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.d13
-rw-r--r--app-admin/hddtemp/files/hddtemp-init23
-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
-rwxr-xr-xapp-admin/hddtemp/files/update-hddtemp.db33
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild94
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild105
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild96
-rw-r--r--app-admin/hddtemp/metadata.xml12
-rw-r--r--app-admin/hwreport/Manifest2
-rw-r--r--app-admin/hwreport/hwreport-0.10.0.ebuild30
-rw-r--r--app-admin/hwreport/hwreport-0.11.0.ebuild30
-rw-r--r--app-admin/hwreport/metadata.xml8
-rw-r--r--app-admin/ide-smart/Manifest1
-rw-r--r--app-admin/ide-smart/ide-smart-1.4-r1.ebuild24
-rw-r--r--app-admin/ide-smart/metadata.xml8
-rw-r--r--app-admin/integrit/Manifest2
-rw-r--r--app-admin/integrit/integrit-4.0.ebuild66
-rw-r--r--app-admin/integrit/integrit-4.1-r1.ebuild66
-rw-r--r--app-admin/integrit/metadata.xml8
-rw-r--r--app-admin/jinit/Manifest1
-rw-r--r--app-admin/jinit/files/jinit-0.1.12-gcc43.patch10
-rw-r--r--app-admin/jinit/jinit-0.1.12-r1.ebuild34
-rw-r--r--app-admin/jinit/metadata.xml7
-rw-r--r--app-admin/kedpm/Manifest1
-rw-r--r--app-admin/kedpm/files/kedpm.desktop16
-rw-r--r--app-admin/kedpm/files/setup-doc.patch12
-rw-r--r--app-admin/kedpm/kedpm-0.4.0-r2.ebuild49
-rw-r--r--app-admin/kedpm/metadata.xml11
-rw-r--r--app-admin/keepass/Manifest3
-rw-r--r--app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch45
-rw-r--r--app-admin/keepass/files/keepass.xml9
-rw-r--r--app-admin/keepass/keepass-2.27.ebuild102
-rw-r--r--app-admin/keepass/keepass-2.28.ebuild105
-rw-r--r--app-admin/keepass/keepass-2.29.ebuild105
-rw-r--r--app-admin/keepass/metadata.xml20
-rw-r--r--app-admin/keepassx/Manifest3
-rw-r--r--app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch11
-rw-r--r--app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch39
-rw-r--r--app-admin/keepassx/keepassx-0.4.3.ebuild43
-rw-r--r--app-admin/keepassx/keepassx-2.0_alpha5.ebuild42
-rw-r--r--app-admin/keepassx/keepassx-2.0_alpha6.ebuild37
-rw-r--r--app-admin/keepassx/metadata.xml16
-rw-r--r--app-admin/killproc/Manifest1
-rw-r--r--app-admin/killproc/files/killproc-2.13-makefile.patch42
-rw-r--r--app-admin/killproc/killproc-2.13-r1.ebuild28
-rw-r--r--app-admin/killproc/metadata.xml7
-rw-r--r--app-admin/kpcli/Manifest2
-rw-r--r--app-admin/kpcli/kpcli-2.7.ebuild42
-rw-r--r--app-admin/kpcli/kpcli-2.8.ebuild42
-rw-r--r--app-admin/kpcli/metadata.xml5
-rw-r--r--app-admin/lastpass-cli/Manifest2
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-0.3.0.ebuild37
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-0.5.0.ebuild37
-rw-r--r--app-admin/lastpass-cli/metadata.xml19
-rw-r--r--app-admin/lastpass/Manifest3
-rw-r--r--app-admin/lastpass/lastpass-3.1.61.ebuild111
-rw-r--r--app-admin/lastpass/metadata.xml15
-rw-r--r--app-admin/lib_users/Manifest1
-rw-r--r--app-admin/lib_users/lib_users-0.9.ebuild33
-rw-r--r--app-admin/lib_users/metadata.xml12
-rw-r--r--app-admin/lnav/Manifest4
-rw-r--r--app-admin/lnav/lnav-0.6.1.ebuild35
-rw-r--r--app-admin/lnav/lnav-0.6.2.ebuild35
-rw-r--r--app-admin/lnav/lnav-0.7.0.ebuild35
-rw-r--r--app-admin/lnav/lnav-0.7.1.ebuild35
-rw-r--r--app-admin/lnav/metadata.xml11
-rw-r--r--app-admin/localepurge/Manifest1
-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.ebuild43
-rw-r--r--app-admin/localepurge/metadata.xml12
-rw-r--r--app-admin/logcheck/Manifest3
-rw-r--r--app-admin/logcheck/files/logcheck.cron10
-rw-r--r--app-admin/logcheck/logcheck-1.3.15-r1.ebuild46
-rw-r--r--app-admin/logcheck/logcheck-1.3.15-r2.ebuild52
-rw-r--r--app-admin/logcheck/logcheck-1.3.16.ebuild52
-rw-r--r--app-admin/logcheck/logcheck-1.3.17.ebuild52
-rw-r--r--app-admin/logcheck/metadata.xml8
-rw-r--r--app-admin/logmon/Manifest1
-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.ebuild42
-rw-r--r--app-admin/logmon/metadata.xml11
-rw-r--r--app-admin/logrotate/Manifest3
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.8-Werror.patch11
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.8-atomic-create.patch45
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.8-fbsd.patch57
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.8-ignore-hidden.patch14
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.8-noasprintf.patch55
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.9-Werror.patch12
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.9-atomic-create.patch43
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.9-fbsd.patch57
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.9-ignore-hidden.patch14
-rw-r--r--app-admin/logrotate/files/logrotate-3.8.9-noasprintf.patch55
-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.conf43
-rw-r--r--app-admin/logrotate/logrotate-3.8.8.ebuild74
-rw-r--r--app-admin/logrotate/logrotate-3.8.9-r1.ebuild82
-rw-r--r--app-admin/logrotate/logrotate-3.8.9.ebuild78
-rw-r--r--app-admin/logrotate/logrotate-3.9.1.ebuild82
-rw-r--r--app-admin/logrotate/metadata.xml26
-rw-r--r--app-admin/logsentry/Manifest1
-rw-r--r--app-admin/logsentry/logsentry-1.1.1-r1.ebuild68
-rw-r--r--app-admin/logsentry/logsentry-1.1.1.ebuild66
-rw-r--r--app-admin/logsentry/metadata.xml8
-rw-r--r--app-admin/logstalgia/Manifest2
-rw-r--r--app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild26
-rw-r--r--app-admin/logstalgia/logstalgia-1.0.6.ebuild34
-rw-r--r--app-admin/logstalgia/metadata.xml12
-rw-r--r--app-admin/logstash-bin/Manifest2
-rw-r--r--app-admin/logstash-bin/files/agent.conf.sample21
-rw-r--r--app-admin/logstash-bin/files/logstash.confd2
-rw-r--r--app-admin/logstash-bin/files/logstash.initd33
-rw-r--r--app-admin/logstash-bin/files/logstash.logrotate6
-rw-r--r--app-admin/logstash-bin/logstash-bin-1.4.4.ebuild50
-rw-r--r--app-admin/logstash-bin/logstash-bin-1.5.3.ebuild53
-rw-r--r--app-admin/logstash-bin/metadata.xml14
-rw-r--r--app-admin/logstash-forwarder/Manifest1
-rw-r--r--app-admin/logstash-forwarder/files/logstash-forwarder.confd1
-rw-r--r--app-admin/logstash-forwarder/files/logstash-forwarder.initd63
-rw-r--r--app-admin/logstash-forwarder/logstash-forwarder-0.4.0.ebuild44
-rw-r--r--app-admin/logstash-forwarder/metadata.xml18
-rw-r--r--app-admin/logsurfer+/Manifest1
-rw-r--r--app-admin/logsurfer+/files/logsurfer-1.8.initd51
-rw-r--r--app-admin/logsurfer+/files/logsurfer.confd4
-rw-r--r--app-admin/logsurfer+/logsurfer+-1.8-r1.ebuild41
-rw-r--r--app-admin/logsurfer+/metadata.xml8
-rw-r--r--app-admin/longrun/Manifest2
-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.ebuild75
-rw-r--r--app-admin/longrun/metadata.xml15
-rw-r--r--app-admin/lsat/Manifest1
-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.ebuild48
-rw-r--r--app-admin/lsat/metadata.xml15
-rw-r--r--app-admin/lsyncd/Manifest1
-rw-r--r--app-admin/lsyncd/lsyncd-2.1.5.ebuild23
-rw-r--r--app-admin/lsyncd/metadata.xml10
-rw-r--r--app-admin/makepasswd/Manifest1
-rw-r--r--app-admin/makepasswd/makepasswd-1.10.ebuild20
-rw-r--r--app-admin/makepasswd/metadata.xml11
-rw-r--r--app-admin/mate-system-tools/Manifest2
-rw-r--r--app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch32
-rw-r--r--app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild66
-rw-r--r--app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild66
-rw-r--r--app-admin/mate-system-tools/metadata.xml19
-rw-r--r--app-admin/matter/Manifest1
-rw-r--r--app-admin/matter/matter-254.ebuild37
-rw-r--r--app-admin/matter/metadata.xml12
-rw-r--r--app-admin/mcelog/Manifest7
-rw-r--r--app-admin/mcelog/files/mcelog-0.8_pre1-timestamp-mcelog.patch8
-rw-r--r--app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-bashism.patch21
-rw-r--r--app-admin/mcelog/files/mcelog-1.0_pre3_p20120918-build.patch42
-rw-r--r--app-admin/mcelog/files/mcelog.init29
-rw-r--r--app-admin/mcelog/files/mcelog.init-r116
-rw-r--r--app-admin/mcelog/files/mcelog.service10
-rw-r--r--app-admin/mcelog/mcelog-1.0_pre3.ebuild49
-rw-r--r--app-admin/mcelog/mcelog-1.0_pre3_p20120918-r1.ebuild59
-rw-r--r--app-admin/mcelog/mcelog-1.0_pre3_p20130621-r1.ebuild60
-rw-r--r--app-admin/mcelog/mcelog-1.0_pre3_p20130621.ebuild59
-rw-r--r--app-admin/mcelog/mcelog-100.ebuild59
-rw-r--r--app-admin/mcelog/mcelog-103.ebuild59
-rw-r--r--app-admin/mcelog/mcelog-109.ebuild59
-rw-r--r--app-admin/mcelog/mcelog-117.ebuild53
-rw-r--r--app-admin/mcelog/metadata.xml23
-rw-r--r--app-admin/mcollective/Manifest1
-rw-r--r--app-admin/mcollective/files/mcollectived.initd29
-rw-r--r--app-admin/mcollective/mcollective-2.8.0.ebuild59
-rw-r--r--app-admin/mcollective/metadata.xml14
-rw-r--r--app-admin/metadata.xml38
-rw-r--r--app-admin/metalog/Manifest1
-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.confd19
-rwxr-xr-xapp-admin/metalog/files/metalog.initd42
-rw-r--r--app-admin/metalog/files/metalog.service-r110
-rw-r--r--app-admin/metalog/metadata.xml11
-rw-r--r--app-admin/metalog/metalog-3-r1.ebuild59
-rw-r--r--app-admin/mktwpol/Manifest2
-rw-r--r--app-admin/mktwpol/metadata.xml42
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.4.ebuild46
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.5.ebuild46
-rw-r--r--app-admin/mms-agent/Manifest2
-rw-r--r--app-admin/mms-agent/files/mms-monitoring-agent.initd25
-rw-r--r--app-admin/mms-agent/metadata.xml21
-rw-r--r--app-admin/mms-agent/mms-agent-3.6.0.201_p1.ebuild71
-rw-r--r--app-admin/mongo-tools/Manifest2
-rw-r--r--app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch10
-rw-r--r--app-admin/mongo-tools/metadata.xml20
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.4-r1.ebuild53
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.5.ebuild53
-rw-r--r--app-admin/monit/Manifest6
-rw-r--r--app-admin/monit/files/monit.initd-5.028
-rw-r--r--app-admin/monit/files/monit.initd-5.0-r139
-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.12.2.ebuild47
-rw-r--r--app-admin/monit/monit-5.13.ebuild47
-rw-r--r--app-admin/monit/monit-5.14.ebuild47
-rw-r--r--app-admin/monit/monit-5.8.1-r1.ebuild49
-rw-r--r--app-admin/monit/monit-5.8.ebuild49
-rw-r--r--app-admin/monit/monit-5.9.ebuild49
-rw-r--r--app-admin/multilog-watch/Manifest2
-rw-r--r--app-admin/multilog-watch/metadata.xml13
-rw-r--r--app-admin/multilog-watch/multilog-watch-1.12.ebuild39
-rw-r--r--app-admin/newsyslog/Manifest1
-rw-r--r--app-admin/newsyslog/files/newsyslog-html.patch21
-rw-r--r--app-admin/newsyslog/metadata.xml8
-rw-r--r--app-admin/newsyslog/newsyslog-1.1.ebuild46
-rw-r--r--app-admin/ngxtop/Manifest2
-rw-r--r--app-admin/ngxtop/files/ngxtop-0.0.2-py3.patch45
-rw-r--r--app-admin/ngxtop/metadata.xml10
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild28
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild29
-rw-r--r--app-admin/openrc-settingsd/Manifest1
-rw-r--r--app-admin/openrc-settingsd/metadata.xml13
-rw-r--r--app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild50
-rw-r--r--app-admin/packagekit-base/Manifest2
-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.7.x-npapi-api-change.patch17
-rw-r--r--app-admin/packagekit-base/files/packagekit-base-0.7.x-npapi-sdk.patch72
-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/metadata.xml22
-rw-r--r--app-admin/packagekit-base/packagekit-base-0.7.4.ebuild185
-rw-r--r--app-admin/packagekit-base/packagekit-base-0.8.15-r1.ebuild122
-rw-r--r--app-admin/packagekit-gtk/Manifest2
-rw-r--r--app-admin/packagekit-gtk/metadata.xml11
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild65
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-0.8.15.ebuild61
-rw-r--r--app-admin/packagekit-qt4/Manifest2
-rw-r--r--app-admin/packagekit-qt4/metadata.xml11
-rw-r--r--app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild68
-rw-r--r--app-admin/packagekit-qt4/packagekit-qt4-0.8.8.ebuild29
-rw-r--r--app-admin/packagekit/metadata.xml11
-rw-r--r--app-admin/packagekit/packagekit-0.7.4.ebuild22
-rw-r--r--app-admin/packagekit/packagekit-0.8.15.ebuild19
-rw-r--r--app-admin/pass/Manifest1
-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.6.5.ebuild74
-rw-r--r--app-admin/pass/pass-9999.ebuild74
-rw-r--r--app-admin/passook/Manifest1
-rw-r--r--app-admin/passook/files/passook.patch26
-rw-r--r--app-admin/passook/metadata.xml9
-rw-r--r--app-admin/passook/passook-20121001.ebuild31
-rw-r--r--app-admin/paxtest/Manifest1
-rw-r--r--app-admin/paxtest/files/paxtest-0.9.13-Makefile.patch21
-rw-r--r--app-admin/paxtest/metadata.xml25
-rw-r--r--app-admin/paxtest/paxtest-0.9.13.ebuild80
-rw-r--r--app-admin/perl-cleaner/Manifest3
-rw-r--r--app-admin/perl-cleaner/metadata.xml8
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.16.ebuild31
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.19.ebuild37
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.20.ebuild37
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-9999.ebuild37
-rw-r--r--app-admin/petrovich/Manifest1
-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.xml11
-rw-r--r--app-admin/petrovich/petrovich-1.0.0.ebuild33
-rw-r--r--app-admin/phpsyslogng/Manifest1
-rw-r--r--app-admin/phpsyslogng/files/postinstall-en.txt8
-rw-r--r--app-admin/phpsyslogng/metadata.xml12
-rw-r--r--app-admin/phpsyslogng/phpsyslogng-2.9.8m-r1.ebuild41
-rw-r--r--app-admin/pprocm/Manifest1
-rw-r--r--app-admin/pprocm/metadata.xml7
-rw-r--r--app-admin/pprocm/pprocm-1.0-r1.ebuild26
-rw-r--r--app-admin/procinfo-ng/Manifest1
-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.xml10
-rw-r--r--app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild41
-rw-r--r--app-admin/procinfo/Manifest1
-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.xml7
-rw-r--r--app-admin/procinfo/procinfo-18-r2.ebuild37
-rw-r--r--app-admin/psmon/Manifest1
-rw-r--r--app-admin/psmon/metadata.xml13
-rw-r--r--app-admin/psmon/psmon-1.39-r1.ebuild32
-rw-r--r--app-admin/puppet-agent/Manifest2
-rw-r--r--app-admin/puppet-agent/files/mcollective.initd19
-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.initd30
-rw-r--r--app-admin/puppet-agent/files/puppet.service14
-rw-r--r--app-admin/puppet-agent/metadata.xml14
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild65
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild76
-rw-r--r--app-admin/puppet-lint/Manifest2
-rw-r--r--app-admin/puppet-lint/metadata.xml10
-rw-r--r--app-admin/puppet-lint/puppet-lint-0.3.2.ebuild22
-rw-r--r--app-admin/puppet-lint/puppet-lint-1.1.0.ebuild25
-rw-r--r--app-admin/puppet/Manifest7
-rw-r--r--app-admin/puppet/files/50puppet-mode-gentoo.el6
-rw-r--r--app-admin/puppet/files/puppet-fix-tests-4.x.patch18
-rw-r--r--app-admin/puppet/files/puppet-openrc-status-fix.patch15
-rwxr-xr-xapp-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
-rwxr-xr-xapp-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.xml29
-rw-r--r--app-admin/puppet/puppet-3.7.3-r1.ebuild189
-rw-r--r--app-admin/puppet/puppet-3.7.4-r2.ebuild191
-rw-r--r--app-admin/puppet/puppet-3.8.1-r1.ebuild191
-rw-r--r--app-admin/puppet/puppet-3.8.2.ebuild191
-rw-r--r--app-admin/puppet/puppet-4.0.0-r2.ebuild163
-rw-r--r--app-admin/puppet/puppet-4.1.0.ebuild163
-rw-r--r--app-admin/puppet/puppet-4.2.1.ebuild175
-rw-r--r--app-admin/puppetdb/Manifest2
-rw-r--r--app-admin/puppetdb/files/puppetdb.initd65
-rw-r--r--app-admin/puppetdb/metadata.xml11
-rw-r--r--app-admin/puppetdb/puppetdb-3.0.1.ebuild91
-rw-r--r--app-admin/puppetdb/puppetdb-3.0.2.ebuild91
-rw-r--r--app-admin/puppetserver/Manifest1
-rw-r--r--app-admin/puppetserver/files/puppetserver.initd65
-rw-r--r--app-admin/puppetserver/metadata.xml14
-rw-r--r--app-admin/puppetserver/puppetserver-2.1.1.ebuild107
-rw-r--r--app-admin/pwcrypt/Manifest1
-rw-r--r--app-admin/pwcrypt/metadata.xml7
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild28
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2.ebuild25
-rw-r--r--app-admin/pwgen/Manifest1
-rw-r--r--app-admin/pwgen/files/2.06-special-char.patch11
-rw-r--r--app-admin/pwgen/files/pwgen.rc19
-rw-r--r--app-admin/pwgen/metadata.xml14
-rw-r--r--app-admin/pwgen/pwgen-2.07.ebuild29
-rw-r--r--app-admin/pydf/Manifest2
-rw-r--r--app-admin/pydf/metadata.xml8
-rw-r--r--app-admin/pydf/pydf-10-r1.ebuild32
-rw-r--r--app-admin/pydf/pydf-12.ebuild32
-rw-r--r--app-admin/python-updater/Manifest3
-rw-r--r--app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch11
-rw-r--r--app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch23
-rw-r--r--app-admin/python-updater/metadata.xml5
-rw-r--r--app-admin/python-updater/python-updater-0.11.ebuild38
-rw-r--r--app-admin/python-updater/python-updater-0.12.ebuild38
-rw-r--r--app-admin/python-updater/python-updater-0.13.ebuild38
-rw-r--r--app-admin/python-updater/python-updater-9999.ebuild38
-rw-r--r--app-admin/qpage/Manifest1
-rw-r--r--app-admin/qpage/files/qpage29
-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.ebuild70
-rw-r--r--app-admin/quickswitch/Manifest1
-rw-r--r--app-admin/quickswitch/metadata.xml12
-rw-r--r--app-admin/quickswitch/quickswitch-1.05.ebuild39
-rw-r--r--app-admin/r10k/Manifest2
-rw-r--r--app-admin/r10k/metadata.xml16
-rw-r--r--app-admin/r10k/r10k-1.1.3-r1.ebuild58
-rw-r--r--app-admin/r10k/r10k-1.5.1.ebuild63
-rw-r--r--app-admin/radmind/Manifest1
-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.ebuild30
-rw-r--r--app-admin/ranpwd/Manifest1
-rw-r--r--app-admin/ranpwd/metadata.xml6
-rw-r--r--app-admin/ranpwd/ranpwd-1.2.ebuild29
-rw-r--r--app-admin/recursos/Manifest1
-rw-r--r--app-admin/recursos/metadata.xml11
-rw-r--r--app-admin/recursos/recursos-2.0.ebuild58
-rw-r--r--app-admin/reportmagic/Manifest1
-rw-r--r--app-admin/reportmagic/metadata.xml11
-rw-r--r--app-admin/reportmagic/reportmagic-2.21.ebuild44
-rw-r--r--app-admin/restart_services/Manifest2
-rw-r--r--app-admin/restart_services/metadata.xml8
-rw-r--r--app-admin/restart_services/restart_services-0.10.0.ebuild28
-rw-r--r--app-admin/restart_services/restart_services-0.11.0.ebuild28
-rw-r--r--app-admin/rex/Manifest3
-rw-r--r--app-admin/rex/metadata.xml13
-rw-r--r--app-admin/rex/rex-1.0.0.ebuild36
-rw-r--r--app-admin/rex/rex-1.2.0.ebuild39
-rw-r--r--app-admin/rex/rex-1.3.2-r1.ebuild62
-rw-r--r--app-admin/rex/rex-1.3.2.ebuild41
-rw-r--r--app-admin/rigo/Manifest1
-rw-r--r--app-admin/rigo/metadata.xml11
-rw-r--r--app-admin/rigo/rigo-254.ebuild48
-rw-r--r--app-admin/rsyslog/Manifest4
-rw-r--r--app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch15
-rw-r--r--app-admin/rsyslog/files/8-stable/10-respect_CFLAGS.patch11
-rw-r--r--app-admin/rsyslog/files/8-stable/50-default.conf95
-rw-r--r--app-admin/rsyslog/files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch56
-rw-r--r--app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch31
-rw-r--r--app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch22
-rw-r--r--app-admin/rsyslog/files/8-stable/README.gentoo36
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.conf61
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.confd30
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.initd69
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog.logrotate37
-rw-r--r--app-admin/rsyslog/metadata.xml40
-rw-r--r--app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild413
-rw-r--r--app-admin/rsyslog/rsyslog-8.9.0.ebuild409
-rw-r--r--app-admin/sagan-rules/Manifest2
-rw-r--r--app-admin/sagan-rules/metadata.xml14
-rw-r--r--app-admin/sagan-rules/sagan-rules-20130430.ebuild29
-rw-r--r--app-admin/sagan-rules/sagan-rules-20140617.ebuild30
-rw-r--r--app-admin/sagan-rules/sagan-rules-99999999.ebuild31
-rw-r--r--app-admin/sagan/Manifest2
-rw-r--r--app-admin/sagan/files/json_header_location.patch26
-rw-r--r--app-admin/sagan/files/mysql_check.patch26
-rw-r--r--app-admin/sagan/files/sagan.confd9
-rw-r--r--app-admin/sagan/files/sagan.init18
-rw-r--r--app-admin/sagan/files/sagan.init-r118
-rw-r--r--app-admin/sagan/metadata.xml24
-rw-r--r--app-admin/sagan/sagan-0.2.3.ebuild86
-rw-r--r--app-admin/sagan/sagan-1.0.0_rc3.ebuild90
-rw-r--r--app-admin/salt/Manifest5
-rw-r--r--app-admin/salt/files/api-confd-15
-rw-r--r--app-admin/salt/files/api-initd-314
-rw-r--r--app-admin/salt/files/api-initd-415
-rw-r--r--app-admin/salt/files/master-confd-15
-rw-r--r--app-admin/salt/files/master-initd-314
-rw-r--r--app-admin/salt/files/master-initd-415
-rw-r--r--app-admin/salt/files/minion-confd-15
-rw-r--r--app-admin/salt/files/minion-initd-315
-rw-r--r--app-admin/salt/files/minion-initd-416
-rw-r--r--app-admin/salt/files/salt-2014.7.0-remove-pydsl-includes-test.patch104
-rw-r--r--app-admin/salt/files/salt-2014.7.1-remove-pydsl-includes-test.patch104
-rw-r--r--app-admin/salt/files/salt-2014.7.5-archive-test.patch15
-rw-r--r--app-admin/salt/files/salt-2015.5.0-archive-test.patch15
-rw-r--r--app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch20
-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-314
-rw-r--r--app-admin/salt/files/syndic-initd-415
-rw-r--r--app-admin/salt/metadata.xml43
-rw-r--r--app-admin/salt/salt-2014.7.4.ebuild108
-rw-r--r--app-admin/salt/salt-2014.7.5.ebuild109
-rw-r--r--app-admin/salt/salt-2015.5.1.ebuild117
-rw-r--r--app-admin/salt/salt-2015.5.3.ebuild116
-rw-r--r--app-admin/salt/salt-9999.ebuild104
-rw-r--r--app-admin/setools/Manifest4
-rw-r--r--app-admin/setools/files/fix-check-role_set_expand-libsepol-2.1.0.patch24
-rw-r--r--app-admin/setools/files/fix-implicit-def-fstat.patch13
-rw-r--r--app-admin/setools/files/setools3-userspace-2.4-compatibility.patch114
-rw-r--r--app-admin/setools/metadata.xml9
-rw-r--r--app-admin/setools/setools-3.3.8-r5.ebuild160
-rw-r--r--app-admin/setools/setools-3.3.8-r7.ebuild138
-rw-r--r--app-admin/setools/setools-9999.ebuild45
-rw-r--r--app-admin/showconsole/Manifest1
-rw-r--r--app-admin/showconsole/files/1.07-no-TIOCGDEV.patch27
-rw-r--r--app-admin/showconsole/files/bootlogger.sh33
-rw-r--r--app-admin/showconsole/files/showconsole-1.08-build.patch13
-rw-r--r--app-admin/showconsole/files/showconsole-1.08-no-pthread-yield.patch17
-rw-r--r--app-admin/showconsole/files/showconsole-1.08-quiet.patch34
-rw-r--r--app-admin/showconsole/metadata.xml5
-rw-r--r--app-admin/showconsole/showconsole-1.08.ebuild41
-rw-r--r--app-admin/socklog/Manifest1
-rw-r--r--app-admin/socklog/files/socklog-2.1.0-headers.patch54
-rw-r--r--app-admin/socklog/metadata.xml5
-rw-r--r--app-admin/socklog/socklog-2.1.0.ebuild37
-rw-r--r--app-admin/sshguard/Manifest1
-rw-r--r--app-admin/sshguard/files/sshguard-1.5-day-starts-with-0.patch11
-rw-r--r--app-admin/sshguard/files/sshguard.confd22
-rw-r--r--app-admin/sshguard/files/sshguard.initd25
-rw-r--r--app-admin/sshguard/metadata.xml11
-rw-r--r--app-admin/sshguard/sshguard-1.5-r1.ebuild50
-rw-r--r--app-admin/sshguard/sshguard-1.5-r2.ebuild58
-rw-r--r--app-admin/sshguard/sshguard-1.5-r3.ebuild58
-rw-r--r--app-admin/stow/Manifest1
-rw-r--r--app-admin/stow/files/99stow3
-rw-r--r--app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch13
-rw-r--r--app-admin/stow/metadata.xml13
-rw-r--r--app-admin/stow/stow-2.2.0-r2.ebuild46
-rw-r--r--app-admin/sud/Manifest1
-rw-r--r--app-admin/sud/files/sud.rc621
-rw-r--r--app-admin/sud/metadata.xml11
-rw-r--r--app-admin/sud/sud-1.3-r1.ebuild48
-rw-r--r--app-admin/sudo/Manifest3
-rw-r--r--app-admin/sudo/files/sudo-1.8.12-include-sys-types-h.patch146
-rw-r--r--app-admin/sudo/metadata.xml22
-rw-r--r--app-admin/sudo/sudo-1.8.12.ebuild197
-rw-r--r--app-admin/sudo/sudo-1.8.13.ebuild196
-rw-r--r--app-admin/sudo/sudo-1.8.14_p3.ebuild196
-rw-r--r--app-admin/sudo/sudo-9999.ebuild202
-rw-r--r--app-admin/sulfur/Manifest1
-rw-r--r--app-admin/sulfur/metadata.xml11
-rw-r--r--app-admin/sulfur/sulfur-1.0_rc104-r1.ebuild53
-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.xml5
-rw-r--r--app-admin/superadduser/superadduser-1.0.9.ebuild19
-rw-r--r--app-admin/supernova/Manifest3
-rw-r--r--app-admin/supernova/metadata.xml14
-rw-r--r--app-admin/supernova/supernova-1.0.7.ebuild39
-rw-r--r--app-admin/supernova/supernova-2.0.0.ebuild45
-rw-r--r--app-admin/supernova/supernova-2.0.5.ebuild53
-rw-r--r--app-admin/supervisor/Manifest1
-rw-r--r--app-admin/supervisor/files/conf.d4
-rw-r--r--app-admin/supervisor/files/init.d28
-rw-r--r--app-admin/supervisor/files/init.d-r113
-rw-r--r--app-admin/supervisor/metadata.xml8
-rw-r--r--app-admin/supervisor/supervisor-3.1.3.ebuild47
-rw-r--r--app-admin/swatch/Manifest1
-rw-r--r--app-admin/swatch/files/swatch-confd25
-rw-r--r--app-admin/swatch/files/swatch-init53
-rw-r--r--app-admin/swatch/files/swatch-initd52
-rw-r--r--app-admin/swatch/files/swatchrc10
-rw-r--r--app-admin/swatch/metadata.xml24
-rw-r--r--app-admin/swatch/swatch-3.2.3-r2.ebuild31
-rw-r--r--app-admin/sxid/Manifest1
-rw-r--r--app-admin/sxid/metadata.xml11
-rw-r--r--app-admin/sxid/sxid-4.2-r1.ebuild32
-rw-r--r--app-admin/sysklogd/Manifest2
-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-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.rc775
-rw-r--r--app-admin/sysklogd/metadata.xml8
-rw-r--r--app-admin/sysklogd/sysklogd-1.5.1.ebuild61
-rw-r--r--app-admin/syslog-ng/Manifest3
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo37
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.fbsd25
-rw-r--r--app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo.hardened115
-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.rc659
-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.gentoo37
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd25
-rw-r--r--app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened115
-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.rc659
-rw-r--r--app-admin/syslog-ng/files/README.hardened13
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate13
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.hardened76
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in76
-rw-r--r--app-admin/syslog-ng/files/syslog-ng.logrotate.in13
-rw-r--r--app-admin/syslog-ng/metadata.xml17
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.4.8.ebuild120
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.2.ebuild124
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.4.ebuild124
-rw-r--r--app-admin/syslog-summary/Manifest1
-rw-r--r--app-admin/syslog-summary/metadata.xml11
-rw-r--r--app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild39
-rw-r--r--app-admin/syslogread/Manifest1
-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.xml11
-rw-r--r--app-admin/syslogread/syslogread-0.92-r1.ebuild91
-rw-r--r--app-admin/sysrqd/Manifest1
-rw-r--r--app-admin/sysrqd/files/sysrqd-config.patch13
-rwxr-xr-xapp-admin/sysrqd/files/sysrqd.init32
-rw-r--r--app-admin/sysrqd/metadata.xml14
-rw-r--r--app-admin/sysrqd/sysrqd-14.ebuild56
-rw-r--r--app-admin/sysstat/Manifest3
-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.d19
-rw-r--r--app-admin/sysstat/metadata.xml12
-rw-r--r--app-admin/sysstat/sysstat-11.0.2.ebuild87
-rw-r--r--app-admin/sysstat/sysstat-11.0.5-r1.ebuild89
-rw-r--r--app-admin/sysstat/sysstat-11.1.5-r1.ebuild89
-rw-r--r--app-admin/system-config-printer/Manifest1
-rw-r--r--app-admin/system-config-printer/metadata.xml10
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.4.8.ebuild102
-rw-r--r--app-admin/system-tools-backends/Manifest1
-rw-r--r--app-admin/system-tools-backends/files/stb.rc21
-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.xml10
-rw-r--r--app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild67
-rw-r--r--app-admin/systemrescuecd-x86/Manifest6
-rw-r--r--app-admin/systemrescuecd-x86/metadata.xml11
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild55
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild55
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild55
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild55
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild55
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild55
-rw-r--r--app-admin/tenshi/Manifest3
-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.xml13
-rw-r--r--app-admin/tenshi/tenshi-0.12.ebuild51
-rw-r--r--app-admin/tenshi/tenshi-0.14.ebuild47
-rw-r--r--app-admin/tenshi/tenshi-0.15.ebuild47
-rw-r--r--app-admin/testdisk/Manifest4
-rw-r--r--app-admin/testdisk/files/fix_rare_crash-6.14.patch227
-rw-r--r--app-admin/testdisk/files/install-gentoo.patch25
-rw-r--r--app-admin/testdisk/metadata.xml15
-rw-r--r--app-admin/testdisk/testdisk-6.12.ebuild59
-rw-r--r--app-admin/testdisk/testdisk-6.13.ebuild59
-rw-r--r--app-admin/testdisk/testdisk-6.14-r1.ebuild83
-rw-r--r--app-admin/testdisk/testdisk-6.14.ebuild60
-rw-r--r--app-admin/testdisk/testdisk-7.0-r1.ebuild78
-rw-r--r--app-admin/testdisk/testdisk-7.0-r2.ebuild82
-rw-r--r--app-admin/testdisk/testdisk-7.0.ebuild77
-rw-r--r--app-admin/tmpreaper/Manifest1
-rw-r--r--app-admin/tmpreaper/files/tmpreaper-1.6.13-gentoo.patch47
-rw-r--r--app-admin/tmpreaper/files/tmpreaper-1.6.7-fix-protect.patch46
-rw-r--r--app-admin/tmpreaper/metadata.xml24
-rw-r--r--app-admin/tmpreaper/tmpreaper-1.6.13.ebuild45
-rw-r--r--app-admin/tmpwatch/Manifest1
-rw-r--r--app-admin/tmpwatch/files/tmpwatch-2.11-boottime.patch30
-rw-r--r--app-admin/tmpwatch/files/tmpwatch.cron48
-rw-r--r--app-admin/tmpwatch/metadata.xml8
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11-r1.ebuild37
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11.ebuild32
-rw-r--r--app-admin/tripwire/Manifest1
-rw-r--r--app-admin/tripwire/files/tripwire10
-rw-r--r--app-admin/tripwire/files/tripwire-2.4.2.2-buildnum.patch7
-rw-r--r--app-admin/tripwire/files/tripwire-2.4.2.2-exception-shadowing.patch13
-rw-r--r--app-admin/tripwire/files/tripwire-2.4.2.2-fix-configure.patch12
-rw-r--r--app-admin/tripwire/files/tripwire-2.4.2.2-gcc-4.7.patch25
-rw-r--r--app-admin/tripwire/files/tripwire-twpol-GENERIC.patch25
-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.xml34
-rw-r--r--app-admin/tripwire/tripwire-2.4.2.2-r3.ebuild82
-rw-r--r--app-admin/ulogd/Manifest2
-rw-r--r--app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch100
-rw-r--r--app-admin/ulogd/files/ulogd-2.0.5-remove-db-automagic.patch45
-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.xml19
-rw-r--r--app-admin/ulogd/ulogd-2.0.4-r1.ebuild140
-rw-r--r--app-admin/ulogd/ulogd-2.0.5.ebuild141
-rw-r--r--app-admin/usbview/Manifest1
-rw-r--r--app-admin/usbview/metadata.xml5
-rw-r--r--app-admin/usbview/usbview-2.0.ebuild37
-rw-r--r--app-admin/usermin/Manifest1
-rw-r--r--app-admin/usermin/files/init.d.usermin38
-rw-r--r--app-admin/usermin/files/usermin-1.080-safestop.patch12
-rw-r--r--app-admin/usermin/files/usermin-1.150-setup-nocheck.patch22
-rw-r--r--app-admin/usermin/files/usermin-1.540-r1.init38
-rw-r--r--app-admin/usermin/files/usermin.pam-include.111
-rw-r--r--app-admin/usermin/metadata.xml13
-rw-r--r--app-admin/usermin/usermin-1.600.ebuild89
-rw-r--r--app-admin/vault/Manifest3
-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.initd25
-rw-r--r--app-admin/vault/files/vault.service17
-rw-r--r--app-admin/vault/metadata.xml7
-rw-r--r--app-admin/vault/vault-0.1.2-r1.ebuild101
-rw-r--r--app-admin/vault/vault-0.1.2.ebuild101
-rw-r--r--app-admin/vault/vault-9999.ebuild97
-rw-r--r--app-admin/verynice/Manifest1
-rw-r--r--app-admin/verynice/files/verynice20
-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.xml11
-rw-r--r--app-admin/verynice/verynice-1.1-r2.ebuild33
-rw-r--r--app-admin/watchfolder/Manifest1
-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.xml10
-rw-r--r--app-admin/watchfolder/watchfolder-0.3.3.ebuild44
-rw-r--r--app-admin/webalizer/Manifest7
-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.xml12
-rw-r--r--app-admin/webalizer/webalizer-2.23.05.ebuild134
-rw-r--r--app-admin/webalizer/webalizer-2.23.08.ebuild148
-rw-r--r--app-admin/webapp-config/Manifest3
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch42
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-apache-move.patch13
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-baselayout2.patch13
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-fix-unicode-tests.patch39
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-htdocs-symlink.patch13
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.50.16-update-servers.patch80
-rw-r--r--app-admin/webapp-config/files/webapp-config-1.51-fix-indentation.patch25
-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-pvr-check.patch49
-rw-r--r--app-admin/webapp-config/metadata.xml16
-rw-r--r--app-admin/webapp-config/webapp-config-1.52-r1.ebuild65
-rw-r--r--app-admin/webapp-config/webapp-config-1.53-r2.ebuild68
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r1.ebuild65
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild69
-rw-r--r--app-admin/webmin/Manifest2
-rwxr-xr-xapp-admin/webmin/files/gentoo-setup417
-rw-r--r--app-admin/webmin/files/init.d.webmin86
-rw-r--r--app-admin/webmin/files/webmin.service18
-rw-r--r--app-admin/webmin/metadata.xml13
-rw-r--r--app-admin/webmin/webmin-1.730.ebuild304
-rw-r--r--app-admin/whowatch/Manifest1
-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.xml12
-rw-r--r--app-admin/whowatch/whowatch-1.8.5.ebuild35
-rw-r--r--app-admin/xstow/Manifest1
-rw-r--r--app-admin/xstow/files/99xstow3
-rw-r--r--app-admin/xstow/files/xstow-0.5.1-gcc43.patch67
-rw-r--r--app-admin/xstow/files/xstow-1.0.1-ncurses.patch56
-rw-r--r--app-admin/xstow/metadata.xml17
-rw-r--r--app-admin/xstow/xstow-1.0.1.ebuild49
-rw-r--r--app-admin/xtail/Manifest2
-rw-r--r--app-admin/xtail/metadata.xml9
-rw-r--r--app-admin/xtail/xtail-2.1-r1.ebuild36
-rw-r--r--app-admin/xtail/xtail-2.1.ebuild26
-rw-r--r--app-admin/yaala/Manifest1
-rw-r--r--app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch31
-rw-r--r--app-admin/yaala/metadata.xml13
-rw-r--r--app-admin/yaala/yaala-0.7.3-r1.ebuild68
1170 files changed, 43452 insertions, 0 deletions
diff --git a/app-admin/389-admin-console/389-admin-console-1.1.8-r1.ebuild b/app-admin/389-admin-console/389-admin-console-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..9062bf185770
--- /dev/null
+++ b/app-admin/389-admin-console/389-admin-console-1.1.8-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=${PV/_alpha/.a}
+MY_PV=${MY_PV/_rc/.rc}
+
+DESCRIPTION="389 Server Management Console (jar and help files)"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jss:3.4
+ dev-java/ldapsdk:4.1
+ >=dev-java/idm-console-framework-1.1.7"
+RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 )
+ ${COMMON_DEP}"
+DEPEND="sys-apps/sed
+ >=virtual/jdk-1.5
+ ${COMMON_DEP}"
+PDEPEND="net-nds/389-admin"
+
+src_prepare() {
+ # Gentoo java rules say no jars with version number
+ # so sed away the version indicator '-'
+ sed -e "s!-\*!\*!g" -i build.xml
+
+ 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.location="${S}" \
+ -Djss.location="${S}" \
+ -Dconsole.location="${S}" ${antflags}
+ use doc && eant -Dbuilt.dir="${S}"/build \
+ -Dldapjdk.location="${S}" \
+ -Djss.location="${S}" \
+ -Dconsole.location="${S}" ${antflags} javadoc
+}
+
+src_install() {
+ java-pkg_jarinto /usr/share/dirsrv/html/java
+ # have to install versioned jars, otherwise 389-console will crash
+ java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}.jar 389-admin-${MY_PV}.jar
+ java-pkg_newjar "${S}"/build/package/389-admin-${MY_PV}_en.jar 389-admin-${MY_PV}_en.jar
+
+ dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin.jar
+ dosym 389-admin-${MY_PV}.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}.jar
+ dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin_en.jar
+ dosym 389-admin-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-admin-${SLOT}_en.jar
+
+ insinto /usr/share/dirsrv/manual/en/admin
+ doins "${S}"/help/en/*.html
+ doins "${S}"/help/en/tokens.map
+
+ insinto /usr/share/dirsrv/manual/en/admin/help
+ doins "${S}"/help/en/help/*.html
+
+ use doc && java-pkg_dojavadoc build/doc
+ use source && java-pkg_dosrc src/com
+}
diff --git a/app-admin/389-admin-console/Manifest b/app-admin/389-admin-console/Manifest
new file mode 100644
index 000000000000..78af32deafc6
--- /dev/null
+++ b/app-admin/389-admin-console/Manifest
@@ -0,0 +1 @@
+DIST 389-admin-console-1.1.8.tar.bz2 126004 SHA256 6f2e05299876c11380c6b98540772d45a0e2128f3ec9fcd15f9cd7cc80ce4e4d SHA512 85ac61f8032450e1a86f973b244c136784016bfe6782fff2b992881fd427190223cd4655caf6a592bda7bc8b13e6dde04a5644abbc833c0472c287127a397ae5 WHIRLPOOL f286f37744a12400f27732d17e0d1deb7b09f1801b9f110db8835ef1ff0e1d39bb7f1b897c708938ba6668a9adcfc17a46972d1a7eac57dd4d088a9d65dab519
diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
new file mode 100644
index 000000000000..f941fa3103d1
--- /dev/null
+++ b/app-admin/389-admin-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>
+<herd>java</herd>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
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..2ede4b173fb5
--- /dev/null
+++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE=""
+
+inherit java-pkg-2 eutils 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
+ http://dev.gentoo.org/~lxnay/${PN}/fedora.png"
+
+LICENSE="LGPL-2.1"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jss:3.4
+ dev-java/ldapsdk:4.1
+ >=dev-java/idm-console-framework-1.1"
+
+RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
+ ${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${COMMON_DEP}"
+
+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} \
+ || die "eant failed"
+}
+
+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}\"" \
+ || die
+
+ doicon "${DISTDIR}"/fedora.png || die "doicon failed"
+ 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..aeac3cb71d2e
--- /dev/null
+++ b/app-admin/389-console/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
new file mode 100644
index 000000000000..2061856c98ee
--- /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>
+<herd>java</herd>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/389-ds-console/389-ds-console-1.2.6-r1.ebuild b/app-admin/389-ds-console/389-ds-console-1.2.6-r1.ebuild
new file mode 100644
index 000000000000..918732df5032
--- /dev/null
+++ b/app-admin/389-ds-console/389-ds-console-1.2.6-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_PV=${PV/_alpha/.a}
+MY_PV=${MY_PV/_rc/.rc}
+MY_MV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Java based remote management console used for Managing 389-admin 389-ds"
+HOMEPAGE="http://port389.org/"
+SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jss:3.4
+ dev-java/ldapsdk:4.1
+ >=dev-java/idm-console-framework-1.1
+ net-nds/389-ds-base"
+RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
+ ${COMMON_DEP}"
+DEPEND="sys-apps/sed
+ >=virtual/jdk-1.6
+ ${COMMON_DEP}"
+
+src_prepare() {
+ # Gentoo java rules say no jars with version number
+ # so sed away the version indicator '-'
+ sed -e "s!-\*!\*!g" -i build.xml || die "sed failed"
+
+ 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.location="${S}" \
+ -Djss.location="${S}" \
+ -Dconsole.location="${S}" ${antflags}
+ use doc && eant -Dbuilt.dir="${S}"/build \
+ -Dldapjdk.location="${S}" \
+ -Djss.location="${S}" \
+ -Dconsole.location="${S}" ${antflags} javadoc
+}
+
+src_install() {
+ java-pkg_jarinto /usr/share/dirsrv/html/java
+ java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}.jar 389-ds-${MY_PV}.jar
+ java-pkg_newjar "${S}"/build/package/389-ds-${MY_PV}_en.jar 389-ds-${MY_PV}_en.jar
+
+ dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds.jar
+ dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds_en.jar
+ dosym 389-ds-${MY_PV}.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}.jar
+ dosym 389-ds-${MY_PV}_en.jar /usr/share/dirsrv/html/java/389-ds-${MY_MV}_en.jar
+
+ insinto /usr/share/dirsrv/manual/en/slapd
+ doins "${S}"/help/en/*.html
+ doins "${S}"/help/en/tokens.map
+
+ insinto /usr/share/dirsrv/manual/en/slapd/help
+ doins "${S}"/help/en/help/*.html
+
+ use doc && java-pkg_dojavadoc build/doc
+ use source && java-pkg_dosrc src/com
+}
diff --git a/app-admin/389-ds-console/Manifest b/app-admin/389-ds-console/Manifest
new file mode 100644
index 000000000000..681aca50118c
--- /dev/null
+++ b/app-admin/389-ds-console/Manifest
@@ -0,0 +1 @@
+DIST 389-ds-console-1.2.6.tar.bz2 791388 SHA256 142a8e1e22bb4c617d2bcdb3d2257e92f2b34d2cd839ed1325f59fc52b70f410 SHA512 ae62afec7860365156f991a420c701e7057190793f577823e5f8b0e1e3d9c9fb240f8d2f30d9a9160baa86aa968e242ef6a9d9faf6608e1218da8f071a620e02 WHIRLPOOL def2e14fb8c7771711efde18cb53f6d6c36de077221c27e219cf97797a5d5c6fb126bf9485a2133676be2f239c065970fb8731c9ddccf3088bcc18ab485169f5
diff --git a/app-admin/389-ds-console/metadata.xml b/app-admin/389-ds-console/metadata.xml
new file mode 100644
index 000000000000..2061856c98ee
--- /dev/null
+++ b/app-admin/389-ds-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>
+<herd>java</herd>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
new file mode 100644
index 000000000000..9e28084abaf1
--- /dev/null
+++ b/app-admin/abrt/Manifest
@@ -0,0 +1 @@
+DIST abrt-2.0.12.tar.gz 1090121 SHA256 2957f4136958078c3c8c9b2031febd8b322ef8705ca25a51592279b3ccd5c9e2 SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a WHIRLPOOL 9b39fe91f77e2de5b3816d5cfc10f75c7c3d7dedfc354ed4e052b50e6cebb94bd26fec94aaba6cfd1cc79b71f1cc34b77bfd70d27d25761fa853a6a2af5ef7ce
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..b9da8ae1e7f7
--- /dev/null
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://fedorahosted.org/abrt/"
+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..b3e57431bf48
--- /dev/null
+++ b/app-admin/abrt/files/abrt-2.0.12-r1-init
@@ -0,0 +1,77 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..dad9001338dc
--- /dev/null
+++ b/app-admin/abrt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127.ebuild
new file mode 100644
index 000000000000..885b6f872592
--- /dev/null
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="Init script to setup Amazon EC2 instance parameters"
+HOMEPAGE="http://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=""
+
+src_install() {
+ newinitd "${FILESDIR}/amazon-ec2.init" amazon-ec2 || die
+}
+
+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..4a13e5aaf547
--- /dev/null
+++ b/app-admin/amazon-ec2-init/files/amazon-ec2.init
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1470e032181b
--- /dev/null
+++ b/app-admin/amazon-ec2-init/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
new file mode 100644
index 000000000000..173efca8b0ac
--- /dev/null
+++ b/app-admin/analog/Manifest
@@ -0,0 +1 @@
+DIST analog-6.0.tar.gz 1553316 SHA256 31c0e2bedd0968f9d4657db233b20427d8c497be98194daf19d6f859d7f6fcca SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60 WHIRLPOOL fd5b2685cf443a3336904973cfd2985a2393a5d021b06708d23ac717f6e4f53310942923ae3e41c69640d22b435e6bd0d44647502ec50af7b0517f9f48aa14cb
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..344dd3829a6f
--- /dev/null
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A webserver log analyzer"
+HOMEPAGE="http://www.analog.cx/"
+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..f9d50da18d39
--- /dev/null
+++ b/app-admin/analog/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>
+ <email>maintainer-needed@gentoo.org</email>
+ <description>This package lacks a primary herd or maintainer.</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
new file mode 100644
index 000000000000..282ffd0a6332
--- /dev/null
+++ b/app-admin/ansible/Manifest
@@ -0,0 +1 @@
+DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
diff --git a/app-admin/ansible/ansible-1.9.2.ebuild b/app-admin/ansible/ansible-1.9.2.ebuild
new file mode 100644
index 000000000000..a08091ba13b4
--- /dev/null
+++ b/app-admin/ansible/ansible-1.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/keyczar[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ EXAMPLES=( examples )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+
+ newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+ distutils-r1_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
new file mode 100644
index 000000000000..175ebc5dcfbf
--- /dev/null
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-r3 readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/ansible/ansible.git"
+EGIT_BRANCH="devel"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/keyczar[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ EXAMPLES=( examples )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+
+ newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+ distutils-r1_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-admin/ansible/files/README.gentoo b/app-admin/ansible/files/README.gentoo
new file mode 100644
index 000000000000..828e13cddeb6
--- /dev/null
+++ b/app-admin/ansible/files/README.gentoo
@@ -0,0 +1,8 @@
+You can define parameters through shell variables OR use config files
+Examples of config files installed in /usr/share/ansible/examples
+You have to create ansible hosts file!
+More info on http://docs.ansible.com/intro_getting_started.html
+
+Some optional dependencies, you might want to install:
+dev-python/keyczar - needed to support accelerated mode
+dev-python/paramiko - alternative SSH backend"
diff --git a/app-admin/ansible/files/ansible.env b/app-admin/ansible/files/ansible.env
new file mode 100644
index 000000000000..9df5a2ab5a9a
--- /dev/null
+++ b/app-admin/ansible/files/ansible.env
@@ -0,0 +1,2 @@
+# Use ssh transport by default. Comment it out if you want to use paramiko
+ANSIBLE_TRANSPORT="ssh"
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
new file mode 100644
index 000000000000..cc686a343c0f
--- /dev/null
+++ b/app-admin/ansible/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>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</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..d0beaf9580b6
--- /dev/null
+++ b/app-admin/apache-tools/Manifest
@@ -0,0 +1,4 @@
+DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
+DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
+DIST httpd-2.4.12.tar.bz2 5054838 SHA256 ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4 SHA512 f69db14b421f0e1e4861fe4d8b652688d50ca9eb41c622242d11ae55687eb6c2142a8505a8c3fb6f2bd53167be535bc0a77ca1af97e0720930fc7f20f4c1f8e8 WHIRLPOOL 56512066e8978c4a3d47d0cc2bb92093fd468a9b2f46b8b07fe4db366f55fa5e74ae58bbebe2377cbe0c66f1585759115c786f62f18ac1abc534fb257689d250
+DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
diff --git a/app-admin/apache-tools/apache-tools-2.2.29.ebuild b/app-admin/apache-tools/apache-tools-2.2.29.ebuild
new file mode 100644
index 000000000000..a0a17b5dee90
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.29.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://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.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
new file mode 100644
index 000000000000..abeb8444f490
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://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.4.12.ebuild b/app-admin/apache-tools/apache-tools-2.4.12.ebuild
new file mode 100644
index 000000000000..0dbc9b827f25
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.12.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="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? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
+
+ # This package really should upgrade to using pcre's .pc file.
+ cat <<-\EOF >"${T}"/pcre-config
+ #!/bin/sh
+ [ "${flag}" = "--version" ] && set -- --modversion
+ exec ${PKG_CONFIG} libpcre "$@"
+ 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.16.ebuild b/app-admin/apache-tools/apache-tools-2.4.16.ebuild
new file mode 100644
index 000000000000..0dbc9b827f25
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.16.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="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? ( dev-libs/openssl:0= )"
+
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
+
+ # This package really should upgrade to using pcre's .pc file.
+ cat <<-\EOF >"${T}"/pcre-config
+ #!/bin/sh
+ [ "${flag}" = "--version" ] && set -- --modversion
+ exec ${PKG_CONFIG} libpcre "$@"
+ 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..0ac4885feed6
--- /dev/null
+++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
@@ -0,0 +1,41 @@
+=== modified file 'support/Makefile.in'
+--- support/Makefile.in 2011-09-01 06:33:22 +0000
++++ support/Makefile.in 2011-09-01 06:43:51 +0000
+@@ -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..0530e463d6b4
--- /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>
+ <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..40174c1081f3
--- /dev/null
+++ b/app-admin/apachetop/Manifest
@@ -0,0 +1 @@
+DIST apachetop-0.12.6.tar.gz 126930 SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a WHIRLPOOL 8b23d825b26c0ce43d1536edb3e6b613d9773c93cd62d02b84e479b9d1b0e89ef0f03b09b3e0cf3616fd3f05f2304b19c261c87e78c623bdabedfecbb5a5e8ae
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..ac608e7ac599
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d6a0ccbc743d
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..48919ac33d6c
--- /dev/null
+++ b/app-admin/apachetop/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>
+ <email>neurogeek@gentoo.org</email>
+ <name>Jesus Rivero</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
new file mode 100644
index 000000000000..c673d949fc64
--- /dev/null
+++ b/app-admin/apg/Manifest
@@ -0,0 +1 @@
+DIST apg-2.3.0b.tar.gz 109995 SHA256 d1e52029709e2d7f9cb99bedce3e02ee7a63cff7b8e2b4c2bc55b3dc03c28b92 SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a WHIRLPOOL 519b9b9137db3e3009d91ca9ab0b0e782c4840aae7b32b3aed035aebdb9380091b82169c9c6bd37829464792dc686219b70403c88b029b713278e7bea7f105d8
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..07375890cbde
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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..6569104ff6e8
--- /dev/null
+++ b/app-admin/apg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>gentoobugsie.20.dsurawicz@spamgourmet.com</email>
+ <name>Dustin Polke</name>
+ <description>Proxy Maintainer. CC him on bugs.</description>
+</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..410ed9fee10b
--- /dev/null
+++ b/app-admin/augeas/Manifest
@@ -0,0 +1,3 @@
+DIST augeas-0.10.0.tar.gz 1676906 SHA256 ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca SHA512 4b23c69ce92971ad63cd5829044051a53b7976a7e3ccb9006282333a2dd06789e7c5da671450eb81904d237c36d449ac0924b06d9690dc7e5de4b8b40a58ec8c WHIRLPOOL 8b542cfa1bdcad3508cfd3cf25803ed27304ecdaaab4c9e7ce6ae2b7798c4cdc3d344ab4793cb2a0fd7b1b276eee20385b129d9fcf3b5b3b4596c3b0c96424cc
+DIST augeas-1.1.0.tar.gz 1940928 SHA256 9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b SHA512 ddb06f71993079330fc5b134ccd45476c1ab24f475b7a859c5920a7af3bd00d4dae31bf8110841ded4c4f5197e72911c298d7fcfe32d1d3e6821bca74aa67e26 WHIRLPOOL be1c83ecb1c8c7378374132bdd56be641e1200950e6e6d46e94ef35fc97be98157214b994071cf56f2aaafda29d91993c9a023ded5256c36364abbc9cbb498ca
+DIST augeas-1.3.0.tar.gz 1983656 SHA256 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af SHA512 92cc2cf83faa42e83621fe0f73fe9f7247d802f17da781e51d068056d20b1645de1f0ea0d5070c0d5729a3f6554d64a95e31111bf3e44b959386559619843e79 WHIRLPOOL 4e4c3374adca662ce90f94eb204028526ec0c3a9b0bc6644515994b88e289f3e1aa5f2b6ce7c28103a2a64e5185c8ba64d55e1a448e14f745d53aec4bf20e8b3
diff --git a/app-admin/augeas/augeas-0.10.0-r1.ebuild b/app-admin/augeas/augeas-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..8c56a570c5a2
--- /dev/null
+++ b/app-admin/augeas/augeas-0.10.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://augeas.net/download/${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-0.10.0-r2.ebuild b/app-admin/augeas/augeas-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..9a57f0e20338
--- /dev/null
+++ b/app-admin/augeas/augeas-0.10.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://augeas.net/download/${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
+ "${FILESDIR}/cve-bunch-of-them-symlink.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-0.10.0.ebuild b/app-admin/augeas/augeas-0.10.0.ebuild
new file mode 100644
index 000000000000..9b837aa6b3bb
--- /dev/null
+++ b/app-admin/augeas/augeas-0.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://augeas.net/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
+IUSE="static-libs test"
+
+RDEPEND="sys-libs/readline
+ dev-libs/libxml2"
+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
+}
+
+src_configure() {
+ econf $(use_enable static-libs static) || die
+}
+
+src_install() {
+ default
+
+ use static-libs || find "${ED}" -name '*.la' -delete
+
+ dodoc AUTHORS ChangeLog README NEWS
+}
diff --git a/app-admin/augeas/augeas-1.1.0.ebuild b/app-admin/augeas/augeas-1.1.0.ebuild
new file mode 100644
index 000000000000..816f66a0b543
--- /dev/null
+++ b/app-admin/augeas/augeas-1.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.3.0.ebuild b/app-admin/augeas/augeas-1.3.0.ebuild
new file mode 100644
index 000000000000..40ad36b6159c
--- /dev/null
+++ b/app-admin/augeas/augeas-1.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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-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..ffb39ba605d4
--- /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>
+ <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..5e42b4d6214e
--- /dev/null
+++ b/app-admin/authbind/Manifest
@@ -0,0 +1 @@
+DIST authbind_2.1.1.tar.gz 14407 SHA256 65b26b83b7ca5aa713524e0aff439f71a0ba8970913768457a22239540a9c73a SHA512 f3a45fcf1d8d6e6762bc1cef7a1b89f211e4af56c68b4c6c5e508a2f7ee039499b8b2f11ce8aeb94822d20377d309035760fa7b58aabaa4e87417ca25811c812 WHIRLPOOL 55098ccd252073403ef88546559bb5fcb268daed06501e82e1b79ab0ce63ea4eaff7335fb40a9d07342947a41e14a1432b53d082f1d8bca9d61bd8b17cabe0d1
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..3e2ebe2f0059
--- /dev/null
+++ b/app-admin/authbind/authbind-2.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5b2a5c55470b
--- /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>
+ <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..1c451137e02b
--- /dev/null
+++ b/app-admin/aws-as-tools/Manifest
@@ -0,0 +1 @@
+DIST AutoScaling-1.0.49.1.zip 12387808 SHA256 8273186a025c465ca3b69523c50f114dc6c2cececb2c9e8b8d6c6eb886dd97a3 SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed WHIRLPOOL 99c6daa8d5cfa00d26cc43c03406824897e960b1d13d49540a4e8f829d8abba18bd15f1e63a67f9e408973eb74af59ed3769f2aad806496ed163bcbd13f1df1d
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..e2005bb81785
--- /dev/null
+++ b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1a971abe53b5
--- /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>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxy maintainers. CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-cw-tools/Manifest b/app-admin/aws-cw-tools/Manifest
new file mode 100644
index 000000000000..3a9adb969bbd
--- /dev/null
+++ b/app-admin/aws-cw-tools/Manifest
@@ -0,0 +1 @@
+DIST CloudWatch-1.0.12.1.zip 6156651 SHA256 9dfec389bda10600b68ed9a77a16fd0a9c4279421e1de2848c65c35a20e4b50e SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec WHIRLPOOL 572dbc99d25f021d08efb2668ee582d83d55bcf8d68e18902dfd507e80083eb4de2562b8a0f0b7f5cf83ff30d6080f399f49de6e2a060eef37a0ac78eb7de006
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..cc03b70d0419
--- /dev/null
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1a971abe53b5
--- /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>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxy maintainers. CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
new file mode 100644
index 000000000000..3f85d0af84e7
--- /dev/null
+++ b/app-admin/aws-elb-tools/Manifest
@@ -0,0 +1 @@
+DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 SHA256 4b1f25de9be87ae1340426de58d966712b86baadd947ee9014d03784bcc0b5a7 SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725 WHIRLPOOL b7b4d0eb103c845c887525dd33b4308ee1553b46d3d709db1231cbd972824bc99264f4f48c1229620cb27ba75ae53b8e2255fd75fc1f5c0cf8473a74b95de4a9
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..1772852952de
--- /dev/null
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="The API tools serve 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..c964a88f43ca
--- /dev/null
+++ b/app-admin/aws-elb-tools/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>
+ <email>lxnay@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-iam-tools/Manifest b/app-admin/aws-iam-tools/Manifest
new file mode 100644
index 000000000000..25352ac91b4c
--- /dev/null
+++ b/app-admin/aws-iam-tools/Manifest
@@ -0,0 +1 @@
+DIST IAMCli-1.3.0.zip 3957057 SHA256 4878b19d889dab063d09f724b342b67fb872843ac60c1105a77cf2f6610908d1 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c WHIRLPOOL b228ce1cf048eed4e1cd9679510184321657a47491d8215b624db37345cadebf3f61325556e52e65fea8f622cbc611f0a126f92e9061d51e7486589c9829374f
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..15afc3264526
--- /dev/null
+++ b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="The Command Line Interface (CLI) for the AWS Identity and Access Management (IAM) 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..1a971abe53b5
--- /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>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxy maintainers. CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/aws-rds-tools/Manifest b/app-admin/aws-rds-tools/Manifest
new file mode 100644
index 000000000000..f27e73566040
--- /dev/null
+++ b/app-admin/aws-rds-tools/Manifest
@@ -0,0 +1 @@
+DIST RDSCli-1.6.001.zip 6291974 SHA256 2261aa6b89b7e22eefde751eeb7060f864efd64b494fdf43e5b8e9d2a1391087 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963 WHIRLPOOL 8e73ff6cfa3ce5f32ad79f73e5e295f725f6adc75997bcd3a76b52a76de631a7eb2e3bd504ad6190785b7bf713951340ef7adb0e417fb5027c4cf974dcab43bd
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..9751200d6b9f
--- /dev/null
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1a971abe53b5
--- /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>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>sergey.zhuga@gmail.com</email>
+ <name>Sergey Zhuga</name>
+ <description>Proxy maintainers. CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
new file mode 100644
index 000000000000..ae837f777488
--- /dev/null
+++ b/app-admin/bastille/Manifest
@@ -0,0 +1,2 @@
+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
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..9b8a129ad736
--- /dev/null
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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/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/metadata.xml b/app-admin/bastille/metadata.xml
new file mode 100644
index 000000000000..c60ce0ba2450
--- /dev/null
+++ b/app-admin/bastille/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>hardened</herd>
+ <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..a0d36f6c121f
--- /dev/null
+++ b/app-admin/bcfg2/Manifest
@@ -0,0 +1 @@
+DIST bcfg2-1.2.4.tar.gz 1959767 SHA256 c874139508c7a1c31c224548ae53dc40fe54e091cc0c036cc9d9c382263d4d16 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9 WHIRLPOOL 4b87826149ef86e9e5f955c2f0b79351c6fd46b9a3c18f773e25e35d60424605bfc47125c9ed3ac3b5174017595d9a173a20b9b0fe9aa69da51e0bde1836da65
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..97ae64fb9028
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}]
+ 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..d3edc5ca949a
--- /dev/null
+++ b/app-admin/bcfg2/files/bcfg2-server-1.2.0.rc
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+#
+# 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..0f2dd7febf21
--- /dev/null
+++ b/app-admin/bcfg2/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ <description>Proxy Maintainer</description>
+</maintainer>
+<maintainer>
+ <email>mjinks@uchicago.edu</email>
+ <name>Michael Jinks</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..4f3c7bc63df7
--- /dev/null
+++ b/app-admin/calamares/Manifest
@@ -0,0 +1 @@
+DIST calamares-1.1.2.tar.gz 3642991 SHA256 6adf5777f51998a88b19f37c3dd4bb8256be4464106ffbd5d1393ef67109d49c SHA512 567bfae24691576fb814297d7db66f61b39a639b71b2191defb43fd0d2e56b9ccf70dfd666e1fd1faaa1b954c349aea96ad2b5d1b5d59bdc5a351cde6bbdcea6 WHIRLPOOL e6b88ec952d31088c138a6467b98bd66f739ee48daf7689b5e8356274565beddd602ae02df559d6aa9f6483f797da3b7e284d04071eb3e54cf7b8679abe3730a
diff --git a/app-admin/calamares/calamares-1.1.2-r1.ebuild b/app-admin/calamares/calamares-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..5f732d8e5a2f
--- /dev/null
+++ b/app-admin/calamares/calamares-1.1.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+inherit kde5 python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="http://calamares.io"
+if [[ ${KDE_BUILD_TYPE} == live ]] ; then
+ EGIT_REPO_URI="git://github.com/${PN}/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+IUSE="+networkmanager +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep solid)
+ dev-qt/linguist-tools:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtquick1:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt[qt5]
+"
+
+RDEPEND="${DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ sys-apps/gptfdisk
+ >=sys-block/parted-3.0
+ || ( sys-boot/grub:2 sys-boot/gummiboot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ sys-fs/udisks:2[systemd]
+ virtual/udev[systemd]
+ 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)"
+ export QT_SELECT=qt5
+}
+
+src_configure() {
+ local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+ 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..b719686ba39d
--- /dev/null
+++ b/app-admin/calamares/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>
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</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>
+</pkgmetadata>
+
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
new file mode 100644
index 000000000000..cd6ebdfb995f
--- /dev/null
+++ b/app-admin/cancd/Manifest
@@ -0,0 +1 @@
+DIST cancd-0.1.0.tar.gz 7634 SHA256 aea21e3eadee64d2b76591d272dcd03c566215b2320d7fef5cfe0937c3ef0315 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb WHIRLPOOL 84e1b6461bc5ae40b01c71112fed9999e590a7cbed54da6850131bd475eafb6ab7830a418a6fc46bf217645ed73aec080af6d4117a9ea97f1b48dad92cc93caf
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..dce28970573c
--- /dev/null
+++ b/app-admin/cancd/cancd-0.1.0-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="the CA NetConsole Daemon, a daemon to receive 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..8a46f420e425
--- /dev/null
+++ b/app-admin/cancd/files/cancd-conf.d
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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..8031ca00ec33
--- /dev/null
+++ b/app-admin/cancd/files/cancd-init.d
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9db98b781e3e
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-conf.d
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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..e94aeab468d3
--- /dev/null
+++ b/app-admin/cancd/files/netconsole-init.d
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a732fd8b2f03
--- /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>
+ <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..71616016a9fc
--- /dev/null
+++ b/app-admin/ccze/Manifest
@@ -0,0 +1 @@
+DIST ccze-0.2.1.tar.gz 139795 SHA256 8263a11183fd356a033b6572958d5a6bb56bfd2dba801ed0bff276cfae528aa3 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7 WHIRLPOOL 93f8891c3a7885ca264f7269493893e6555865c89dee5cf5c890754f55db0ac60dce26d76318c8f838d7ee6ff6fe8e2454e9b4490ab607e496a5fdc0ef4f7685
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..9150eed38e6b
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="http://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+ sys-libs/ncurses"
+
+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/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..2c85fc4869de
--- /dev/null
+++ b/app-admin/ccze/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>
+ <email>joker@gentoo.org</email>
+ <name>Christian Birchinger</name>
+ <description>Please take over if you want it</description>
+</maintainer>
+<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..2db64ac15fb9
--- /dev/null
+++ b/app-admin/cdist/Manifest
@@ -0,0 +1 @@
+DIST cdist-3.1.9.tar.gz 260817 SHA256 37eb340a83f52f035468b817d9f1218c5954ba2910fb7a800dfe04cf8abae85b SHA512 e2cc40a38961fa5cbb6f51fc5ea2f6a8a1f86cd5b42d85204f2f71e2aba8393d5041a63e756d7c5666cc30c9ab528a9e0e5bccaea8c5a9ed079453cc87d76d06 WHIRLPOOL 41f9d06401149e06969f3d799c7b812e6a992ade3892c6de9f0723bf2a697d45a6c4d1fc46805ee81c340d1f8cb5ffead32d45e7e5bb8b46cbf6aca8a53dd7fa
diff --git a/app-admin/cdist/cdist-3.1.9.ebuild b/app-admin/cdist/cdist-3.1.9.ebuild
new file mode 100644
index 000000000000..1e53a499d257
--- /dev/null
+++ b/app-admin/cdist/cdist-3.1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+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"
+
+DOCS=( README )
+
+python_install_all() {
+ if use doc; then
+ HTML_DOCS=( docs/man/man1/*.html docs/man/man7/*.html )
+ fi
+ distutils-r1_python_install_all
+ doman docs/man/man1/*.1 docs/man/man7/*.7
+}
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
new file mode 100644
index 000000000000..688513dd0ab0
--- /dev/null
+++ b/app-admin/cdist/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>nerve@ipwar.ch</email>
+ <name>Daniel Heule</name>
+ <description>Maintainer. Assign bugs to him</description>
+ </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..6c026dbd5c83
--- /dev/null
+++ b/app-admin/cgmanager/Manifest
@@ -0,0 +1,2 @@
+DIST cgmanager-0.36.tar.gz 428374 SHA256 f4707f0130efb50ccd8a1900e7ae626c0631947528ce921a63b15ef848fb2a0d SHA512 3325c03e25b7bd7b8dcfb68bb3dedccf9367ce80c23ac8df3f1af6cdb9ee706eafc0f95fcea055cc1fe9b31acb5bb66c61b16b21dfa057e661fdace3ff207f43 WHIRLPOOL dcaad06e6281f89e672b843f9903473cb1ee5d1b938c72d1b806f7bc7a1014144dd9e6e304e9ce6e2b941a1b224177747dacc7affa122f9a17a14598969a4779
+DIST cgmanager-0.37.tar.gz 430522 SHA256 8309e7f2ae5f4a6b52cc2fca62c098b18ecfe90bca2c9c034ba80f68aa427b6e SHA512 fbe96af36d556c988351f1136f4382d907b8fb6d4098a90b17f4abfbdf182060d8ba059878455a8842597e7ad33ff12b91bddf68a6c42b02ad9549a2ad900a89 WHIRLPOOL 9a78226ec2a6a84c7fb84f3bb2622df159a4b857d990b2d4f22a1d8c7d02d071c0ed046e5d17ea9d2bd4b970a0a6ad9bf59ba68401248db318b89e16010c720a
diff --git a/app-admin/cgmanager/cgmanager-0.36-r1.ebuild b/app-admin/cgmanager/cgmanager-0.36-r1.ebuild
new file mode 100644
index 000000000000..fad5d258467e
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.36-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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="~amd64 ~arm ~x86"
+
+RDEPEND="
+ sys-libs/libnih[dbus]
+ sys-apps/dbus"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # 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
+}
+
+src_configure() {
+ econf \
+ --with-distro=gentoo \
+ --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"
+ # FIXME: openRC init scripts are not well tested
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newinitd "${FILESDIR}"/cgproxy.initd cgproxy
+}
diff --git a/app-admin/cgmanager/cgmanager-0.37.ebuild b/app-admin/cgmanager/cgmanager-0.37.ebuild
new file mode 100644
index 000000000000..fad5d258467e
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.37.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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="~amd64 ~arm ~x86"
+
+RDEPEND="
+ sys-libs/libnih[dbus]
+ sys-apps/dbus"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # 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
+}
+
+src_configure() {
+ econf \
+ --with-distro=gentoo \
+ --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"
+ # FIXME: openRC init scripts are not well tested
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newinitd "${FILESDIR}"/cgproxy.initd cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgmanager.initd b/app-admin/cgmanager/files/cgmanager.initd
new file mode 100644
index 000000000000..26c915f4dac8
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/cgmanager
+PIDFILE=/run/cgmanager.pid
+NESTED=yes
+OPTIONS=
+
+depend() {
+ after cgproxy
+}
+
+start() {
+ ebegin "Starting cgmanager server"
+
+ start-stop-daemon --start --pidfile ${PIDFILE} --exec ${DAEMON} \
+ -- --daemon -m name=systemd ${OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping cgproxy server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-admin/cgmanager/files/cgproxy.initd b/app-admin/cgmanager/files/cgproxy.initd
new file mode 100644
index 000000000000..3624598adb31
--- /dev/null
+++ b/app-admin/cgmanager/files/cgproxy.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/cgproxy
+PIDFILE=/run/cgproxy.pid
+NESTED=yes
+OPTIONS=
+
+depend() {
+ before cgmanager
+}
+
+start() {
+ ebegin "Starting cgproxy server"
+ 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
+
+ start-stop-daemon --start --pidfile ${PIDFILE} --exec ${DAEMON} \
+ -- --daemon ${OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping cgproxy server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
new file mode 100644
index 000000000000..230776629fec
--- /dev/null
+++ b/app-admin/cgmanager/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>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-admin/checkrestart/Manifest b/app-admin/checkrestart/Manifest
new file mode 100644
index 000000000000..c1525295c588
--- /dev/null
+++ b/app-admin/checkrestart/Manifest
@@ -0,0 +1 @@
+DIST checkrestart-0.47-sep.tar.bz2 5888 SHA256 e80c89b8e2b082c4e2050a45dbdd375c6ef68dd91bdb000ae701359d0d04558e SHA512 7fe91a3e4c8a0ff09ff19d3d521739e2e289dc45be0def0000e1036cb964916f84ed2beb902fe0558ae999c5e34ecdc891a168342cc8e3ab967254e65c26dd20 WHIRLPOOL 12bcce4e273aeaa2f486d8b225aaf9e1c7eb1336fe77b8b9b6f7cbf6358560c0dc5b9063ef516baca53fe861541fc15553816a5d1d21d9a8f9ccae2276d345c1
diff --git a/app-admin/checkrestart/checkrestart-0.47-r3.ebuild b/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
new file mode 100644
index 000000000000..f23c26852cdc
--- /dev/null
+++ b/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="the sysadmin's rolling upgrade tool"
+HOMEPAGE="http://arcdraco.net/checkrestart"
+SRC_URI="http://arcdraco.net/~dragon/${P}-sep.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE=""
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ sys-apps/lsb-release
+ app-portage/portage-utils
+ sys-process/lsof
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-list-comprehension-fix.patch
+ python_fix_shebang ${PN}
+}
+
+src_install() {
+ dosbin ${PN}
+}
diff --git a/app-admin/checkrestart/files/checkrestart-0.47-list-comprehension-fix.patch b/app-admin/checkrestart/files/checkrestart-0.47-list-comprehension-fix.patch
new file mode 100644
index 000000000000..f22f0b9e50c8
--- /dev/null
+++ b/app-admin/checkrestart/files/checkrestart-0.47-list-comprehension-fix.patch
@@ -0,0 +1,11 @@
+--- a/checkrestart
++++ b/checkrestart
+@@ -216,7 +216,7 @@
+ package.initscripts.append(path)
+
+ # Remove duplicate inits
+- package.initscripts = [ u for u in package.initscripts if u not in locals()['_[1]'] ]
++ package.initscripts = list(set(package.initscripts))
+
+ restartable = []
+ nonrestartable = []
diff --git a/app-admin/checkrestart/metadata.xml b/app-admin/checkrestart/metadata.xml
new file mode 100644
index 000000000000..1470e032181b
--- /dev/null
+++ b/app-admin/checkrestart/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/chroot_safe/Manifest b/app-admin/chroot_safe/Manifest
new file mode 100644
index 000000000000..6b9a3556b325
--- /dev/null
+++ b/app-admin/chroot_safe/Manifest
@@ -0,0 +1 @@
+DIST chroot_safe-1.4.tgz 25886 SHA256 dcdd299e0275838531bbc53de3bb5ecd70f99d0af5fa328e8de761b4de4623bf SHA512 7eee0d8e2c75ccf4bd918f610c21511498a6499b638d09634993a4d6874882a0dbc8c27eea95e9776f1722593e3445399a893557bfa6398a11b85447564dfe61 WHIRLPOOL 749e5924d233e1818330692f1a693e4e41bfb7eca732c97a49c17f69513212a84a2b02feb38f7224c0086a42d547680721712ae92f7776b048a69b77c906f4d9
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..0618c943d0f3
--- /dev/null
+++ b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..4145ddd1b330
--- /dev/null
+++ b/app-admin/chroot_safe/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <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..7a66c32939e9
--- /dev/null
+++ b/app-admin/chrootuid/Manifest
@@ -0,0 +1 @@
+DIST chrootuid1.3.tar.gz 5439 SHA256 93dd1af0220bce0c0265c9f810a89f7fae56b34b7077397f8ea2dcb54ec169b3 SHA512 55ccc60e6010910466e700f9d0f2f666bc16ab72af3fbc1115916b4e005684d9ad28bc0b8b1cba3804ca68384c3b0fbe137114623eba70241eb8653325382a1f WHIRLPOOL 74345cb020589f0af4b99b3c3a55b38a7d10e6fd81801e80da70347e038c703641d0904add57f90cb7c1c557aec9796193a77210c976c2b9ccd3ea6dc89f62e0
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..547465c5a6b6
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="run a network service at low privilege level and with 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..634641170f1a
--- /dev/null
+++ b/app-admin/chrootuid/chrootuid-1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_P="${P/-/}"
+
+DESCRIPTION="run a network service at low privilege level and with 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..c9141f702442
--- /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>
+ <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..45973747e025
--- /dev/null
+++ b/app-admin/chrpath/Manifest
@@ -0,0 +1 @@
+DIST chrpath-0.13.tar.gz 125129 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e WHIRLPOOL 7bd658095647ef13bbad2e07e14ea3d3b7d3de7bb71c272465701a5430a76ce33639a641f8964194c8a78c181401522d175181da6c73336392e5f8444d43f1e8
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..a4b88c5b789f
--- /dev/null
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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 ~x64-freebsd ~x86-freebsd ~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
+ 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..66cf774185dd
--- /dev/null
+++ b/app-admin/chrpath/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>prefix</herd>
+ <maintainer>
+ <email>grobian@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-admin/clog/Manifest b/app-admin/clog/Manifest
new file mode 100644
index 000000000000..200558d91e07
--- /dev/null
+++ b/app-admin/clog/Manifest
@@ -0,0 +1 @@
+DIST clog-1.1.0.tar.gz 76267 SHA256 ff4ac19b2622d49b4fca0d44ee3659398f3486f54d77562650e45310c6a5d4f7 SHA512 e44449025a1eb7490152d467167a7417f8982caf14dbdf6b54cf83fd5f47cf037740d99ec322b74381052f96064a1f6e0f01fced9a2414644ad86eeab0ce448d WHIRLPOOL caeba7c0c6a676353cb41751dedc1f5ffc889849474a6fe91ad8160cd85e5fc352e01bf372ec7bfc239f895a6c6cd6682b8021baef1ce711e9c64c0b73baa3f0
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..1ccebb1a4cc5
--- /dev/null
+++ b/app-admin/clog/clog-1.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d1f1caa60dca
--- /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>
+ <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..a815e0c547a5
--- /dev/null
+++ b/app-admin/clsync/Manifest
@@ -0,0 +1,2 @@
+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
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..88f6b6f9ae0b
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+ http://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 )
+"
+RDEPEND="
+ 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/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..d350f3ddb40b
--- /dev/null
+++ b/app-admin/clsync/files/clsync.initd
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+[[ -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..1d11fa5416aa
--- /dev/null
+++ b/app-admin/clsync/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <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>
+ <flag name="seccomp">Enable seccomp for system call filtering.</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..ee8aa23a2070
--- /dev/null
+++ b/app-admin/clustershell/Manifest
@@ -0,0 +1 @@
+DIST clustershell-1.6.tar.gz 950548 SHA256 ea119555ba9a4a8aa17d355345772263c20e2cc362140f55933ce217d7633e07 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02 WHIRLPOOL 889c250e6ef364dcab20960fb0fd84e6d8e00d8c185d40704b9a5845e4f45ea3fe074bdba5713aadb5cad04e11933b1d8a98fb7b80ec559682c699850c517975
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
new file mode 100644
index 000000000000..60165a381a72
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="http://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/metadata.xml b/app-admin/clustershell/metadata.xml
new file mode 100644
index 000000000000..21e59a0a13ea
--- /dev/null
+++ b/app-admin/clustershell/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>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <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..6698b99e6355
--- /dev/null
+++ b/app-admin/collectd/Manifest
@@ -0,0 +1,2 @@
+DIST collectd-5.4.0.tar.bz2 1506520 SHA256 90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e SHA512 10de94d082e6bf2e0a8e2f0b179868c0f25b223c61cb8a5fda641d01f90d6332062459410d54d74a4d666f7149bb429976e9542dabeda988ed6772df9001b222 WHIRLPOOL 19db89217dfaf38fd358a60a64155e01bd68d4c8ca4fad13b97667eb3e4e4d8dbe4e9cae8568e970d8d6fe5e8dde960b06159b3026d1a554fad7a455f973ff0a
+DIST collectd-5.4.1.tar.bz2 1521907 SHA256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492 WHIRLPOOL 2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
diff --git a/app-admin/collectd/collectd-5.4.0.ebuild b/app-admin/collectd/collectd-5.4.0.ebuild
new file mode 100644
index 000000000000..6e56ffbf10ca
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.0.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools base eutils linux-info multilib perl-app systemd user
+
+DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
+ tape write_redis zfs_arc"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
+ conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
+ email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
+ iptables irq java libvirt load logfile lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
+ memory multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
+ powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
+ sensors serial snmp statsd swap syslog table tail target_notification
+ target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ write_graphite write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_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:0
+ sys-devel/libtool
+ perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_apache? ( net-misc/curl )
+ collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_bind? ( dev-libs/libxml2 )
+ collectd_plugins_curl? ( net-misc/curl )
+ collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
+ collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13 )
+ collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper )
+ collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl )
+ collectd_plugins_nut? ( sys-power/nut )
+ collectd_plugins_onewire? ( sys-fs/owfs )
+ 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? ( =dev-lang/python-2* )
+ 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_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_write_http? ( net-misc/curl )
+ collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver )
+
+ 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 )
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ kernel_linux? (
+ collectd_plugins_vserver? ( sys-kernel/vserver-sources )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.10.2"-{libocci,nohal}.patch
+ "${FILESDIR}/${PN}-4.10.3"-werror.patch
+ "${FILESDIR}/${PN}-5.1.0"-libperl.patch
+ "${FILESDIR}/${PN}-5.1.1"-lt.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in 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} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plug-in 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() {
+ linux-info_pkg_setup
+
+ # 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 CONFIG_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
+
+ # 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 "PROC_FS SYSFS" warn
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # vmem.c:/proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # uuid.c:/sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c:/proc/net/wireless
+ collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ 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
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # 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
+
+ sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ rm -r libltdl || die
+
+ 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="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
+ memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+ wireless"
+
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
+
+ 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
+
+ # Do we debug?
+ local myconf="$(use_enable debug)"
+
+ 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})"
+ 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
+
+ # Need JAVA_HOME for java.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ if ! use collectd_plugins_iptables; then
+ myconf+=" --with-libiptc=no"
+ fi
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ perl_delete_localpod
+
+ find "${D}/usr/" -name "*.la" -exec rm -f {} +
+
+ # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
+ # we cannot do this yet
+
+ 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" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ systemd_dounit "contrib/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" collectd
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/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>:' "${D}"/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>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+ if (use collectd_plugins_${1} && ! has_version "${2}"); then
+ elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+ fi
+}
+
+pkg_postinst() {
+ collectd_rdeps apcups sys-power/apcupsd
+ collectd_rdeps hddtemp app-admin/hddtemp
+ collectd_rdeps mbmon sys-apps/xmbmon
+ collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+ collectd_rdeps ntpd net-misc/ntp
+ collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+ collectd_rdeps write_mongodb "dev-db/mongodb"
+
+ echo
+ elog "collectd is now started as unprivileged user by default."
+ elog "You may want to recheck 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 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.4.1-r1.ebuild b/app-admin/collectd/collectd-5.4.1-r1.ebuild
new file mode 100644
index 000000000000..e0c319218b8e
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.1-r1.ebuild
@@ -0,0 +1,379 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools base eutils linux-info multilib perl-app python-single-r1 systemd user
+
+DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
+ tape write_redis zfs_arc"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
+ conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
+ email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
+ iptables irq java libvirt load logfile lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
+ memory multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
+ powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
+ sensors serial snmp statsd swap syslog table tail target_notification
+ target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ write_graphite write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_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:0
+ sys-devel/libtool
+ perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_apache? ( net-misc/curl )
+ collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_bind? ( dev-libs/libxml2 )
+ collectd_plugins_curl? ( net-misc/curl )
+ collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
+ collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13 )
+ collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper )
+ collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl )
+ collectd_plugins_nut? ( sys-power/nut )
+ collectd_plugins_onewire? ( sys-fs/owfs )
+ 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_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_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_write_http? ( net-misc/curl )
+ collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver )
+
+ 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 )
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ kernel_linux? (
+ collectd_plugins_vserver? ( sys-kernel/vserver-sources )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )"
+
+REQUIRED_USE="
+ collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.1"-{nohal,libocci,libperl,lt}.patch
+ "${FILESDIR}/${PN}-4.10.3"-werror.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in 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} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plug-in 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() {
+ linux-info_pkg_setup
+
+ # 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 CONFIG_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
+
+ # 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 "PROC_FS SYSFS" warn
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # vmem.c:/proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # uuid.c:/sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c:/proc/net/wireless
+ collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ 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
+
+ use collectd_plugins_python && python-single-r1_pkg_setup
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # 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
+
+ sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ rm -r libltdl || die
+
+ 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="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
+ memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+ wireless"
+
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
+
+ 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
+
+ # Do we debug?
+ local myconf="$(use_enable debug)"
+
+ 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})"
+ 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
+
+ # Need JAVA_HOME for java.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ if ! use collectd_plugins_iptables; then
+ myconf+=" --with-libiptc=no"
+ fi
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ perl_delete_localpod
+
+ find "${D}/usr/" -name "*.la" -exec rm -f {} +
+
+ # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
+ # we cannot do this yet
+
+ 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" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ systemd_dounit "contrib/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" collectd
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/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>:' "${D}"/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>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+ if (use collectd_plugins_${1} && ! has_version "${2}"); then
+ elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+ fi
+}
+
+pkg_postinst() {
+ collectd_rdeps apcups sys-power/apcupsd
+ collectd_rdeps hddtemp app-admin/hddtemp
+ collectd_rdeps mbmon sys-apps/xmbmon
+ collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+ collectd_rdeps ntpd net-misc/ntp
+ collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+ collectd_rdeps write_mongodb "dev-db/mongodb"
+
+ echo
+ elog "collectd is now started 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 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.4.1.ebuild b/app-admin/collectd/collectd-5.4.1.ebuild
new file mode 100644
index 000000000000..554a27e3ea91
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.1.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools base eutils linux-info multilib perl-app systemd user
+
+DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
+ tape write_redis zfs_arc"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
+ conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df disk dns
+ email entropy ethstat exec filecount fscache gmond hddtemp interface ipmi
+ iptables irq java libvirt load logfile lvm madwifi match_empty_counter
+ match_hashed match_regex match_timediff match_value mbmon md memcachec memcached
+ memory multimeter mysql netlink network network nfs nginx notify_desktop
+ notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping postgresql
+ powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
+ sensors serial snmp statsd swap syslog table tail target_notification
+ target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
+ tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ write_graphite write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_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:0
+ sys-devel/libtool
+ perl? ( dev-lang/perl:=[ithreads] )
+ collectd_plugins_apache? ( net-misc/curl )
+ collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_bind? ( dev-libs/libxml2 )
+ collectd_plugins_curl? ( net-misc/curl )
+ collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
+ collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 )
+ collectd_plugins_dbi? ( dev-db/libdbi )
+ collectd_plugins_dns? ( net-libs/libpcap )
+ collectd_plugins_gmond? ( sys-cluster/ganglia )
+ collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
+ collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13 )
+ collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper )
+ collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 )
+ collectd_plugins_lvm? ( sys-fs/lvm2 )
+ collectd_plugins_memcachec? ( dev-libs/libmemcached )
+ collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+ collectd_plugins_netlink? ( net-libs/libmnl )
+ collectd_plugins_nginx? ( net-misc/curl )
+ collectd_plugins_notify_desktop? ( x11-libs/libnotify )
+ collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl )
+ collectd_plugins_nut? ( sys-power/nut )
+ collectd_plugins_onewire? ( sys-fs/owfs )
+ 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? ( =dev-lang/python-2* )
+ 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_snmp? ( net-analyzer/net-snmp )
+ collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant )
+ collectd_plugins_varnish? ( www-servers/varnish )
+ collectd_plugins_write_http? ( net-misc/curl )
+ collectd_plugins_write_mongodb? ( dev-libs/mongo-c-driver )
+
+ 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 )
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ kernel_linux? (
+ collectd_plugins_vserver? ( sys-kernel/vserver-sources )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ collectd_plugins_syslog? ( virtual/logger )
+ selinux? ( sec-policy/selinux-collectd )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.4.1"-{nohal,libocci,libperl,lt}.patch
+ "${FILESDIR}/${PN}-4.10.3"-werror.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in 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} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (warn)
+ ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+ ;;
+ (error)
+ eerror "The ${1} plug-in 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() {
+ linux-info_pkg_setup
+
+ # 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 CONFIG_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
+
+ # 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 "PROC_FS SYSFS" warn
+ collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+ # vmem.c:/proc/vmstat
+ collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+ # uuid.c:/sys/hypervisor/uuid
+ collectd_plugin_kernel_linux uuid SYSFS info
+
+ # wireless.c:/proc/net/wireless
+ collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+ if use kernel_linux; then
+ 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
+
+ enewgroup collectd
+ enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # 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
+
+ sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+
+ # fix installdirs for perl, bug 444360
+ sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+ rm -r libltdl || die
+
+ 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="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
+ memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+ wireless"
+
+ local libstatgrab_plugins="cpu disk interface load memory swap users"
+ local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
+
+ 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
+
+ # Do we debug?
+ local myconf="$(use_enable debug)"
+
+ 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})"
+ 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
+
+ # Need JAVA_HOME for java.
+ if use collectd_plugins_java; then
+ myconf+=" --with-java=$(java-config -g JAVA_HOME)"
+ fi
+
+ # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+ if ! use collectd_plugins_iptables; then
+ myconf+=" --with-libiptc=no"
+ fi
+
+ if use perl; then
+ myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+ else
+ myconf+=" --without-perl-bindings"
+ fi
+
+ # No need for v5upgrade
+ myconf+=" --disable-target_v5upgrade"
+
+ # Finally, run econf.
+ KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ perl_delete_localpod
+
+ find "${D}/usr/" -name "*.la" -exec rm -f {} +
+
+ # use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd
+ # we cannot do this yet
+
+ 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" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ systemd_dounit "contrib/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" collectd
+
+ sed -i -e 's:^.*PIDFile "/var/run/collectd.pid":PIDFile "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+ sed -i -e 's:^# SocketFile "/var/run/collectd-unixsock":# SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/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>:' "${D}"/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>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+ if (use collectd_plugins_${1} && ! has_version "${2}"); then
+ elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+ fi
+}
+
+pkg_postinst() {
+ collectd_rdeps apcups sys-power/apcupsd
+ collectd_rdeps hddtemp app-admin/hddtemp
+ collectd_rdeps mbmon sys-apps/xmbmon
+ collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+ collectd_rdeps ntpd net-misc/ntp
+ collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+ collectd_rdeps write_mongodb "dev-db/mongodb"
+
+ echo
+ elog "collectd is now started 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 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-4.10.2-libocci.patch b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
new file mode 100644
index 000000000000..2ae42dc14163
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.2-libocci.patch
@@ -0,0 +1,20 @@
+diff -r -u collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
+--- collectd-4.10.2.orig/configure.in 2010-11-28 03:27:47.000000000 +0100
++++ collectd-4.10.2/configure.in 2010-11-28 03:28:23.000000000 +0100
+@@ -2446,14 +2446,14 @@
+ ])
+ 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
diff --git a/app-admin/collectd/files/collectd-4.10.2-nohal.patch b/app-admin/collectd/files/collectd-4.10.2-nohal.patch
new file mode 100644
index 000000000000..a82a3bc78034
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.2-nohal.patch
@@ -0,0 +1,23 @@
+diff -ruN collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in
+--- collectd-4.10.2.orig/configure.in 2010-11-27 11:10:38.000000000 +0100
++++ collectd-4.10.2/configure.in 2011-02-07 21:55:22.000000000 +0100
+@@ -1109,18 +1109,7 @@
+ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
+
+ dnl Check for HAL (hardware abstraction library)
+-with_libhal="yes"
+-AC_CHECK_LIB(hal,libhal_device_property_exists,
+- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
+- [with_libhal="no"])
+-if test "x$with_libhal" = "xyes"; then
+- if test "x$PKG_CONFIG" != "x"; then
+- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
+- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
+- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
+- AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
+- fi
+-fi
++with_libhal="no"
+
+ m4_divert_once([HELP_WITH], [
+ collectd additional packages:])
diff --git a/app-admin/collectd/files/collectd-4.10.3-werror.patch b/app-admin/collectd/files/collectd-4.10.3-werror.patch
new file mode 100644
index 000000000000..6ddb508cdc1f
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.3-werror.patch
@@ -0,0 +1,24 @@
+diff -ruN collectd-4.10.3.orig/src/Makefile.am collectd-4.10.3/src/Makefile.am
+--- collectd-4.10.3.orig/src/Makefile.am 2011-03-26 17:08:53.000000000 +0100
++++ collectd-4.10.3/src/Makefile.am 2011-04-24 22:56:39.521229944 +0200
+@@ -7,7 +7,7 @@
+ endif
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ AM_CPPFLAGS = -DPREFIX='"${prefix}"'
+diff -ruN collectd-4.10.3.orig/src/libcollectdclient/Makefile.am collectd-4.10.3/src/libcollectdclient/Makefile.am
+--- collectd-4.10.3.orig/src/libcollectdclient/Makefile.am 2011-03-26 17:04:26.000000000 +0100
++++ collectd-4.10.3/src/libcollectdclient/Makefile.am 2011-04-24 22:57:12.231229943 +0200
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ pkginclude_HEADERS = client.h lcc_features.h
diff --git a/app-admin/collectd/files/collectd-5.1.0-libperl.patch b/app-admin/collectd/files/collectd-5.1.0-libperl.patch
new file mode 100644
index 000000000000..9a44d5b57ad8
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.1.0-libperl.patch
@@ -0,0 +1,30 @@
+diff --git a/configure.in b/configure.in
+index 1cfc2fc..384c298 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2944,11 +2944,13 @@ if test "x$with_libperl" = "xyes" \
+ then
+ SAVE_CFLAGS="$CFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
++ SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+ PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+ PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+ CFLAGS="$CFLAGS $PERL_CFLAGS"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++ LIBS="$LIBS -lperl -lpthread"
+
+ AC_CACHE_CHECK([for libperl],
+ [c_cv_have_libperl],
+@@ -2967,7 +2969,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
+ Nullsv);
+ ]]),
+ [c_cv_have_libperl="yes"],
+- [c_cv_have_libperl="no"]
++ [
++ c_cv_have_libperl="no"
++ LIBS="$SAVE_LIBS"
++ ]
+ )
+ )
+ \ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.1.1-lt.patch b/app-admin/collectd/files/collectd-5.1.1-lt.patch
new file mode 100644
index 000000000000..4aa734b1efa4
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.1.1-lt.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile.am b/Makefile.am
+index 5267123..a7e0d0c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+diff --git a/configure.in b/configure.in
+index eff8d61..a22a561 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config])
+ 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.])
+@@ -19,7 +18,6 @@ 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.])
+ ]
+ ) \ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.4.1-libocci.patch b/app-admin/collectd/files/collectd-5.4.1-libocci.patch
new file mode 100644
index 000000000000..14b7d6992bb6
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.4.1-libocci.patch
@@ -0,0 +1,21 @@
+diff --git configure.ac configure.ac
+index 7029e1e..72f6ff4 100644
+--- configure.ac
++++ configure.ac
+@@ -2941,14 +2941,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 \ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.4.1-libperl.patch b/app-admin/collectd/files/collectd-5.4.1-libperl.patch
new file mode 100644
index 000000000000..4f60802240ac
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.4.1-libperl.patch
@@ -0,0 +1,29 @@
+diff --git configure.ac configure.ac
+index ce8a9bc..eaa464e 100644
+--- configure.ac
++++ configure.ac
+@@ -3109,11 +3109,13 @@ if test "x$with_libperl" = "xyes" \
+ then
+ SAVE_CFLAGS="$CFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
++ SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+ PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+ PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+ CFLAGS="$CFLAGS $PERL_CFLAGS"
+ LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++ LIBS="$LIBS -lperl -lpthread"
+
+ AC_CACHE_CHECK([for libperl],
+ [c_cv_have_libperl],
+@@ -3132,7 +3134,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string
+ ]]]
+ )],
+ [c_cv_have_libperl="yes"],
+- [c_cv_have_libperl="no"]
++ [
++ c_cv_have_libperl="no"
++ LIBS="$SAVE_LIBS"
++ ]
+ )
+ )
diff --git a/app-admin/collectd/files/collectd-5.4.1-lt.patch b/app-admin/collectd/files/collectd-5.4.1-lt.patch
new file mode 100644
index 000000000000..bac1809f1c30
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.4.1-lt.patch
@@ -0,0 +1,32 @@
+diff --git Makefile.am Makefile.am
+index 5267123..a7e0d0c 100644
+--- Makefile.am
++++ Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+diff --git configure.ac configure.ac
+index eaa464e..d652d46 100644
+--- configure.ac
++++ configure.ac
+@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config])
+ 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.])
+@@ -19,7 +18,6 @@ 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.])
+ ]
+ ) \ No newline at end of file
diff --git a/app-admin/collectd/files/collectd-5.4.1-nohal.patch b/app-admin/collectd/files/collectd-5.4.1-nohal.patch
new file mode 100644
index 000000000000..9978296e8df6
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.4.1-nohal.patch
@@ -0,0 +1,24 @@
+diff --git configure.ac configure.ac
+index 7029e1e..ad5e336 100644
+--- configure.ac
++++ configure.ac
+@@ -1351,18 +1351,7 @@ AC_CHECK_LIB(resolv, res_search,
+ AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
+
+ dnl Check for HAL (hardware abstraction library)
+-with_libhal="yes"
+-AC_CHECK_LIB(hal,libhal_device_property_exists,
+- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
+- [with_libhal="no"])
+-if test "x$with_libhal" = "xyes"; then
+- if test "x$PKG_CONFIG" != "x"; then
+- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
+- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
+- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
+- AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
+- fi
+-fi
++with_libhal="no"
+
+ m4_divert_once([HELP_WITH], [
+ collectd additional packages:]) \ No newline at end of file
diff --git a/app-admin/collectd/files/collectd.confd b/app-admin/collectd/files/collectd.confd
new file mode 100644
index 000000000000..979b7255b0fc
--- /dev/null
+++ b/app-admin/collectd/files/collectd.confd
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Nice value used to launch collectd, to change priority of the process. As
+# you usually will want to run it in background, a default of 5 is used.
+#
+#COLLECTD_NICELVL='5'
+
+# Location of configuration file. Modify if you don't like the standard one.
+#
+#COLLECTD_CFGFILE='/etc/collectd.conf'
+
+# File used to store the PID file. Usually you won't need to touch it.
+#
+#COLLECTD_PIDFILE='/var/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'
diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd/files/collectd.initd
new file mode 100644
index 000000000000..4f48a116c37f
--- /dev/null
+++ b/app-admin/collectd/files/collectd.initd
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+: ${COLLECTD_PIDFILE:='/var/run/collectd/collectd.pid'}
+: ${COLLECTD_CFGFILE:='/etc/collectd.conf'}
+: ${COLLECTD_NICELVL:='5'}
+: ${COLLECTD_USER:='collectd'}
+
+extra_commands="configtest"
+
+depend() {
+ use net
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME} configuration"
+ checkconfig
+ eend $?
+}
+
+checkconfig() {
+ if [ $(sed '/^$\|^#/d' ${COLLECTD_CFGFILE} | grep -c 'LoadPlugin\w\+oracle') != 0 ] ; 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
+
+ /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}" 1>/dev/null 2>&1
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ eerror "${SVCNAME} has detected an error in your setup:"
+ /usr/sbin/collectd -t -C "${COLLECTD_CFGFILE}"
+ fi
+
+ return $ret
+}
+
+start() {
+ checkconfig || return 1
+ [ -d /var/run/collectd ] || mkdir /var/run/collectd && chown collectd:collectd /var/run/collectd
+
+ ebegin "Starting collectd"
+ start-stop-daemon --start --user "${COLLECTD_USER}:collectd" \
+ --nicelevel "${COLLECTD_NICELVL}" --exec /usr/sbin/collectd -- \
+ -P "${COLLECTD_PIDFILE}" -C "${COLLECTD_CFGFILE}"
+ eend $? "Failed to start collectd"
+}
+
+stop() {
+ ebegin "Stopping collectd"
+ start-stop-daemon --stop \
+ --pidfile "${COLLECTD_PIDFILE}"
+ eend $? "Failed to stop collectd"
+}
diff --git a/app-admin/collectd/files/logrotate b/app-admin/collectd/files/logrotate
new file mode 100644
index 000000000000..5d344f6208f1
--- /dev/null
+++ b/app-admin/collectd/files/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..536b2ec9cf52
--- /dev/null
+++ b/app-admin/collectd/metadata.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <longdescription>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>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ <description>Proxied Maintainer</description>
+ </maintainer>
+ <use>
+ <flag name='collectd_plugins_aggregation'>Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
+ <flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
+ <flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
+ <flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
+ <flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
+ <flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag>
+ <flag name='collectd_plugins_cgroups'>Build the cgroups CPU accounting collection plugin</flag>
+ <flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag>
+ <flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
+ <flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
+ <flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
+ <flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
+ <flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
+ <flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
+ <flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
+ <flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
+ <flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>
+ <flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
+ <flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
+ <flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
+ <flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag>
+ <flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
+ <flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
+ <flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
+ <flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
+ <flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
+ <flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag>
+ <flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
+ <flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
+ <flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
+ <flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
+ <flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
+ <flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+ <flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag>
+ <flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag>
+ <flag name='collectd_plugins_lvm'>Build the LVM input plugin</flag>
+ <flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
+ <flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag>
+ <flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag>
+ <flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag>
+ <flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag>
+ <flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag>
+ <flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag>
+ <flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag>
+ <flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag>
+ <flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag>
+ <flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag>
+ <flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
+ <flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
+ <flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
+ <flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag>
+ <flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag>
+ <flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
+ <flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
+ <flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
+ <flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag>
+ <flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
+ <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
+ <flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
+ <flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
+ <flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag>
+ <flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
+ <flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
+ <flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag>
+ <flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
+ <flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
+ <flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag>
+ <flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag>
+ <flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
+ <flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
+ <flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
+ <flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag>
+ <flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
+ <flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag>
+ <flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag>
+ <flag name='collectd_plugins_statsd'>Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
+ <flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag>
+ <flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
+ <flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag>
+ <flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
+ <flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag>
+ <flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag>
+ <flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag>
+ <flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag>
+ <flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
+ <flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
+ <flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
+ <flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
+ <flag name='collectd_plugins_threshold'>Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
+ <flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
+ <flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag>
+ <flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
+ <flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag>
+ <flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
+ <flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag>
+ <flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag>
+ <flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag>
+ <flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
+ <flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
+ <flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
+ <flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
+ <flag name='contrib'>Install user-contributed files in the doc directory</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
new file mode 100644
index 000000000000..bf4df4e45b9d
--- /dev/null
+++ b/app-admin/conky/Manifest
@@ -0,0 +1 @@
+DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
diff --git a/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild
new file mode 100644
index 000000000000..aac776f80764
--- /dev/null
+++ b/app-admin/conky/conky-1.9.0-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils libtool
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86"
+IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ >=dev-lang/lua-5.1.4-r8
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ >=dev-lang/lua-5.1.4-r8
+ media-libs/imlib2[X] )
+ nvidia? ( media-video/nvidia-settings )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+ xmms2? ( media-sound/xmms2 )
+ )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ portmon? ( dev-libs/glib )
+ lua? ( >=dev-lang/lua-5.1.4-r8 )
+ ncurses? ( sys-libs/ncurses )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ virtual/libiconv
+ "
+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}
+ virtual/pkgconfig
+ "
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
+ "${FILESDIR}/${P}-ncurses.patch" \
+ "${FILESDIR}/${P}-lines-fix.patch" \
+ "${FILESDIR}/${P}-update-when-message-count-decreases.patch" \
+ "${FILESDIR}/${P}-apcupsd.patch" \
+ "${FILESDIR}/${P}-default-graph-size.patch" \
+ "${FILESDIR}/${P}-diskio-dmmajor.patch" \
+ "${FILESDIR}/${P}-tinfo.patch"
+
+ # Allow user patches #478482
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use X; then
+ myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+ myconf="${myconf} --enable-argb --enable-own-window"
+ myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
+ myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
+ myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
+ myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
+ else
+ myconf="--disable-x11 --disable-own-window --disable-argb"
+ myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
+ myconf="${myconf} --disable-audacious --disable-xmms2"
+ fi
+
+ econf \
+ ${myconf} \
+ $(use_enable apcupsd) \
+ $(use_enable curl) \
+ $(use_enable debug) \
+ $(use_enable eve) \
+ $(use_enable hddtemp) \
+ $(use_enable iostats) \
+ $(use_enable lua) \
+ $(use_enable thinkpad ibm) \
+ $(use_enable math) \
+ $(use_enable moc) \
+ $(use_enable mpd) \
+ $(use_enable ncurses) \
+ $(use_enable portmon) \
+ $(use_enable rss) \
+ $(use_enable weather-metar) \
+ $(use_enable weather-xoap) \
+ $(use_enable wifi wlan)
+}
+
+src_install() {
+ default
+
+ dohtml doc/*.html
+
+ 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
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "You can find sample configurations at ${ROOT%/}/etc/conky."
+ elog "To customize, copy to ~/.conkyrc and edit it to your liking."
+ elog
+ elog "There are pretty html docs available at the conky homepage"
+ elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+ elog
+ elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+ elog
+ fi
+}
diff --git a/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch b/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch
new file mode 100644
index 000000000000..8b9e1e8fb9d0
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch
@@ -0,0 +1,104 @@
+From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Fri, 11 Nov 2011 11:27:43 +0100
+Subject: [PATCH] Make scroll UTF-8 aware. Fixes bug #3134941.
+
+---
+ src/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/src/scroll.c b/src/scroll.c
+index f78f807..738db0d 100644
+--- a/src/scroll.c
++++ b/src/scroll.c
+@@ -34,12 +34,33 @@
+
+ struct scroll_data {
+ char *text;
++ unsigned int show_orig;
+ unsigned int show;
+ unsigned int step;
+ unsigned int start;
+ long resetcolor;
+ };
+
++int utf8_charlen(char c) {
++ unsigned char uc = (unsigned char) c;
++ int len = 0;
++
++ if ((uc & 0x80) == 0)
++ return 1;
++
++ while ((uc & 0x80) != 0) {
++ ++len;
++ uc <<= 1;
++ }
++
++ return (len > 0 && len <= 4) ? len : -1;
++}
++
++int is_utf8_char_tail(char c) {
++ unsigned char uc = (unsigned char) c;
++ return (uc & 0xc0) == 0x80;
++}
++
+ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash)
+ {
+ struct scroll_data *sd;
+@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
+ sd->step = 1;
+ }
+ sd->text = malloc(strlen(arg + n1) + sd->show + 1);
++ // sd->show value may change when there are UTF-8 chars to be shown, so
++ // save its origin value
++ sd->show_orig = sd->show;
+
+ if (strlen(arg) > sd->show) {
+ for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
+- sd->text[n2] = ' ';
++ sd->text[n2] = ' ';
+ }
+ sd->text[n2] = 0;
+ }
+ else
+- sd->text[0] = 0;
++ sd->text[0] = 0;
+
+ strcat(sd->text, arg + n1);
+ sd->start = 0;
+@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
+ {
+ struct scroll_data *sd = obj->data.opaque;
+ unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend;
++ int charlen = 0;
++ unsigned int utf8lenfix = 0;
+ char *pwithcolors;
+ char buf[max_user_text];
+
++ sd->show = sd->show_orig;
++
+ if (!sd)
+ return;
+
+@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
+ while(*(buf + sd->start) == SPECIAL_CHAR) {
+ sd->start++;
+ }
++ //skip parts of UTF-8 character which messes up display
++ while(is_utf8_char_tail(*(buf + sd->start))) {
++ sd->start++;
++ }
++ //extend length to be shown for wide characters
++ j = 0;
++ while(j < sd->show + visibcolorchanges + utf8lenfix) {
++ charlen = utf8_charlen(*(buf + sd->start + j));
++ utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
++ j += charlen;
++ }
++ sd->show = sd->show_orig + utf8lenfix;
+ //place all chars that should be visible in p, including colorchanges
+ for(j=0; j < sd->show + visibcolorchanges; j++) {
+ p[j] = *(buf + sd->start + j);
+--
+1.7.8.rc1
+
diff --git a/app-admin/conky/files/conky-1.9.0-apcupsd.patch b/app-admin/conky/files/conky-1.9.0-apcupsd.patch
new file mode 100644
index 000000000000..9161fbcc5ebb
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-apcupsd.patch
@@ -0,0 +1,106 @@
+Description: Fix broken apcupsd support in Conky 1.8.1
+ Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
+ support. This is a workaround until upstream properly addresses this issue.
+From: Brian Derr <bderrly@gmail.com>
+Forwarded: http://sourceforge.net/support/tracker.php?aid=3083859
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/897495
+Last-Update: 2011-12-02
+
+--- a/src/apcupsd.c
++++ b/src/apcupsd.c
+@@ -154,7 +154,7 @@
+ //
+ // Conky update function for apcupsd data
+ //
+-int update_apcupsd(void) {
++void update_apcupsd(void) {
+
+ int i;
+ APCUPSD_S apc;
+@@ -164,41 +164,44 @@
+ memcpy(apc.items[i], "N/A", 4); // including \0
+
+ do {
+- struct addrinfo hints;
+- struct addrinfo *ai, *rp;
+- int res;
++ struct hostent* he = 0;
++ struct sockaddr_in addr;
+ short sz = 0;
+- char portbuf[8];
++#ifdef HAVE_GETHOSTBYNAME_R
++ struct hostent he_mem;
++ int he_errno;
++ char hostbuff[2048];
++#endif
+ //
+ // connect to apcupsd daemon
+ //
+- memset(&hints, 0, sizeof(struct addrinfo));
+- hints.ai_family = AF_UNSPEC;
+- hints.ai_socktype = SOCK_STREAM;
+- hints.ai_flags = 0;
+- hints.ai_protocol = 0;
+- snprintf(portbuf, 8, "%d", info.apcupsd.port);
+- res = getaddrinfo(info.apcupsd.host, portbuf, &hints, &ai);
+- if (res != 0) {
+- NORM_ERR("APCUPSD getaddrinfo: %s", gai_strerror(res));
++ sock = socket(AF_INET, SOCK_STREAM, 0);
++ if (sock < 0) {
++ perror("socket");
+ break;
+ }
+- for (rp = ai; rp != NULL; rp = rp->ai_next) {
+- sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+- if (sock == -1) {
+- continue;
+- }
+- if (connect(sock, rp->ai_addr, rp->ai_addrlen) != -1) {
+- break;
+- }
+- close(sock);
++#ifdef HAVE_GETHOSTBYNAME_R
++ if (gethostbyname_r(info.apcupsd.host, &he_mem, hostbuff, sizeof(hostbuff), &he, &he_errno) || !he ) {
++ NORM_ERR("APCUPSD gethostbyname_r: %s", hstrerror(h_errno));
++ break;
++ }
++#else /* HAVE_GETHOSTBYNAME_R */
++ he = gethostbyname(info.apcupsd.host);
++ if (!he) {
++ herror("gethostbyname");
++ break;
+ }
+- freeaddrinfo(ai);
+- if (rp == NULL) {
++#endif /* HAVE_GETHOSTBYNAME_R */
++
++ memset(&addr, 0, sizeof(addr));
++ addr.sin_family = AF_INET;
++ addr.sin_port = info.apcupsd.port;
++ memcpy(&addr.sin_addr, he->h_addr, he->h_length);
++ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) < 0) {
+ // no error reporting, the daemon is probably not running
+ break;
+ }
+-
++
+ //
+ // send status request - "status" - 6B
+ //
+@@ -222,5 +225,5 @@
+ // "atomically" copy the data into working set
+ //
+ memcpy(info.apcupsd.items, apc.items, sizeof(info.apcupsd.items));
+- return 0;
++ return;
+ }
+--- a/src/apcupsd.h
++++ b/src/apcupsd.h
+@@ -49,6 +49,6 @@
+ } APCUPSD_S, *PAPCUPSD_S;
+
+ /* Service routine for the conky main thread */
+-int update_apcupsd(void);
++void update_apcupsd(void);
+
+ #endif /*APCUPSD_H_*/
diff --git a/app-admin/conky/files/conky-1.9.0-default-graph-size.patch b/app-admin/conky/files/conky-1.9.0-default-graph-size.patch
new file mode 100644
index 000000000000..02f64e314e0e
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-default-graph-size.patch
@@ -0,0 +1,18 @@
+diff -r -U 5 conky-1.9.0/src/specials.c conky-1.9.0/src/specials.c
+--- conky-1.9.0/src/specials.c 2012-05-03 22:13:47.000000000 +0100
++++ conky-1.9.0/src/specials.c 2013-02-27 21:16:15.856669451 +0000
+@@ -186,12 +186,12 @@
+ g->scale = defscale;
+ if (sscanf(args, "%1023s %d,%d %x %x", buf, &g->height, &g->width, &g->first_colour, &g->last_colour) == 5) {
+ return strndup(buf, text_buffer_size);
+ }
+ buf[0] = '\0';
+- g->height = 25;
+- g->width = 0;
++ g->height = default_graph_height;
++ g->width = default_graph_width;
+ if (sscanf(args, "%x %x %u", &g->first_colour, &g->last_colour, &g->scale) == 3) {
+ return NULL;
+ }
+ g->scale = defscale;
+ if (sscanf(args, "%x %x", &g->first_colour, &g->last_colour) == 2) {
diff --git a/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
new file mode 100644
index 000000000000..db3516aa292b
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch
@@ -0,0 +1,23 @@
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -80,6 +80,10 @@
+ #define NBD_MAJOR 43
+ #endif
+
++#if !defined(DM_MAJOR)
++#define DM_MAJOR 253
++#endif
++
+ #ifdef HAVE_IWLIB
+ #include <iwlib.h>
+ #endif
+@@ -2336,7 +2340,8 @@ int update_diskio(void)
+ *
+ * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
+ if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
+- && major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
++ && major != RAMDISK_MAJOR && major != LOOP_MAJOR
++ && major != DM_MAJOR ) {
+ /* check needed for kernel >= 2.6.31, see sf #2942117 */
+ if (is_disk(devbuf)) {
+ total_reads += reads;
diff --git a/app-admin/conky/files/conky-1.9.0-lines-fix.patch b/app-admin/conky/files/conky-1.9.0-lines-fix.patch
new file mode 100644
index 000000000000..de48ab95e48a
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-lines-fix.patch
@@ -0,0 +1,36 @@
+diff -urN old/src/conky.c new/src/conky.c
+--- old/src/conky.c 2012-05-03 23:22:21.000000000 +0200
++++ new/src/conky.c 2012-08-15 00:06:59.256311301 +0200
+@@ -3065,12 +3065,26 @@
+ og = g;
+ }
+
+- /* this is mugfugly, but it works */
+- XDrawLine(display, window.drawable, window.gc,
+- cur_x + i + 1,
+- specials[special_index].dotgraph ? og : by + h,
+- cur_x + i + 1,
+- g);
++ if (specials[special_index].dotgraph) {
++ if (og == g) {
++ XDrawPoint(display, window.drawable,
++ window.gc, cur_x + i + 1, g);
++ } else {
++ XDrawLine(display, window.drawable, window.gc,
++ cur_x + i + 1,
++ og,
++ cur_x + i + 1,
++ g);
++ }
++ } else {
++ /* this is mugfugly, but it works */
++ XDrawLine(display, window.drawable, window.gc,
++ cur_x + i + 1,
++ by + h,
++ cur_x + i + 1,
++ g);
++ }
++
+ ++j;
+ }
+ if (tmpcolour) free(tmpcolour);
diff --git a/app-admin/conky/files/conky-1.9.0-ncurses.patch b/app-admin/conky/files/conky-1.9.0-ncurses.patch
new file mode 100644
index 000000000000..91043ed42050
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-ncurses.patch
@@ -0,0 +1,31 @@
+From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo@centrum.sk>
+Date: Fri, 13 Jul 2012 13:41:09 +0200
+Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329)
+
+---
+ src/conky.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conky.c b/src/conky.c
+index c5b4bed..17fe1a7 100644
+--- a/src/conky.c
++++ b/src/conky.c
+@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
+ OBJ(cpu) {
+ if (cur->cpu_usage) {
+ if (obj->data.i > info.cpu_count) {
+- static bool warned = false;
++ static int warned = 0;
+ if(!warned) {
+ NORM_ERR("obj->data.i %i info.cpu_count %i",
+ obj->data.i, info.cpu_count);
+ NORM_ERR("attempting to use more CPUs than you have!");
+- warned = true;
++ warned = 1;
+ }
+ } else {
+ percent_print(p, p_max_size,
+--
+1.7.0.4
+
diff --git a/app-admin/conky/files/conky-1.9.0-tinfo.patch b/app-admin/conky/files/conky-1.9.0-tinfo.patch
new file mode 100644
index 000000000000..0018a726f3ff
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-tinfo.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -134,7 +134,7 @@
+
+ AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
+ if test x$want_ncurses = xyes; then
+- conky_LIBS="$conky_LIBS -lncurses"
++ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
+ AC_DEFINE(NCURSES, 1, [Define for ncurses support])
+ AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
+ fi
+--- a/configure.ac
++++ b/configure.ac
+@@ -134,7 +134,7 @@
+
+ AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
+ if test x$want_ncurses = xyes; then
+- conky_LIBS="$conky_LIBS -lncurses"
++ PKG_CHECK_MODULES(ncurses,ncurses,conky_LIBS="$conky_LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses not found]))
+ AC_DEFINE(NCURSES, 1, [Define for ncurses support])
+ AC_CHECK_HEADERS([ncurses.h], [], AC_MSG_ERROR([required header(s) not found]))
+ fi
diff --git a/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch b/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
new file mode 100644
index 000000000000..dd422c584e35
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
@@ -0,0 +1,75 @@
+diff --git a/src/mail.c b/src/mail.c
+index 7f60ba3..882b7c8 100644
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s *mail)
+
+ void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen, unsigned long old_messages)
+ {
+- if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
+- || (mail->messages > old_messages && mail->unseen > 0))) {
++ /*
++ * Georg Hopp (2012-12-23):
++ * Well, i will read mails from time to time and i want the unseen
++ * count to be reduced when they are read...so, this seems wrong.
++ * Try a better one.... :)
++ */
++ if (strlen(mail->command) > 1
++ && (mail->unseen != old_unseen
++ || mail->messages != old_messages)) {
+ // new mail goodie
+ if (system(mail->command) == -1) {
+ perror("system()");
+@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
+ if (strlen(recvbuf) > 2) {
+ unsigned long messages, recent = 0;
+ char *buf = recvbuf;
+- char force_check = 0;
++ char force_check = 1;
+ buf = strstr(buf, "EXISTS");
+ while (buf && strlen(buf) > 1 && strstr(buf + 1, "EXISTS")) {
+ buf = strstr(buf + 1, "EXISTS");
+@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
+ }
+ if (sscanf(buf, "* %lu EXISTS\r\n", &messages) == 1) {
+ timed_thread_lock(mail->p_timed_thread);
+- if (mail->messages != messages) {
+- force_check = 1;
+- }
++ force_check = 1;
+ timed_thread_unlock(mail->p_timed_thread);
+ }
+ }
+@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
+ * something other than 0, or we had a timeout
+ */
+ buf = recvbuf;
+- if (recent > 0 || (buf && strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
++ if (recent > 0
++ || (buf && strstr(buf, " FETCH "))
++ || (buf && strstr(buf, " EXPUNGE "))
++ || fetchtimeout.tv_sec == 0 || force_check) {
+ // re-check messages and unseen
+ if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
+ fail++;
+@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
+ fail++;
+ break;
+ }
++ imap_unseen_command(mail, old_unseen, old_messages);
++ old_unseen = mail->unseen;
++ old_messages = mail->messages;
+ strncpy(sendbuf, "a5 IDLE\r\n", MAXDATASIZE);
+ if (imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
+ fail++;
+@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
+ fail++;
+ break;
+ }
+- imap_unseen_command(mail, old_unseen, old_messages);
+ fail = 0;
+- old_unseen = mail->unseen;
+- old_messages = mail->messages;
+ }
+ if (fail) break;
+ } else {
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
new file mode 100644
index 000000000000..81d6ebe98f1b
--- /dev/null
+++ b/app-admin/conky/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>
+ <email>billie@gentoo.org</email>
+ <name>Daniel Pielmeier</name>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email>brenden@rty.ca</email>
+ <name>Brenden Matthews</name>
+ <description>Upstream author</description>
+ </maintainer>
+ <remote-id type="sourceforge">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="eve">enable support for the eve-online skill monitor</flag>
+ <flag name="iostats">enable support for per-task I/O statistics</flag>
+ <flag name="lua">enable if you want Lua scripting support</flag>
+ <flag name="lua-cairo">enable if you want Lua Cairo bindings for Conky (also enables lua support)</flag>
+ <flag name="lua-imlib">enable if you want Lua Imlib2 bindings for Conky (also enables lua and imlib support)</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="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..4688cca395aa
--- /dev/null
+++ b/app-admin/conkyforecast/Manifest
@@ -0,0 +1 @@
+DIST conkyforecast_2.24.tar.gz 11347231 SHA256 251dba60bc209a2f4181de856abb1fe553e8b983d1af40998235061e8679a54d SHA512 dcff08915c00915f6be4cd25824e3d8de978ed15ffb6776f002d585d95856f5e0827632371dd4d37016e07d58542e2bc95a7a859ebdc8ab9d1200ac04d4364e0 WHIRLPOOL d7a6967e09a52eeac98ab13f64f3ab86a29f1964b7b79951c78b08f7e42c67d6d41e5c339bd1d7dedad687c523bd7fd059d529d076894d19af2a1c2a8180e718
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..ad5f02ca7983
--- /dev/null
+++ b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7ad6f3ff7899
--- /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>
+ <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..4fee7ef33d12
--- /dev/null
+++ b/app-admin/conserver/Manifest
@@ -0,0 +1 @@
+DIST conserver-8.1.18.tar.gz 323247 SHA256 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f WHIRLPOOL e12e54f2af25ef696ecf61818da0dd8cd09c23ca03e0fbb8445ee8eca5dc4ec2dbb25e88a68ac4a51c49b89838bf875ac65ac0e59d49337f36aa3929aa02dc81
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..5c918854667a
--- /dev/null
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-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..4d4b1e78842d
--- /dev/null
+++ b/app-admin/conserver/conserver-8.1.18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 m