commit: a23c9aee9e9b0cf185b44869442886b0a6346d9f Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> AuthorDate: Mon Jan 25 17:10:59 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Mon Jan 25 17:12:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23c9aee
Merge remote-tracking branch 'remotes/sbraz/pycountry' Pull request: https://github.com/gentoo/gentoo/pull/721 app-admin/tripwire/tripwire-2.4.2.2-r4.ebuild | 2 +- ...kuppc-3.3.1.ebuild => backuppc-3.3.1-r1.ebuild} | 5 +- app-benchmarks/bonnie++/metadata.xml | 15 + app-benchmarks/filebench/metadata.xml | 15 + app-doc/doxygen/metadata.xml | 4 + app-emacs/magit/Manifest | 1 + .../{magit-2.3.1.ebuild => magit-2.4.0.ebuild} | 0 app-misc/sphinx/sphinx-2.2.10.ebuild | 2 +- .../jdbc-postgresql-9.4_p1206.ebuild | 2 +- dev-libs/uchardet/Manifest | 1 + .../files/uchardet-0.0.5-fix-ASCII-detection.patch | 116 ++++ .../uchardet-0.0.5-use-proper-package-name.patch | 30 + dev-libs/uchardet/metadata.xml | 5 + dev-libs/uchardet/uchardet-0.0.5.ebuild | 33 ++ dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.1-r1.ebuild | 46 ++ dev-python/celery/Manifest | 1 + dev-python/celery/celery-3.1.17.ebuild | 4 +- dev-python/celery/celery-3.1.18-r1.ebuild | 4 +- dev-python/celery/celery-3.1.18.ebuild | 4 +- dev-python/celery/celery-3.1.19.ebuild | 4 +- .../{celery-3.1.19.ebuild => celery-3.1.20.ebuild} | 8 +- dev-python/jedi/jedi-0.9.0.ebuild | 5 +- dev-python/numpy/numpy-1.10.4.ebuild | 2 +- dev-python/numpy/numpy-9999.ebuild | 25 +- dev-python/pycountry/Manifest | 4 +- dev-python/pycountry/metadata.xml | 1 + dev-python/pycountry/pycountry-1.13.ebuild | 31 - dev-python/pycountry/pycountry-1.14.ebuild | 31 - ...pycountry-1.12.ebuild => pycountry-1.19.ebuild} | 10 +- dev-python/pytest-catchlog/Manifest | 1 + .../pytest-catchlog/pytest-catchlog-1.2.2.ebuild | 29 + dev-python/pytest/Manifest | 1 + .../files/pytest-2.8.7-skip-test-on-pypy.patch | 550 ++++++++++++++++++ dev-python/pytest/pytest-2.8.7.ebuild | 76 +++ dev-python/seaborn/Manifest | 1 + dev-python/seaborn/seaborn-0.7.0.ebuild | 39 ++ dev-python/setuptools/Manifest | 1 + ...tuptools-9999.ebuild => setuptools-19.6.ebuild} | 41 +- dev-python/setuptools/setuptools-9999.ebuild | 48 +- dev-python/sphinx/Manifest | 1 + .../{sphinx-1.3.4.ebuild => sphinx-1.3.5.ebuild} | 0 dev-qt/qtchooser/qtchooser-0_p20151008.ebuild | 2 +- dev-ruby/sinatra/Manifest | 1 + dev-ruby/sinatra/sinatra-1.4.7.ebuild | 34 ++ dev-vcs/tortoisehg/Manifest | 2 +- ...oisehg-3.6.1.ebuild => tortoisehg-3.6.3.ebuild} | 2 +- eclass/cmake-utils.eclass | 189 +++--- eclass/kernel-2.eclass | 4 +- eclass/linux-info.eclass | 4 +- eclass/linux-mod.eclass | 4 +- .../tgif/files/tgif-4.2.5-wformat-security.patch | 500 ++++++++++++++++ media-gfx/tgif/tgif-4.2.5-r1.ebuild | 47 ++ .../xv/files/xv-3.10a-disable-jp2k-20070520.patch | 4 +- media-gfx/xv/files/xv-3.10a-libpng15-r1.patch | 8 +- media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch | 4 +- .../xv/files/xv-3.10a-vdcomp-osx-20070520.patch | 4 +- media-gfx/xv/files/xv-3.10a-wformat-security.patch | 19 + media-gfx/xv/xv-3.10a-r18.ebuild | 86 +++ media-libs/x265/x265-1.8-r3.ebuild | 2 +- media-sound/clementine/clementine-1.3_rc1.ebuild | 4 +- media-sound/yoshimi/Manifest | 1 + .../files/yoshimi-1.3.8.2-underlinking.patch | 39 ++ media-sound/yoshimi/yoshimi-1.3.8.2.ebuild | 59 ++ media-video/ffmpeg/ffmpeg-2.8.5.ebuild | 2 +- media-video/mplayer/Manifest | 1 + media-video/mplayer/mplayer-1.2.1.ebuild | 634 +++++++++++++++++++++ net-analyzer/icinga2/icinga2-2.4.1-r4.ebuild | 2 +- net-im/ysm/ysm-2.9.9.1-r1.ebuild | 26 + net-libs/loudmouth/Manifest | 1 + net-libs/loudmouth/loudmouth-1.5.1.ebuild | 56 ++ net-libs/loudmouth/metadata.xml | 21 +- net-nntp/leafnode/leafnode-1.11.10.ebuild | 2 +- sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild | 5 +- .../netcdf-fortran/netcdf-fortran-4.4.3.ebuild | 5 +- sci-libs/netcdf/netcdf-4.4.0-r1.ebuild | 5 +- sci-physics/lammps/Manifest | 1 + ...mmps-20160115.ebuild => lammps-20160122.ebuild} | 0 sys-block/di/Manifest | 1 + sys-block/di/{di-4.40.ebuild => di-4.41.ebuild} | 0 sys-devel/llvm/files/llvm-3.9-llvm-config.patch | 75 +++ sys-devel/llvm/llvm-9999.ebuild | 6 +- sys-fs/cachefilesd/cachefilesd-0.10.5-r4.ebuild | 4 +- sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild | 1 + sys-process/numactl/numactl-2.0.11.ebuild | 2 +- 84 files changed, 2802 insertions(+), 266 deletions(-)
