[gentoo-commits] repo/gentoo:master commit in: /

["Ian Delaney" <idella4@gentoo.org>]

commit:     24ca08cc51f29a44ec02c1f8b348901e378e4254
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 03:27:28 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 03:28:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ca08cc

Merge remote-tracking branch 'remotes/jasom/master'

Pull request: https://github.com/gentoo/gentoo/pull/725

 app-admin/mate-system-tools/Manifest               |   1 -
 ...e-system-tools-1.6.0-Update-POTFILES-skip.patch |  32 ----
 .../mate-system-tools-1.8.0.ebuild                 |  66 -------
 app-admin/salt/Manifest                            |   3 -
 app-admin/salt/salt-2015.5.6.ebuild                | 119 ------------
 app-admin/salt/salt-2015.8.1.ebuild                | 121 ------------
 app-arch/engrampa/engrampa-1.8.0-r1.ebuild         |  82 --------
 app-crypt/gnupg/Manifest                           |   3 +-
 app-crypt/gnupg/gnupg-2.0.27-r1.ebuild             | 167 ----------------
 app-crypt/gnupg/gnupg-2.0.27.ebuild                | 163 ----------------
 app-crypt/gnupg/gnupg-2.0.29.ebuild                | 167 ----------------
 .../{gnupg-2.1.10.ebuild => gnupg-2.1.11.ebuild}   |   6 +-
 app-crypt/gnupg/gnupg-2.1.8.ebuild                 | 169 -----------------
 app-crypt/gnupg/gnupg-2.1.9.ebuild                 | 169 -----------------
 app-editors/uemacs-pk/Manifest                     |   1 -
 .../uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild    |  43 -----
 .../uemacs-pk/uemacs-pk-4.0.15_p20141208.ebuild    |   4 +-
 app-emulation/libcacard/libcacard-2.5.1.ebuild     |   2 +-
 app-emulation/qemu/qemu-2.5.0-r1.ebuild            |   2 +-
 .../eselect-maven/eselect-maven-0.2-r2.ebuild      |  30 ---
 .../eselect-pinentry/eselect-pinentry-0.7.ebuild   |  23 +++
 .../eselect-pinentry/files/pinentry.eselect-0.7    |  13 ++
 dev-java/geoip-java/Manifest                       |   1 +
 dev-java/geoip-java/geoip-java-1.3.0.ebuild        |  44 +++++
 dev-java/geoip-java/metadata.xml                   |  15 ++
 dev-java/maven-bin/Manifest                        |   3 +-
 dev-java/maven-bin/maven-bin-1.1-r1.ebuild         |  38 ----
 dev-java/maven-bin/maven-bin-1.1-r3.ebuild         |   2 +-
 dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild      |   2 +-
 dev-java/maven-bin/maven-bin-2.0.11.ebuild         |  49 -----
 dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild       |   2 +-
 dev-java/maven-bin/maven-bin-2.2.1.ebuild          |  49 -----
 dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild       |   2 +-
 dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild       |  80 --------
 dev-java/maven-bin/maven-bin-3.1.0.ebuild          |  72 -------
 dev-java/maven-bin/maven-bin-3.1.1.ebuild          |   4 +-
 dev-java/maven-bin/maven-bin-3.2.5.ebuild          |   2 +-
 dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild       |   4 +-
 dev-java/maven-bin/maven-bin-3.3.3.ebuild          |  88 ---------
 ...ven-bin-3.2.3.ebuild => maven-bin-3.3.9.ebuild} |  62 ++++--
 dev-libs/libindicate/libindicate-12.10.1-r1.ebuild |  74 --------
 dev-libs/libinput/Manifest                         |   1 +
 dev-libs/libinput/libinput-1.1.5.ebuild            |  53 ++++++
 dev-python/packaging/packaging-16.0.ebuild         |   3 +-
 .../pip/{pip-8.0.2.ebuild => pip-8.0.2-r1.ebuild}  |   2 +-
 ...{facter-3.1.4.ebuild => facter-3.1.4-r1.ebuild} |  11 +-
 dev-ruby/metasploit-payloads/Manifest              |   5 +-
 .../metasploit-payloads-1.0.15.ebuild              |   4 +-
 .../metasploit-payloads-1.0.19.ebuild              |   4 +-
 ...16.ebuild => metasploit-payloads-1.0.21.ebuild} |   4 +-
 ...17.ebuild => metasploit-payloads-1.0.22.ebuild} |   4 +-
 .../metasploit-payloads-1.0.9-r1.ebuild            |  45 -----
 dev-ruby/metasploit_data_models/Manifest           |   2 +-
 ...ebuild => metasploit_data_models-1.2.10.ebuild} |   8 +-
 .../metasploit_data_models-1.2.9.ebuild            |   4 +-
 dev-ruby/openssl-ccm/Manifest                      |   1 +
 dev-ruby/openssl-ccm/metadata.xml                  |  13 ++
 dev-ruby/openssl-ccm/openssl-ccm-1.2.1.ebuild      |  18 ++
 dev-util/cmake/Manifest                            |   3 +-
 dev-util/cmake/cmake-3.4.0-r1.ebuild               | 198 -------------------
 dev-util/cmake/cmake-3.4.1.ebuild                  | 198 -------------------
 .../{cmake-3.4.2.ebuild => cmake-3.4.3.ebuild}     |   0
 eclass/gnome2-utils.eclass                         |   5 +-
 eclass/kde5-functions.eclass                       |   2 +-
 eclass/kde5.eclass                                 |  24 +--
 games-strategy/triplea/Manifest                    |   1 -
 games-strategy/triplea/triplea-1.7.0.3.ebuild      | 100 ----------
 kde-apps/ark/Manifest                              |   1 +
 kde-apps/ark/ark-15.12.1.ebuild                    |  60 ++++++
 kde-apps/filelight/Manifest                        |   1 +
 kde-apps/filelight/filelight-15.12.1.ebuild        |  30 +++
 kde-apps/kcalc/Manifest                            |   1 +
 kde-apps/kcalc/kcalc-15.12.1.ebuild                |  37 ++++
 kde-apps/kcharselect/Manifest                      |   1 +
 .../kcharselect-15.12.1.ebuild}                    |  14 +-
 kde-apps/kdebugsettings/Manifest                   |   1 +
 .../kdebugsettings-15.12.1.ebuild}                 |  17 +-
 .../kdebugsettings}/metadata.xml                   |   0
 .../kdeutils-meta/kdeutils-meta-15.12.1.ebuild     |  30 +++
 kde-apps/kdf/Manifest                              |   1 +
 kde-apps/kdf/kdf-15.12.1.ebuild                    |  13 ++
 kde-apps/kfloppy/Manifest                          |   1 +
 kde-apps/kfloppy/kfloppy-15.12.1.ebuild            |  16 ++
 kde-apps/kgpg/Manifest                             |   1 +
 kde-apps/kgpg/kgpg-15.12.1.ebuild                  |  30 +++
 kde-apps/kremotecontrol/Manifest                   |   1 +
 .../kremotecontrol/kremotecontrol-15.12.1.ebuild   |  18 ++
 kde-apps/kteatime/Manifest                         |   1 +
 .../kteatime-15.11.80-kcrash-initialise.patch      |  28 +++
 kde-apps/kteatime/kteatime-15.12.1.ebuild          |  31 +++
 kde-apps/ktimer/Manifest                           |   1 +
 kde-apps/ktimer/ktimer-15.12.1.ebuild              |  29 +++
 kde-apps/kwalletmanager/Manifest                   |   1 +
 .../kwalletmanager/kwalletmanager-15.12.1.ebuild   |  42 ++++
 kde-apps/print-manager/Manifest                    |   1 +
 .../print-manager/print-manager-15.12.1.ebuild     |  54 ++++++
 kde-apps/sweeper/Manifest                          |   1 +
 kde-apps/sweeper/sweeper-15.12.1.ebuild            |  14 ++
 kde-misc/rsibreak/Manifest                         |   1 +
 kde-misc/rsibreak/rsibreak-0.12.1.ebuild           |  43 +++++
 mate-base/mate-desktop/Manifest                    |   1 -
 .../mate-desktop/mate-desktop-1.8.0-r1.ebuild      |  66 -------
 mate-base/mate-settings-daemon/Manifest            |   1 -
 .../mate-settings-daemon-1.8.0.ebuild              |  89 ---------
 media-libs/imlib2/imlib2-1.4.7.ebuild              |   2 +-
 .../virglrenderer/virglrenderer-0.2.0.ebuild       |   2 +-
 media-sound/seq24/seq24-0.9.3.ebuild               |   2 +-
 ...mi-1.3.8.2.ebuild => yoshimi-1.3.8.2-r1.ebuild} |  11 +-
 media-tv/xmltv/Manifest                            |   1 +
 media-tv/xmltv/metadata.xml                        |  20 ++
 media-tv/xmltv/xmltv-0.5.67.ebuild                 | 211 +++++++++++++++++++++
 net-analyzer/metasploit/Manifest                   |   2 +-
 ...15090201-r2.ebuild => metasploit-4.11.7.ebuild} |  20 +-
 net-analyzer/metasploit/metasploit-9999.ebuild     |  10 +-
 net-irc/irssi/irssi-0.8.17.ebuild                  |  16 +-
 net-libs/libtorrent/metadata.xml                   |  11 +-
 net-misc/libreswan/Manifest                        |   2 -
 net-misc/libreswan/libreswan-3.13.ebuild           |  99 ----------
 net-misc/libreswan/libreswan-3.14-r1.ebuild        | 102 ----------
 net-misc/rsync/Manifest                            |   1 -
 net-misc/rsync/rsync-3.1.1.ebuild                  |  75 --------
 net-p2p/rtorrent/metadata.xml                      |  25 ++-
 profiles/package.mask                              |  10 +-
 sci-libs/scikits_learn/Manifest                    |   5 -
 sci-libs/scikits_learn/scikits_learn-0.13.1.ebuild |  88 ---------
 sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild | 112 -----------
 sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild | 112 -----------
 sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild | 112 -----------
 sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild | 111 -----------
 sci-libs/scikits_learn/scikits_learn-0.17.ebuild   |   2 +-
 sci-libs/scipy/scipy-0.16.1.ebuild                 |   2 +-
 sys-fs/dislocker/Manifest                          |   1 +
 ...islocker-9999.ebuild => dislocker-0.5.2.ebuild} |   0
 sys-fs/mtd-utils/mtd-utils-99999999.ebuild         |   2 +-
 www-apps/radicale/Manifest                         |   1 +
 .../radicale/files/radicale-1.1.1-config.patch     |  34 ++++
 www-apps/radicale/files/radicale.init.d            |  27 +++
 www-apps/radicale/metadata.xml                     |  12 ++
 www-apps/radicale/radicale-1.1.1.ebuild            |  73 +++++++
 x11-misc/spacefm/Manifest                          |   1 +
 x11-misc/spacefm/metadata.xml                      |   4 +-
 x11-misc/spacefm/spacefm-1.0.5.ebuild              |  88 +++++++++
 142 files changed, 1332 insertions(+), 3447 deletions(-)