commit:     af803f8fb3b3f7b7cfc01219d5c13748ef794a04
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 12:05:21 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 12:05:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af803f8f

Merge branch 'remotes/origin/master' into 'project/libressl'

 .gitignore                                         |   1 +
 app-crypt/ccid/Manifest                            |   1 +
 app-crypt/ccid/ccid-1.4.20.ebuild                  |  49 ++
 app-crypt/xca/Manifest                             |   1 +
 app-crypt/xca/xca-1.3.0.ebuild                     |  43 ++
 app-emulation/lxd/files/lxd.initd                  |   2 +-
 app-emulation/qemu-guest-agent/Manifest            |   9 +-
 .../qemu-guest-agent-1.5.2-r2.ebuild               |  93 ----
 .../qemu-guest-agent-1.6.0-r1.ebuild               |  93 ----
 .../qemu-guest-agent/qemu-guest-agent-2.1.2.ebuild |  94 ----
 ...-2.2.0.ebuild => qemu-guest-agent-2.3.1.ebuild} |  42 +-
 ...-2.0.0.ebuild => qemu-guest-agent-2.4.0.ebuild} |  44 +-
 app-emulation/qemu/Manifest                        |   2 +
 app-emulation/qemu/qemu-2.3.1.ebuild               | 602 +++++++++++++++++++++
 .../qemu/{qemu-9999.ebuild => qemu-2.4.0.ebuild}   |   0
 .../cpuinfo2cpuflags/cpuinfo2cpuflags-2.ebuild     |   2 +-
 app-portage/grs/Manifest                           |   1 +
 .../grs/{grs-9999.ebuild => grs-0.1.ebuild}        |   7 +-
 app-portage/grs/grs-9999.ebuild                    |   7 +-
 app-text/calibre/Manifest                          |   1 +
 ...calibre-2.33.0.ebuild => calibre-2.34.0.ebuild} |   0
 dev-db/maxscale/Manifest                           |   1 +
 dev-db/maxscale/files/maxscale-1.2.0-rpath.patch   |  48 ++
 dev-db/maxscale/files/maxscale-init.d              |  21 +
 dev-db/maxscale/maxscale-1.2.0.ebuild              |  71 +++
 dev-db/maxscale/metadata.xml                       |  13 +
 dev-db/myodbc/files/5.2.7-my_malloc.patch          |  18 +
 dev-db/myodbc/myodbc-5.2.7-r2.ebuild               |   5 +-
 dev-db/mysql-connector-c/files/mysql_com.patch     |  31 ++
 ....6.ebuild => mysql-connector-c-6.1.6-r1.ebuild} |   3 +-
 dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild    |   3 +-
 dev-go/godep/Manifest                              |   1 +
 dev-go/godep/godep-0_p20150520-r1.ebuild           |  47 --
 dev-go/godep/godep-0_p20150520.ebuild              |  47 --
 dev-go/godep/godep-0_pre20150807.ebuild            |  36 ++
 dev-lang/fsharp/fsharp-3.1.1.31.ebuild             |   2 +-
 dev-lang/fsharp/fsharp-4.0.0.3.ebuild              |   2 +-
 dev-perl/Algorithm-C3/Algorithm-C3-0.90.0.ebuild   |   2 +-
 .../B-Hooks-EndOfScope-0.140.0.ebuild              |  33 --
 .../B-Hooks-EndOfScope-0.150.0.ebuild              |   2 +-
 dev-perl/B-Hooks-EndOfScope/Manifest               |   1 -
 dev-perl/Class-C3/Class-C3-0.280.0.ebuild          |   2 +-
 dev-perl/Class-Load/Class-Load-0.220.0.ebuild      |  39 --
 dev-perl/Class-Load/Class-Load-0.230.0.ebuild      |   2 +-
 dev-perl/Class-Load/Manifest                       |   1 -
 .../Devel-OverloadInfo-0.2.0.ebuild                |   2 +-
 dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild |   2 +-
 .../ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild   |   2 +-
 .../ExtUtils-Helpers-0.22.0.ebuild                 |   2 +-
 .../ExtUtils-InstallPaths-0.10.0.ebuild            |   2 +-
 .../File-Find-Rule-Perl-1.130.0.ebuild             |   2 +-
 .../List-MoreUtils/List-MoreUtils-0.408.0.ebuild   |   2 +-
 .../List-MoreUtils/List-MoreUtils-0.413.0.ebuild   |   2 +-
 dev-perl/Module-Build-Tiny/Manifest                |   1 -
 .../Module-Build-Tiny-0.37.0.ebuild                |  45 --
 .../Module-Build-Tiny-0.39.0.ebuild                |   2 +-
 .../Module-Runtime-Conflicts-0.2.0.ebuild          |   2 +-
 dev-perl/Moose/Moose-2.140.500.ebuild              |   2 +-
 .../Test-CleanNamespaces-0.180.0.ebuild            |   2 +-
 dev-perl/XML-Twig/Manifest                         |   1 -
 dev-perl/XML-Twig/XML-Twig-3.440.0-r1.ebuild       |  32 --
 dev-perl/glib-perl/Manifest                        |   1 +
 dev-perl/glib-perl/glib-perl-1.313.0.ebuild        |  31 ++
 dev-perl/namespace-clean/Manifest                  |   2 +-
 ....0-r1.ebuild => namespace-clean-0.250.0.ebuild} |   5 +-
 dev-python/pycountry/Manifest                      |   2 +-
 dev-python/pycountry/pycountry-1.10.ebuild         |  32 --
 ...pycountry-1.12.ebuild => pycountry-1.13.ebuild} |   0
 dev-python/pygal/Manifest                          |   2 +-
 dev-python/pygal/pygal-1.6.1.ebuild                |  18 -
 .../{pygal-2.0.0.ebuild => pygal-2.0.1.ebuild}     |   0
 .../files/pygame_sdl2-6.99.5-cython-0.23.patch     |  44 ++
 dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild   |   2 +
 dev-python/pylons/Manifest                         |   1 +
 dev-python/pylons/pylons-1.0.2.ebuild              |  54 ++
 dev-python/stormpath/Manifest                      |   1 +
 dev-python/stormpath/files/drop-test-module.patch  |  13 +
 .../metadata.xml                                   |   0
 dev-python/stormpath/stormpath-2.0.8.ebuild        |  59 ++
 dev-ruby/barby/barby-0.6.2-r1.ebuild               | 124 +++++
 dev-ruby/bson/Manifest                             |   2 -
 dev-ruby/bson/bson-1.6.2-r1.ebuild                 | 111 ----
 dev-ruby/bson/bson-2.3.0.ebuild                    |  69 ---
 dev-ruby/mongo/Manifest                            |   1 +
 dev-ruby/mongo/mongo-2.0.6.ebuild                  |  59 ++
 dev-ruby/optionable/Manifest                       |   1 +
 dev-ruby/optionable/metadata.xml                   |   8 +
 dev-ruby/optionable/optionable-0.2.0.ebuild        |  20 +
 dev-ruby/png/Manifest                              |   1 +
 dev-ruby/png/png-1.2.1.ebuild                      |  46 ++
 dev-ruby/redis/Manifest                            |   1 +
 .../files/redis-3.2.1-local-redis-server.patch     |  68 +++
 dev-ruby/redis/redis-3.2.1.ebuild                  |  40 ++
 dev-scheme/gambit/gambit-4.7.0-r1.ebuild           |  53 ++
 dev-scheme/scm/Manifest                            |   2 +-
 dev-scheme/scm/metadata.xml                        |   1 +
 dev-scheme/scm/scm-5.5.6-r1.ebuild                 | 161 ++++++
 dev-scheme/scm/scm-5.5.6-r2.ebuild                 | 171 ++++++
 dev-tcltk/tcllib/tcllib-1.16.ebuild                |   2 +-
 dev-tcltk/tdom/tdom-0.8.3-r4.ebuild                |   2 +-
 dev-util/debhelper/Manifest                        |   1 +
 ...20150628.ebuild => debhelper-9.20150811.ebuild} |   0
 dev-vcs/git/metadata.xml                           |   1 +
 dev-vcs/tortoisehg/Manifest                        |   2 +-
 ...rtoisehg-3.4.1.ebuild => tortoisehg-3.5.ebuild} |   4 +-
 eclass/golang-vcs-snapshot.eclass                  |   4 +-
 eclass/golang-vcs.eclass                           |  24 +-
 media-libs/liblscp/Manifest                        |   3 +-
 media-libs/liblscp/liblscp-0.5.7.ebuild            |  26 +
 media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild           |   2 +-
 media-sound/qsampler/Manifest                      |   3 +-
 media-sound/qsampler/metadata.xml                  |   3 +-
 media-sound/qsampler/qsampler-0.3.1.ebuild         |  42 ++
 net-analyzer/bmon/Manifest                         |   1 +
 .../bmon/{bmon-3.7.ebuild => bmon-3.8.ebuild}      |   0
 net-analyzer/munin/munin-2.0.25-r1.ebuild          |   8 +-
 net-analyzer/ndoutils/Manifest                     |   1 -
 .../files/ndoutils-1.4_beta9-asprintf.patch        |  10 -
 net-analyzer/ndoutils/ndoutils-1.5.2.ebuild        |  64 ---
 net-firewall/firehol/firehol-2.0.3.ebuild          |   2 +-
 net-libs/ldns/files/ldns-1.6.17_perl522.patch      |  11 +
 net-libs/ldns/ldns-1.6.17.ebuild                   |   4 +
 net-mail/courier-imap/Manifest                     |   1 +
 net-mail/courier-imap/courier-imap-4.16.0.ebuild   |   2 +-
 ...ap-4.16.0.ebuild => courier-imap-4.16.2.ebuild} |   2 +-
 net-misc/curl/Manifest                             |   1 +
 net-misc/curl/curl-7.44.0.ebuild                   | 245 +++++++++
 net-misc/openssh/Manifest                          |   2 +
 .../openssh-6.8_p1-ssl-engine-configure.patch      |   2 +
 net-misc/openssh/openssh-6.9_p1-r2.ebuild          |   5 +-
 ...nssh-6.9_p1-r2.ebuild => openssh-7.0_p1.ebuild} |  20 +-
 net-misc/youtube-dl/Manifest                       |   1 +
 ...08.06.1.ebuild => youtube-dl-2015.08.09.ebuild} |   0
 .../retroshare/retroshare-0.6.0_rc2_pre8551.ebuild |   2 +-
 profiles/base/package.use.mask                     |   4 +
 sci-electronics/xnec2c/Manifest                    |   1 +
 .../{xnec2c-3.3.ebuild => xnec2c-3.4.ebuild}       |   0
 sci-mathematics/gimps/Manifest                     |   4 +-
 .../gimps/{gimps-28.5.ebuild => gimps-28.7.ebuild} |   2 +-
 .../gentoo-functions/gentoo-functions-0.10.ebuild  |   2 +-
 .../microcode-data-20150121-r1.ebuild              |   1 +
 sys-apps/pcsc-lite/Manifest                        |   2 +-
 ...ite-1.8.8-r1.ebuild => pcsc-lite-1.8.14.ebuild} |  61 ++-
 sys-apps/pcsc-tools/Manifest                       |   1 +
 sys-apps/pcsc-tools/pcsc-tools-1.4.24.ebuild       |  65 +++
 sys-apps/portage/Manifest                          |   1 +
 ...rtage-2.2.20.ebuild => portage-2.2.20.1.ebuild} |   0
 sys-auth/libfprint/Manifest                        |   3 +-
 ...rint-0.6.0.ebuild => libfprint-0.6.0-r1.ebuild} |   8 +-
 sys-cluster/vzctl/Manifest                         |   1 +
 sys-cluster/vzctl/vzctl-4.9.3.ebuild               |  86 +++
 sys-kernel/ck-sources/Manifest                     |   6 +
 sys-kernel/ck-sources/ck-sources-3.10.86.ebuild    | 107 ++++
 sys-kernel/ck-sources/ck-sources-3.14.50.ebuild    | 105 ++++
 sys-kernel/hardened-sources/Manifest               |   5 +
 .../hardened-sources-3.14.50.ebuild                |  45 ++
 .../hardened-sources-3.2.70.ebuild                 |  43 ++
 .../hardened-sources/hardened-sources-4.1.5.ebuild |  45 ++
 sys-libs/glibc/Manifest                            |   2 +-
 sys-libs/glibc/glibc-2.22.ebuild                   |   2 +-
 sys-libs/ncurses/Manifest                          |   1 +
 sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch     |  24 +
 .../ncurses/files/ncurses-6.0-pkg-config.patch     |  14 +
 .../files/ncurses-6.0-rxvt-unicode-9.15.patch      | 191 +++++++
 sys-libs/ncurses/ncurses-5.9-r3.ebuild             |   5 +-
 sys-libs/ncurses/ncurses-5.9-r4.ebuild             |   5 +-
 .../{ncurses-5.9-r4.ebuild => ncurses-6.0.ebuild}  | 168 +++---
 sys-libs/timezone-data/Manifest                    |  10 +-
 .../files/timezone-data-2008h-makefile.patch       | 138 -----
 .../files/timezone-data-2012a-makefile.patch       | 138 -----
 .../files/timezone-data-2012i-makefile.patch       |  95 ----
 .../files/timezone-data-2013a-makefile.patch       |  95 ----
 .../files/timezone-data-2013d-makefile.patch       |  95 ----
 .../files/timezone-data-2013f-makefile.patch       | 119 ----
 .../files/timezone-data-2013h-makefile.patch       | 112 ----
 .../files/timezone-data-2014f-makefile.patch       | 112 ----
 .../files/timezone-data-2014g-makefile.patch       | 113 ----
 .../files/timezone-data-2014h-makefile.patch       | 113 ----
 sys-libs/timezone-data/timezone-data-2012j.ebuild  | 110 ----
 sys-libs/timezone-data/timezone-data-2013i.ebuild  | 129 -----
 .../timezone-data/timezone-data-2014i-r1.ebuild    | 151 ------
 sys-libs/timezone-data/timezone-data-2014j.ebuild  | 151 ------
 sys-libs/timezone-data/timezone-data-2015e.ebuild  |   2 +-
 ...ata-2015e.ebuild => timezone-data-2015f.ebuild} |   0
 www-apps/joomla/Manifest                           |   1 -
 www-apps/joomla/joomla-3.4.1.ebuild                |  51 --
 www-apps/nikola/Manifest                           |   1 +
 www-apps/nikola/nikola-7.6.3.ebuild                |  69 +++
 www-client/firefox/firefox-38.1.1.ebuild           |   2 +-
 www-client/google-chrome-unstable/Manifest         |   4 +-
 .../google-chrome-unstable-46.0.2478.0_p1.ebuild}  |   0
 www-client/google-chrome/Manifest                  |   4 +-
 .../google-chrome-44.0.2403.155_p1.ebuild}         |   0
 www-plugins/adobe-flash/Manifest                   |   3 +
 ....491.ebuild => adobe-flash-11.2.202.508.ebuild} |   0
 www-plugins/chrome-binary-plugins/Manifest         |   8 +-
 ... chrome-binary-plugins-44.0.2403.155_p1.ebuild} |   0
 ...hrome-binary-plugins-46.0.2478.0_alpha1.ebuild} |   0
 x11-libs/libvdpau/Manifest                         |   1 +
 x11-libs/libvdpau/libvdpau-1.1.ebuild              |  50 ++
 x11-plugins/wmbattery/Manifest                     |   1 +
 ...wmbattery-2.47.ebuild => wmbattery-2.48.ebuild} |   0
 x11-plugins/wmifs/Manifest                         |   1 +
 x11-plugins/wmifs/wmifs-1.5.ebuild                 |  38 ++
 x11-wm/windowmaker/Manifest                        |   1 +
 ...maker-9999.ebuild => windowmaker-0.95.7.ebuild} |  19 +-
 x11-wm/windowmaker/windowmaker-9999.ebuild         |   5 +-
 207 files changed, 3450 insertions(+), 2839 deletions(-)

Reply via email to