From b9f5c23adf0d6bcb78531cacf94240334dac3b01 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Feb 2016 23:02:29 +0300 Subject: [PATCH] Sync with portage [Wed Feb 3 23:02:28 MSK 2016]. --- app-admin/keepassx/Manifest | 1 + app-admin/keepassx/keepassx-2.0.2.ebuild | 36 ++ app-admin/qtpass/Manifest | 1 + app-admin/qtpass/qtpass-1.1.0.ebuild | 62 ++ app-admin/salt/Manifest | 1 + .../files/salt-2015.8.4-boto-vpc-test.patch | 13 + app-admin/salt/salt-2015.8.5.ebuild | 134 ++++ ...5-conf.patch => skyldav-0.5-conf-r1.patch} | 8 +- ...av-0.5-r1.ebuild => skyldav-0.5-r2.ebuild} | 10 +- app-arch/xz-utils/xz-utils-5.2.2.ebuild | 2 +- app-backup/bacula/Manifest | 2 +- app-backup/bacula/bacula-5.2.13-r3.ebuild | 16 +- app-backup/bacula/bacula-7.0.5-r1.ebuild | 16 +- app-backup/bacula/bacula-7.2.0.ebuild | 16 +- ...la-5.0.3-r4.ebuild => bacula-7.4.0.ebuild} | 113 ++-- app-benchmarks/bonnie++/metadata.xml | 2 +- app-benchmarks/filebench/metadata.xml | 2 +- app-crypt/acme/Manifest | 2 +- .../{acme-0.2.0.ebuild => acme-0.3.0.ebuild} | 0 app-crypt/easy-rsa/Manifest | 2 +- app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild | 37 -- app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild | 35 + .../files/easy-rsa-2.0.0-pkcs11.patch | 36 -- app-crypt/easy-rsa/files/no-licenses.patch | 14 - app-crypt/easy-rsa/metadata.xml | 4 +- app-crypt/letsencrypt/Manifest | 2 +- ...-0.2.0.ebuild => letsencrypt-0.3.0.ebuild} | 2 +- app-crypt/letsencrypt/letsencrypt-9999.ebuild | 2 +- app-editors/diakonos/metadata.xml | 2 +- app-editors/le/Manifest | 1 + app-editors/le/le-1.14.3.ebuild | 8 +- app-editors/le/le-1.16.1.ebuild | 22 + app-editors/le/metadata.xml | 9 + app-emacs/magit/Manifest | 2 + app-emacs/magit/magit-2.4.1.ebuild | 24 + app-emacs/magit/magit-2.5.0.ebuild | 24 + app-emacs/with-editor/Manifest | 1 + .../with-editor/files/50with-editor-gentoo.el | 1 + app-emacs/with-editor/metadata.xml | 18 + .../with-editor/with-editor-2.5.0-r1.ebuild | 23 + app-emulation/ganeti/Manifest | 1 + ...-2.15.2-remove-sandbox-failing-tests.patch | 58 ++ app-emulation/ganeti/ganeti-2.15.2.ebuild | 309 +++++++++ app-emulation/libvirt/Manifest | 1 + ...ibvirt-1.2.17-fix_paths_for_apparmor.patch | 15 - ...libvirt-1.3.1-fix_paths_for_apparmor.patch | 147 +++++ ...virt-1.3.0.ebuild => libvirt-1.3.1.ebuild} | 16 +- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- app-emulation/spice/Manifest | 1 + app-emulation/spice/spice-0.13.0.ebuild | 72 +++ app-emulation/spim/spim-8.0-r1.ebuild | 7 +- .../virtualbox-bin-4.3.32.103443.ebuild | 1 + app-i18n/ibus/Manifest | 4 + app-i18n/ibus/ibus-1.5.5.ebuild | 175 +++++ app-i18n/ibus/ibus-1.5.8-r1.ebuild | 175 +++++ app-i18n/ibus/ibus-1.5.9-r1.ebuild | 191 ++++++ .../jq/{jq-1.5.ebuild => jq-1.5-r1.ebuild} | 5 +- .../media-player-info-22.ebuild | 2 +- app-misc/pdfpc/pdfpc-4.0.1.ebuild | 4 +- app-mobilephone/gammu/Manifest | 1 + .../files/gammu-1.36.8-bashcompdir.patch | 12 + app-mobilephone/gammu/gammu-1.36.8.ebuild | 79 +++ app-mobilephone/gammu/metadata.xml | 9 +- app-mobilephone/wammu/Manifest | 1 + app-mobilephone/wammu/wammu-0.35-r1.ebuild | 66 ++ app-mobilephone/wammu/wammu-0.36-r1.ebuild | 4 +- app-mobilephone/wammu/wammu-0.40.ebuild | 64 ++ ...agicpoint-1.13a_p20121015-fontconfig.patch | 33 + .../magicpoint-1.13a_p20121015.ebuild | 13 +- app-portage/conf-update/Manifest | 1 - .../conf-update/conf-update-1.0.2.ebuild | 41 -- app-shells/bash/bash-4.3_p42-r2.ebuild | 248 ++++++++ app-shells/bash/files/bashrc | 72 ++- app-shells/zsh/zsh-5.2.ebuild | 2 +- ...seract-3.04.00-leptonica-1.73-compat.patch | 24 + ...sseract-3.04.00-use-system-piccolo2d.patch | 39 ++ ...-r3.ebuild => tesseract-3.04.00-r4.ebuild} | 68 +- app-text/txt2man/txt2man-1.5.6.ebuild | 2 +- dev-db/firebird/metadata.xml | 4 +- dev-db/postgresql/postgresql-9.3.10-r2.ebuild | 2 +- dev-db/postgresql/postgresql-9.4.5-r2.ebuild | 2 +- dev-java/icedtea-bin/Manifest | 4 + dev-java/icedtea-bin/files/icedtea-bin-8.env | 18 + .../icedtea-bin-3.0.0_pre08.ebuild | 166 +++++ dev-lang/crystal/Manifest | 15 +- dev-lang/crystal/crystal-0.11.1.ebuild | 70 ++ dev-lang/go/Manifest | 1 + dev-lang/go/go-1.6_rc1.ebuild | 209 ++++++ dev-lang/moarvm/Manifest | 1 + dev-lang/moarvm/moarvm-2016.01.ebuild | 31 + dev-lang/nqp/Manifest | 1 + dev-lang/nqp/nqp-2016.01.ebuild | 64 ++ dev-lang/rakudo/Manifest | 1 + dev-lang/rakudo/rakudo-2016.01.ebuild | 36 ++ dev-lang/vala/Manifest | 4 +- .../vala/files/vala-0.24.0-atk-metadata.patch | 248 -------- dev-lang/vala/vala-0.20.1.ebuild | 36 -- dev-lang/vala/vala-0.24.0-r1.ebuild | 44 -- ...{vala-0.30.0.ebuild => vala-0.30.1.ebuild} | 2 +- dev-libs/efl/efl-1.15.2.ebuild | 2 +- dev-libs/efl/efl-1.16.1.ebuild | 2 +- dev-libs/jansson/Manifest | 2 - dev-libs/jansson/jansson-2.4.ebuild | 38 -- dev-libs/jansson/jansson-2.6.ebuild | 38 -- dev-libs/libusb/Manifest | 1 + ...-1.0.19.ebuild => libusb-1.0.19-r1.ebuild} | 4 +- dev-libs/libusb/libusb-1.0.20.ebuild | 71 +++ dev-libs/libzip/Manifest | 1 + .../files/libzip-1.1-missing-extern.patch | 21 + dev-libs/libzip/libzip-1.1.ebuild | 30 + dev-libs/openssl/openssl-1.0.2f.ebuild | 2 +- dev-libs/ppl/ppl-1.1.ebuild | 2 +- ...ardet-0.0.5-fix-return-code-on-error.patch | 19 + dev-libs/uchardet/metadata.xml | 4 - ...-0.0.5.ebuild => uchardet-0.0.5-r1.ebuild} | 1 + dev-libs/vala-common/Manifest | 2 +- ....26.2.ebuild => vala-common-0.30.1.ebuild} | 4 +- dev-ml/camlp5/Manifest | 1 + dev-ml/camlp5/camlp5-6.15.ebuild | 67 ++ dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild | 2 +- .../Cache-Cache/Cache-Cache-1.80.0.ebuild | 26 + dev-perl/Cache-Cache/Manifest | 1 + .../Data-Structure-Util-0.150.0.ebuild | 2 +- .../Devel-Cycle/Devel-Cycle-1.120.0.ebuild | 2 +- .../ExtUtils-Config-0.7.0.ebuild | 2 +- .../ExtUtils-Helpers-0.22.0.ebuild | 2 +- .../ExtUtils-InstallPaths-0.10.0.ebuild | 2 +- .../File-Flock/File-Flock-2014.10.0.ebuild | 2 +- dev-perl/Filter/Filter-1.540.0.ebuild | 2 +- .../Finance-Quote-1.370.0.ebuild | 2 +- ...rmatText-WithLinks-AndTables-0.20.0.ebuild | 27 - .../Manifest | 1 - .../HTML-FormatText-WithLinks-0.140.0.ebuild | 26 - dev-perl/HTML-FormatText-WithLinks/Manifest | 1 - .../HTML-Mason-PSGIHandler-0.520.0.ebuild | 28 - dev-perl/HTML-Mason-PSGIHandler/Manifest | 1 - ...1.4.1.ebuild => HTML-Packer-2.20.0.ebuild} | 13 +- dev-perl/HTML-Packer/Manifest | 2 +- .../Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild | 2 +- dev-perl/IO-Event/IO-Event-0.813.0.ebuild | 2 +- .../Module-Build-Tiny-0.39.0.ebuild | 2 +- .../Mozilla-CA/Mozilla-CA-20150826.ebuild | 2 +- dev-perl/PPI/PPI-1.220.ebuild | 2 +- .../PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild | 2 +- .../PPIx-Utilities-1.1.0-r1.ebuild | 2 +- dev-perl/PadWalker/PadWalker-2.100.0.ebuild | 2 +- .../Perl-Critic-Dynamic-0.50.0-r1.ebuild | 2 +- .../Perl-Critic/Perl-Critic-1.118.0-r1.ebuild | 2 +- dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild | 2 +- dev-perl/Readonly/Readonly-1.30.0-r1.ebuild | 2 +- .../String-Format-1.170.0-r1.ebuild | 2 +- .../Test-Memory-Cycle-1.40.0-r1.ebuild | 2 +- .../Test-Object/Test-Object-0.70.0-r1.ebuild | 2 +- .../Test-SharedFork-0.330.0.ebuild | 2 +- .../Test-SubCalls-1.90.0-r1.ebuild | 2 +- dev-perl/perl-mozldap/Manifest | 1 + .../perl-mozldap/perl-mozldap-1.5.3.ebuild | 30 + .../perltidy/perltidy-20130922.0.0.ebuild | 2 +- dev-python/colorlog/Manifest | 1 + dev-python/colorlog/colorlog-2.6.0.ebuild | 9 +- dev-python/colorlog/colorlog-2.6.1.ebuild | 32 + dev-python/cryptography-vectors/Manifest | 6 + dev-python/cryptography/Manifest | 1 + dev-python/distlib/Manifest | 1 + dev-python/distlib/distlib-0.2.2.ebuild | 52 ++ .../files/distlib-0.2.2-unbundle.patch | 35 + dev-python/django-classy-tags/Manifest | 1 + .../django-classy-tags-0.7.1.ebuild | 24 + dev-python/django-cms/Manifest | 1 + dev-python/django-cms/django-cms-3.2.0.ebuild | 43 ++ .../django-sekizai-0.9.0.ebuild | 4 +- dev-python/django-treebeard/Manifest | 1 + .../django-treebeard-4.0.ebuild | 27 + dev-python/django/Manifest | 4 +- ...{django-1.9.ebuild => django-1.8.9.ebuild} | 10 +- ...jango-1.9.1.ebuild => django-1.9.2.ebuild} | 0 dev-python/djangocms-admin-style/Manifest | 1 + .../djangocms-admin-style-1.1.0.ebuild | 25 + dev-python/djangocms-text-ckeditor/Manifest | 1 + .../djangocms-text-ckeditor-2.8.1.ebuild | 25 + dev-python/flipflop/Manifest | 1 + dev-python/flipflop/flipflop-1.0.ebuild | 17 + dev-python/flipflop/metadata.xml | 7 + dev-python/freezegun/Manifest | 2 +- ...un-0.3.5.ebuild => freezegun-0.3.6.ebuild} | 7 +- dev-python/ipython/Manifest | 1 + dev-python/ipython/ipython-4.1.0.ebuild | 137 ++++ .../files/CVE-2015-7546_2.3.2.patch | 596 ++++++++++++++++++ ...ild => keystonemiddleware-2.3.1-r1.ebuild} | 3 +- ...ild => keystonemiddleware-2.3.2-r1.ebuild} | 3 +- dev-python/libvirt-python/Manifest | 1 + .../libvirt-python-1.3.1.ebuild | 44 ++ dev-python/mimeparse/Manifest | 1 + dev-python/mimeparse/mimeparse-1.5.ebuild | 49 ++ dev-python/networkx/Manifest | 1 + dev-python/networkx/networkx-1.10-r1.ebuild | 8 +- dev-python/networkx/networkx-1.10.ebuild | 11 +- dev-python/networkx/networkx-1.11.ebuild | 79 +++ dev-python/nose/Manifest | 2 - .../nose-0.11.0-disable_intersphinx.patch | 17 - .../nose/files/nose-1.2.1-skiptest.patch | 23 - .../nose/files/nose-1.3.1-doctest.patch | 45 -- .../nose/files/nose-1.3.1-pypy-test.patch | 42 -- .../nose/files/nose-1.3.1-python3.4.patch | 41 -- .../nose/files/nose-1.3.1-version.patch | 16 - .../nose-1.3.7-python-3.5-backport.patch | 54 ++ dev-python/nose/nose-1.3.4.ebuild | 77 --- dev-python/nose/nose-1.3.6.ebuild | 82 --- ...nose-1.3.7.ebuild => nose-1.3.7-r1.ebuild} | 14 +- dev-python/nose/nose-9999.ebuild | 58 +- dev-python/pip/pip-8.0.2-r1.ebuild | 1 + dev-python/pluggy/Manifest | 1 + dev-python/pluggy/metadata.xml | 15 + dev-python/pluggy/pluggy-0.3.1.ebuild | 29 + .../pyopenssl/pyopenssl-0.15.1-r1.ebuild | 2 +- dev-python/pyrsistent/Manifest | 1 + .../pyrsistent/pyrsistent-0.11.11.ebuild | 37 ++ dev-python/pysrt/metadata.xml | 24 +- dev-python/pysrt/pysrt-1.0.1.ebuild | 21 +- dev-python/pysrt/pysrt-9999.ebuild | 15 +- dev-python/pytest-cov/Manifest | 1 + dev-python/pytest-cov/pytest-cov-2.2.1.ebuild | 45 ++ dev-python/pytest-xdist/Manifest | 1 + .../pytest-xdist/pytest-xdist-1.14.ebuild | 32 + dev-python/python-gammu/Manifest | 1 + dev-python/python-gammu/metadata.xml | 20 + .../python-gammu/python-gammu-2.5.ebuild | 36 ++ .../python-sqlparse-0.1.13.ebuild | 2 +- dev-python/responses/Manifest | 3 +- dev-python/responses/responses-0.5.0.ebuild | 30 - ...es-0.4.0.ebuild => responses-0.5.1.ebuild} | 2 +- dev-python/rpy/Manifest | 1 + dev-python/rpy/rpy-2.7.8.ebuild | 53 ++ dev-python/setuptools/Manifest | 2 + .../setuptools/setuptools-19.6.2.ebuild | 57 ++ dev-python/setuptools/setuptools-19.7.ebuild | 57 ++ dev-python/tox/Manifest | 1 + dev-python/tox/tox-2.3.1.ebuild | 67 ++ dev-python/virtualenv/Manifest | 1 + .../virtualenv/virtualenv-14.0.5.ebuild | 51 ++ dev-python/virtualenvwrapper/Manifest | 1 + .../virtualenvwrapper-4.3.1.ebuild | 4 +- .../virtualenvwrapper-4.3.2.ebuild | 4 +- .../virtualenvwrapper-4.5.1.ebuild | 4 +- .../virtualenvwrapper-4.6.0.ebuild | 4 +- .../virtualenvwrapper-4.7.1.ebuild | 40 ++ dev-python/webob/Manifest | 1 + dev-python/webob/webob-1.6.0_alpha0.ebuild | 44 ++ dev-ruby/capybara/Manifest | 1 + dev-ruby/capybara/capybara-2.6.2.ebuild | 46 ++ dev-ruby/ffaker/Manifest | 2 - dev-ruby/ffaker/ffaker-1.32.1.ebuild | 21 - dev-ruby/ffaker/ffaker-2.0.0.ebuild | 21 - dev-ruby/minitest/Manifest | 4 +- dev-ruby/minitest/minitest-5.8.0.ebuild | 25 - dev-ruby/minitest/minitest-5.8.1.ebuild | 25 - ...est-5.8.2.ebuild => minitest-5.8.4.ebuild} | 4 +- dev-ruby/nio4r/Manifest | 1 + dev-ruby/nio4r/nio4r-1.2.1.ebuild | 39 ++ dev-ruby/rack-cache/Manifest | 1 + dev-ruby/rack-cache/rack-cache-1.6.0.ebuild | 41 ++ dev-ruby/ruby_parser/Manifest | 1 + dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild | 37 ++ dev-ruby/totoridipjp/metadata.xml | 2 +- dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild | 14 +- dev-tex/circuit_macros/Manifest | 1 + .../circuit_macros-8.3.1.ebuild | 50 ++ dev-tex/latexdiff/latexdiff-1.1.0.ebuild | 2 +- dev-util/jenkins-bin/Manifest | 3 +- .../jenkins-bin/jenkins-bin-1.642.1.ebuild | 47 ++ ...-1.644.ebuild => jenkins-bin-1.646.ebuild} | 0 dev-vcs/git-tools/Manifest | 1 + .../git-tools/git-tools-2015_p20160201.ebuild | 48 ++ dev-vcs/gitg/gitg-3.18.0.ebuild | 4 +- dev-vcs/mercurial/Manifest | 2 +- ...rial-3.6.2.ebuild => mercurial-3.7.ebuild} | 4 +- dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild | 2 +- eclass/bash-completion.eclass | 106 ---- eclass/emul-linux-x86.eclass | 102 --- eclass/qt5-build.eclass | 208 +++--- eclass/wxwidgets.eclass | 33 +- games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild | 1 - games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild | 1 - ...sspp-9999-r1.ebuild => ppsspp-9999.ebuild} | 1 - .../activity-log-manager-0.9.7-r1.ebuild | 1 - .../activity-log-manager-0.9.7.ebuild | 51 -- gnome-extra/libgda/Manifest | 1 - gnome-extra/libgda/libgda-5.2.2.ebuild | 154 ----- lxde-base/lxsession/Manifest | 1 - lxde-base/lxsession/lxsession-0.4.6.1.ebuild | 38 -- .../lxsession/lxsession-0.4.9.2-r1.ebuild | 54 -- .../lxsession/lxsession-0.4.9.2-r2.ebuild | 57 -- lxde-base/lxsession/lxsession-0.4.9.2.ebuild | 53 -- mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +- .../dovecot-antispam-2.0_pre20130429.ebuild | 11 +- mail-mta/exim/exim-4.86-r2.ebuild | 1 + mail-mta/exim/exim-4.87_rc3.ebuild | 1 + mail-mta/exim/files/exim-4.86-TMPDIR.patch | 71 +++ media-gfx/fbida/fbida-2.10.ebuild | 2 +- media-gfx/graphviz/graphviz-2.38.0-r1.ebuild | 2 +- media-gfx/shotwell/shotwell-0.22.0-r1.ebuild | 4 +- media-libs/ffmpegsource/metadata.xml | 4 - media-libs/gd/gd-2.1.1-r1.ebuild | 2 +- media-libs/libepoxy/libepoxy-1.3.1.ebuild | 2 +- media-libs/libepoxy/libepoxy-9999.ebuild | 2 +- .../vamp-plugin-sdk-2.6-r1.ebuild | 2 +- media-radio/cwdaemon/cwdaemon-0.10.2.ebuild | 2 +- media-radio/unixcw/unixcw-3.5.0.ebuild | 2 +- .../bpmdetect/bpmdetect-0.6.1-r1.ebuild | 21 +- media-sound/flacon/metadata.xml | 4 - .../musescore-2.0.2-fix-buildsystem.patch | 429 +++++++++++++ .../musescore/musescore-2.0.2-r1.ebuild | 65 ++ media-sound/podget/Manifest | 4 +- media-sound/podget/metadata.xml | 4 + media-sound/podget/podget-0.6.15.ebuild | 33 - media-sound/podget/podget-0.6.9.ebuild | 30 - media-sound/podget/podget-0.6.ebuild | 28 - media-sound/podget/podget-0.7.9.ebuild | 32 + media-tv/xawtv/xawtv-3.95-r2.ebuild | 157 ----- media-video/aegisub/metadata.xml | 4 - media-video/mpv/metadata.xml | 3 - media-video/mpv/mpv-0.14.0-r1.ebuild | 2 +- media-video/mpv/mpv-0.15.0-r1.ebuild | 2 +- media-video/mpv/mpv-9999.ebuild | 2 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/app-admin/keepassx-2.0.2 | 13 + metadata/md5-cache/app-admin/qtpass-1.1.0 | 13 + metadata/md5-cache/app-admin/salt-2015.8.5 | 14 + .../{skyldav-0.5-r1 => skyldav-0.5-r2} | 2 +- metadata/md5-cache/app-arch/p7zip-15.09 | 2 +- metadata/md5-cache/app-arch/p7zip-9.20.1-r5 | 2 +- metadata/md5-cache/app-arch/p7zip-9.38.1-r2 | 2 +- metadata/md5-cache/app-arch/p7zip-9.38.1-r3 | 2 +- metadata/md5-cache/app-arch/xz-utils-5.2.2 | 4 +- metadata/md5-cache/app-backup/bacula-5.0.3-r4 | 14 - .../md5-cache/app-backup/bacula-5.2.13-r3 | 6 +- metadata/md5-cache/app-backup/bacula-7.0.5-r1 | 6 +- metadata/md5-cache/app-backup/bacula-7.2.0 | 6 +- metadata/md5-cache/app-backup/bacula-7.4.0 | 14 + .../app-crypt/{acme-0.2.0 => acme-0.3.0} | 2 +- .../md5-cache/app-crypt/easy-rsa-2.2.0-r1 | 12 - metadata/md5-cache/app-crypt/easy-rsa-3.0.1 | 13 + .../{letsencrypt-0.2.0 => letsencrypt-0.3.0} | 8 +- metadata/md5-cache/app-crypt/letsencrypt-9999 | 6 +- metadata/md5-cache/app-crypt/truecrypt-7.1a | 2 +- metadata/md5-cache/app-crypt/truecrypt-7.2 | 2 +- metadata/md5-cache/app-editors/le-1.14.3 | 8 +- metadata/md5-cache/app-editors/le-1.16.1 | 11 + .../md5-cache/app-editors/wxhexeditor-0.22 | 2 +- .../md5-cache/app-editors/wxhexeditor-0.23 | 2 +- .../app-editors/xmlcopyeditor-1.2.0.12 | 2 +- .../app-editors/xmlcopyeditor-1.2.0.6 | 2 +- .../app-editors/xmlcopyeditor-1.2.0.9 | 2 +- metadata/md5-cache/app-emacs/magit-2.4.1 | 12 + metadata/md5-cache/app-emacs/magit-2.5.0 | 12 + .../md5-cache/app-emacs/with-editor-2.5.0-r1 | 12 + metadata/md5-cache/app-emulation/bochs-2.6 | 2 +- metadata/md5-cache/app-emulation/bochs-2.6.8 | 2 +- .../md5-cache/app-emulation/ganeti-2.15.2 | 14 + .../{libvirt-1.3.0 => libvirt-1.3.1} | 6 +- metadata/md5-cache/app-emulation/libvirt-9999 | 2 +- metadata/md5-cache/app-emulation/spice-0.13.0 | 13 + metadata/md5-cache/app-emulation/spim-8.0-r1 | 3 +- .../virtualbox-bin-4.3.32.103443 | 4 +- metadata/md5-cache/app-i18n/ibus-1.5.5 | 15 + metadata/md5-cache/app-i18n/ibus-1.5.8-r1 | 15 + metadata/md5-cache/app-i18n/ibus-1.5.9-r1 | 15 + metadata/md5-cache/app-i18n/poedit-1.5.5 | 2 +- metadata/md5-cache/app-i18n/poedit-1.8.3 | 2 +- metadata/md5-cache/app-i18n/poedit-1.8.5 | 2 +- metadata/md5-cache/app-misc/golly-2.4 | 2 +- metadata/md5-cache/app-misc/golly-2.4-r1 | 2 +- metadata/md5-cache/app-misc/golly-2.5 | 2 +- metadata/md5-cache/app-misc/golly-2.6 | 2 +- metadata/md5-cache/app-misc/golly-2.7 | 2 +- metadata/md5-cache/app-misc/golly-2.7-r1 | 2 +- .../md5-cache/app-misc/{jq-1.5 => jq-1.5-r1} | 5 +- .../md5-cache/app-misc/media-player-info-22 | 4 +- metadata/md5-cache/app-misc/pdfpc-4.0.1 | 4 +- metadata/md5-cache/app-misc/roadnav-0.19-r1 | 2 +- .../md5-cache/app-mobilephone/gammu-1.36.8 | 13 + .../md5-cache/app-mobilephone/wammu-0.35-r1 | 13 + .../md5-cache/app-mobilephone/wammu-0.36-r1 | 6 +- metadata/md5-cache/app-mobilephone/wammu-0.40 | 14 + .../app-office/magicpoint-1.13a_p20121015 | 8 +- .../md5-cache/app-portage/conf-update-1.0.2 | 13 - metadata/md5-cache/app-shells/bash-4.3_p42-r2 | 13 + metadata/md5-cache/app-shells/zsh-5.2 | 4 +- ...seract-3.04.00-r3 => tesseract-3.04.00-r4} | 12 +- metadata/md5-cache/app-text/txt2man-1.5.6 | 4 +- metadata/md5-cache/app-text/xchm-1.23 | 2 +- metadata/md5-cache/app-text/xchm-1.23-r1 | 2 +- metadata/md5-cache/dev-db/flamerobin-0.9.2 | 2 +- metadata/md5-cache/dev-db/pgadmin3-1.18.1 | 2 +- metadata/md5-cache/dev-db/pgadmin3-1.20.0 | 2 +- metadata/md5-cache/dev-db/pgadmin3-1.20.0-r1 | 2 +- metadata/md5-cache/dev-db/pgadmin3-1.20.0-r2 | 2 +- metadata/md5-cache/dev-db/pgadmin3-1.22.0 | 2 +- metadata/md5-cache/dev-db/pgagent-3.3.0 | 2 +- metadata/md5-cache/dev-db/pgagent-3.4.0 | 2 +- metadata/md5-cache/dev-db/pgagent-3.4.0-r1 | 2 +- .../md5-cache/dev-db/postgresql-9.3.10-r2 | 4 +- metadata/md5-cache/dev-db/postgresql-9.4.5-r2 | 4 +- .../md5-cache/dev-db/wxsqlite3-3.0.6.1-r1 | 2 +- metadata/md5-cache/dev-db/wxsqlite3-3.2.1-r1 | 2 +- .../md5-cache/dev-embedded/usbprog-0.2.0-r1 | 2 +- .../md5-cache/dev-games/crystalspace-2.0-r1 | 2 +- .../md5-cache/dev-games/openscenegraph-3.2.1 | 2 +- .../dev-games/openscenegraph-3.2.1-r1 | 2 +- .../dev-games/openscenegraph-3.2.1-r2 | 2 +- .../md5-cache/dev-games/openscenegraph-3.4.0 | 2 +- metadata/md5-cache/dev-haskell/wxc-0.90.0.4 | 2 +- metadata/md5-cache/dev-haskell/wxc-0.90.1.1 | 2 +- .../md5-cache/dev-haskell/wxcore-0.13.2.3 | 2 +- .../md5-cache/dev-haskell/wxcore-0.90.1.1 | 2 +- .../dev-java/icedtea-bin-3.0.0_pre08 | 16 + metadata/md5-cache/dev-lang/crystal-0.11.1 | 13 + metadata/md5-cache/dev-lang/erlang-15.2.3.1 | 2 +- metadata/md5-cache/dev-lang/erlang-17.5 | 2 +- metadata/md5-cache/dev-lang/erlang-18.0-r2 | 2 +- metadata/md5-cache/dev-lang/erlang-18.2.1 | 2 +- metadata/md5-cache/dev-lang/gdl-0.9.5-r1 | 2 +- metadata/md5-cache/dev-lang/gdl-0.9.5-r2 | 2 +- metadata/md5-cache/dev-lang/go-1.6_rc1 | 11 + metadata/md5-cache/dev-lang/moarvm-2016.01 | 13 + metadata/md5-cache/dev-lang/nqp-2016.01 | 15 + metadata/md5-cache/dev-lang/rakudo-2016.01 | 12 + metadata/md5-cache/dev-lang/vala-0.20.1 | 13 - metadata/md5-cache/dev-lang/vala-0.24.0-r1 | 13 - .../dev-lang/{vala-0.30.0 => vala-0.30.1} | 10 +- metadata/md5-cache/dev-libs/efl-1.15.2 | 2 +- metadata/md5-cache/dev-libs/efl-1.16.1 | 2 +- metadata/md5-cache/dev-libs/jansson-2.4 | 12 - metadata/md5-cache/dev-libs/jansson-2.6 | 12 - metadata/md5-cache/dev-libs/libroadnav-0.19 | 2 +- .../{libusb-1.0.19 => libusb-1.0.19-r1} | 6 +- metadata/md5-cache/dev-libs/libusb-1.0.20 | 13 + metadata/md5-cache/dev-libs/libzip-1.1 | 13 + metadata/md5-cache/dev-libs/openssl-1.0.2f | 4 +- metadata/md5-cache/dev-libs/ppl-1.1 | 4 +- .../{uchardet-0.0.5 => uchardet-0.0.5-r1} | 2 +- ...{vala-common-0.26.2 => vala-common-0.30.1} | 8 +- metadata/md5-cache/dev-ml/camlp5-6.15 | 13 + .../dev-perl/Alien-wxWidgets-0.670.0 | 2 +- .../md5-cache/dev-perl/B-Keywords-1.140.0 | 4 +- .../md5-cache/dev-perl/Cache-Cache-1.80.0 | 12 + .../dev-perl/Data-Structure-Util-0.150.0 | 4 +- .../md5-cache/dev-perl/Devel-Cycle-1.120.0 | 4 +- .../md5-cache/dev-perl/ExtUtils-Config-0.7.0 | 4 +- .../dev-perl/ExtUtils-Helpers-0.22.0 | 4 +- .../dev-perl/ExtUtils-InstallPaths-0.10.0 | 4 +- .../md5-cache/dev-perl/File-Flock-2014.10.0 | 4 +- metadata/md5-cache/dev-perl/Filter-1.540.0 | 4 +- .../md5-cache/dev-perl/Finance-Quote-1.370.0 | 4 +- .../HTML-FormatText-WithLinks-0.140.0 | 13 - ...HTML-FormatText-WithLinks-AndTables-0.20.0 | 13 - .../dev-perl/HTML-Mason-PSGIHandler-0.520.0 | 13 - metadata/md5-cache/dev-perl/HTML-Packer-1.4.1 | 13 - .../md5-cache/dev-perl/HTML-Packer-2.20.0 | 13 + .../md5-cache/dev-perl/Hook-LexWrap-0.250.0 | 4 +- metadata/md5-cache/dev-perl/IO-Event-0.813.0 | 4 +- .../dev-perl/Module-Build-Tiny-0.39.0 | 4 +- .../md5-cache/dev-perl/Mozilla-CA-20150826 | 4 +- metadata/md5-cache/dev-perl/PPI-1.220 | 4 +- .../md5-cache/dev-perl/PPIx-Regexp-0.33.0 | 4 +- .../dev-perl/PPIx-Utilities-1.1.0-r1 | 4 +- metadata/md5-cache/dev-perl/PadWalker-2.100.0 | 4 +- .../md5-cache/dev-perl/Perl-Critic-1.118.0-r1 | 4 +- .../dev-perl/Perl-Critic-Dynamic-0.50.0-r1 | 4 +- .../md5-cache/dev-perl/Pod-Spell-1.10.0-r1 | 4 +- .../md5-cache/dev-perl/Readonly-1.30.0-r1 | 4 +- .../dev-perl/String-Format-1.170.0-r1 | 4 +- .../dev-perl/Test-Memory-Cycle-1.40.0-r1 | 4 +- .../md5-cache/dev-perl/Test-Object-0.70.0-r1 | 4 +- .../dev-perl/Test-SharedFork-0.330.0 | 4 +- .../dev-perl/Test-SubCalls-1.90.0-r1 | 4 +- .../dev-perl/Wx-Perl-ProcessStream-0.320.0-r1 | 2 +- .../dev-perl/Wx-Perl-ProcessStream-0.320.0-r2 | 2 +- .../dev-perl/Wx-Scintilla-0.390.0-r1 | 2 +- .../dev-perl/Wx-Scintilla-0.390.0-r2 | 2 +- .../md5-cache/dev-perl/perl-mozldap-1.5.3 | 12 + .../md5-cache/dev-perl/perltidy-20130922.0.0 | 4 +- .../md5-cache/dev-perl/wxperl-0.990.200-r1 | 2 +- metadata/md5-cache/dev-perl/wxperl-0.991.700 | 2 +- metadata/md5-cache/dev-perl/wxperl-0.992.700 | 2 +- .../md5-cache/dev-perl/wxperl-0.992.700-r1 | 2 +- metadata/md5-cache/dev-python/colorlog-2.6.0 | 3 +- metadata/md5-cache/dev-python/colorlog-2.6.1 | 15 + metadata/md5-cache/dev-python/distlib-0.2.2 | 14 + metadata/md5-cache/dev-python/django-1.8.9 | 14 + metadata/md5-cache/dev-python/django-1.9 | 14 - .../dev-python/{django-1.9.1 => django-1.9.2} | 2 +- .../dev-python/django-classy-tags-0.7.1 | 14 + .../md5-cache/dev-python/django-cms-3.2.0 | 14 + .../md5-cache/dev-python/django-sekizai-0.9.0 | 2 +- .../md5-cache/dev-python/django-treebeard-4.0 | 14 + .../dev-python/djangocms-admin-style-1.1.0 | 14 + .../dev-python/djangocms-text-ckeditor-2.8.1 | 14 + metadata/md5-cache/dev-python/flipflop-1.0 | 14 + metadata/md5-cache/dev-python/freezegun-0.3.5 | 14 - metadata/md5-cache/dev-python/freezegun-0.3.6 | 14 + metadata/md5-cache/dev-python/ipython-4.1.0 | 15 + ...ware-2.3.1 => keystonemiddleware-2.3.1-r1} | 2 +- ...ware-2.3.2 => keystonemiddleware-2.3.2-r1} | 2 +- .../md5-cache/dev-python/libvirt-python-1.3.1 | 15 + metadata/md5-cache/dev-python/mimeparse-1.5 | 14 + metadata/md5-cache/dev-python/networkx-1.10 | 6 +- .../md5-cache/dev-python/networkx-1.10-r1 | 6 +- metadata/md5-cache/dev-python/networkx-1.11 | 14 + metadata/md5-cache/dev-python/nose-1.3.4 | 14 - metadata/md5-cache/dev-python/nose-1.3.6 | 14 - .../dev-python/{nose-1.3.7 => nose-1.3.7-r1} | 4 +- metadata/md5-cache/dev-python/nose-9999 | 16 +- metadata/md5-cache/dev-python/pip-8.0.2-r1 | 2 +- metadata/md5-cache/dev-python/pluggy-0.3.1 | 14 + .../md5-cache/dev-python/pyopenssl-0.15.1-r1 | 4 +- .../md5-cache/dev-python/pyrsistent-0.11.11 | 15 + metadata/md5-cache/dev-python/pysrt-1.0.1 | 13 +- metadata/md5-cache/dev-python/pysrt-9999 | 10 +- .../md5-cache/dev-python/pytest-cov-2.2.1 | 15 + .../md5-cache/dev-python/pytest-xdist-1.14 | 14 + .../md5-cache/dev-python/python-gammu-2.5 | 14 + .../dev-python/python-sqlparse-0.1.13 | 4 +- metadata/md5-cache/dev-python/responses-0.5.0 | 14 - .../{responses-0.4.0 => responses-0.5.1} | 4 +- metadata/md5-cache/dev-python/rpy-2.7.8 | 15 + .../md5-cache/dev-python/setuptools-19.6.2 | 15 + metadata/md5-cache/dev-python/setuptools-19.7 | 15 + metadata/md5-cache/dev-python/tox-2.3.1 | 14 + .../md5-cache/dev-python/virtualenv-14.0.5 | 14 + .../dev-python/virtualenvwrapper-4.3.1 | 4 +- .../dev-python/virtualenvwrapper-4.3.2 | 4 +- .../dev-python/virtualenvwrapper-4.5.1 | 4 +- .../dev-python/virtualenvwrapper-4.6.0 | 4 +- .../dev-python/virtualenvwrapper-4.7.1 | 15 + .../md5-cache/dev-python/webob-1.6.0_alpha0 | 14 + .../md5-cache/dev-python/wxpython-2.8.12.1-r2 | 2 +- .../md5-cache/dev-python/wxpython-2.9.4.1-r2 | 2 +- .../md5-cache/dev-python/wxpython-3.0.0.0 | 2 +- .../md5-cache/dev-python/wxpython-3.0.1.1 | 2 +- .../md5-cache/dev-python/wxpython-3.0.2.0 | 2 +- metadata/md5-cache/dev-qt/assistant-5.4.2 | 6 +- metadata/md5-cache/dev-qt/assistant-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/designer-5.4.2 | 6 +- metadata/md5-cache/dev-qt/designer-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/linguist-5.4.2 | 6 +- metadata/md5-cache/dev-qt/linguist-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/linguist-tools-5.4.2 | 6 +- .../md5-cache/dev-qt/linguist-tools-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/pixeltool-5.4.2 | 6 +- metadata/md5-cache/dev-qt/pixeltool-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qdbus-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qdbus-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qdbusviewer-5.4.2 | 6 +- .../md5-cache/dev-qt/qdbusviewer-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qdoc-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qdoc-5.5.1 | 6 +- .../md5-cache/dev-qt/qtbluetooth-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtconcurrent-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtconcurrent-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtcore-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtcore-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtdbus-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtdbus-5.5.1 | 6 +- .../md5-cache/dev-qt/qtdeclarative-5.4.2-r1 | 6 +- .../md5-cache/dev-qt/qtdeclarative-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtdiag-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtdiag-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/qtgraphicaleffects-5.4.2 | 6 +- .../dev-qt/qtgraphicaleffects-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtgui-5.4.2-r1 | 6 +- metadata/md5-cache/dev-qt/qtgui-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qthelp-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qthelp-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/qtimageformats-5.4.2 | 6 +- .../md5-cache/dev-qt/qtimageformats-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/qtmultimedia-5.4.2-r1 | 6 +- .../md5-cache/dev-qt/qtmultimedia-5.5.1-r2 | 6 +- metadata/md5-cache/dev-qt/qtnetwork-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtnetwork-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtopengl-5.4.2 | 2 +- metadata/md5-cache/dev-qt/qtopengl-5.5.1 | 2 +- metadata/md5-cache/dev-qt/qtpaths-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtpaths-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtpositioning-5.4.2 | 6 +- .../md5-cache/dev-qt/qtpositioning-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/qtprintsupport-5.4.2 | 2 +- .../md5-cache/dev-qt/qtprintsupport-5.5.1 | 2 +- metadata/md5-cache/dev-qt/qtquick1-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtquick1-5.5.1-r1 | 6 +- .../md5-cache/dev-qt/qtquickcontrols-5.4.2 | 6 +- .../md5-cache/dev-qt/qtquickcontrols-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtscript-5.4.2-r1 | 6 +- metadata/md5-cache/dev-qt/qtscript-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtsensors-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtsensors-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtserialport-5.4.2 | 6 +- .../md5-cache/dev-qt/qtserialport-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtsql-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtsql-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtsvg-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtsvg-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qttest-5.4.2 | 2 +- metadata/md5-cache/dev-qt/qttest-5.5.1 | 2 +- .../md5-cache/dev-qt/qttranslations-5.4.2 | 6 +- .../md5-cache/dev-qt/qttranslations-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtwayland-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtwayland-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtwebchannel-5.4.2 | 6 +- .../md5-cache/dev-qt/qtwebchannel-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtwebkit-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtwebkit-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtwebsockets-5.4.2 | 6 +- .../md5-cache/dev-qt/qtwebsockets-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtwidgets-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtwidgets-5.5.1-r1 | 6 +- metadata/md5-cache/dev-qt/qtx11extras-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtx11extras-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtxml-5.4.2 | 6 +- metadata/md5-cache/dev-qt/qtxml-5.5.1 | 6 +- metadata/md5-cache/dev-qt/qtxmlpatterns-5.4.2 | 6 +- .../md5-cache/dev-qt/qtxmlpatterns-5.5.1-r1 | 6 +- metadata/md5-cache/dev-ruby/capybara-2.6.2 | 14 + metadata/md5-cache/dev-ruby/ffaker-1.32.1 | 14 - metadata/md5-cache/dev-ruby/ffaker-2.0.0 | 14 - metadata/md5-cache/dev-ruby/minitest-5.8.0 | 14 - metadata/md5-cache/dev-ruby/minitest-5.8.1 | 14 - metadata/md5-cache/dev-ruby/minitest-5.8.2 | 14 - metadata/md5-cache/dev-ruby/minitest-5.8.4 | 14 + metadata/md5-cache/dev-ruby/nio4r-1.2.1 | 14 + metadata/md5-cache/dev-ruby/rack-cache-1.6.0 | 14 + metadata/md5-cache/dev-ruby/ruby_parser-3.7.3 | 14 + metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 | 10 +- .../md5-cache/dev-tex/circuit_macros-8.3.1 | 12 + metadata/md5-cache/dev-tex/latexdiff-1.1.0 | 4 +- metadata/md5-cache/dev-util/codeblocks-13.12 | 2 +- .../md5-cache/dev-util/codeblocks-13.12-r1 | 2 +- metadata/md5-cache/dev-util/codeblocks-9999 | 2 +- .../md5-cache/dev-util/jenkins-bin-1.642.1 | 13 + .../{jenkins-bin-1.644 => jenkins-bin-1.646} | 2 +- .../dev-vcs/git-tools-2015_p20160201 | 12 + metadata/md5-cache/dev-vcs/gitg-3.18.0 | 10 +- .../{mercurial-3.6.2 => mercurial-3.7} | 6 +- metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r1 | 2 +- metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r2 | 2 +- metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3 | 6 +- .../md5-cache/games-board/blokish-0.9.4-r2 | 2 +- .../md5-cache/games-board/openyahtzee-1.9.2 | 2 +- .../md5-cache/games-emulation/dolphin-4.0-r2 | 2 +- .../games-emulation/dolphin-4.0.2-r7 | 2 +- .../md5-cache/games-emulation/dolphin-5.0 | 2 +- .../md5-cache/games-emulation/dolphin-9999 | 2 +- .../md5-cache/games-emulation/pcsx2-1.4.0 | 2 +- metadata/md5-cache/games-emulation/pcsx2-9999 | 2 +- .../md5-cache/games-emulation/ppsspp-1.1.0-r1 | 2 +- .../md5-cache/games-emulation/ppsspp-1.1.1-r1 | 2 +- .../{ppsspp-9999-r1 => ppsspp-9999} | 2 +- .../games-emulation/vbam-2.0.0_pre1507 | 2 +- metadata/md5-cache/games-emulation/vbam-9999 | 2 +- metadata/md5-cache/games-engines/odamex-0.7.0 | 2 +- .../games-engines/scummvm-tools-1.7.0 | 2 +- .../games-engines/scummvm-tools-1.7.0-r1 | 2 +- .../sound-of-sorting-0.6.6_pre20151107 | 2 +- metadata/md5-cache/games-mud/wxmud-9999 | 2 +- .../md5-cache/games-roguelike/scourge-0.21.1 | 2 +- .../md5-cache/games-simulation/corsix-th-0.30 | 2 +- .../games-strategy/0ad-0.0.18_alpha-r4 | 2 +- .../md5-cache/games-strategy/asc-2.6.0.0-r1 | 2 +- .../games-strategy/megaglest-3.11.1-r1 | 2 +- .../md5-cache/games-strategy/scorched3d-44-r1 | 2 +- metadata/md5-cache/games-util/dfarc-3.12 | 2 +- .../md5-cache/games-util/wxchtdecoder-1.5a-r1 | 2 +- .../gnome-extra/activity-log-manager-0.9.7 | 13 - .../gnome-extra/activity-log-manager-0.9.7-r1 | 2 +- metadata/md5-cache/gnome-extra/libgda-5.2.2 | 15 - .../md5-cache/lxde-base/lxsession-0.4.6.1 | 13 - .../md5-cache/lxde-base/lxsession-0.4.9.2 | 13 - .../md5-cache/lxde-base/lxsession-0.4.9.2-r1 | 13 - .../md5-cache/lxde-base/lxsession-0.4.9.2-r2 | 13 - metadata/md5-cache/mail-client/mutt-1.5.24-r2 | 4 +- .../dovecot-antispam-2.0_pre20130429 | 4 +- metadata/md5-cache/mail-mta/exim-4.86-r2 | 2 +- metadata/md5-cache/mail-mta/exim-4.87_rc3 | 2 +- metadata/md5-cache/media-gfx/comical-0.8-r3 | 2 +- metadata/md5-cache/media-gfx/fbida-2.10 | 4 +- .../md5-cache/media-gfx/fontypython-0.4.4-r3 | 2 +- metadata/md5-cache/media-gfx/fr0st-1.4-r1 | 2 +- .../md5-cache/media-gfx/graphviz-2.38.0-r1 | 4 +- .../md5-cache/media-gfx/hugin-2015.0.0-r1 | 2 +- metadata/md5-cache/media-gfx/hugin-9999 | 2 +- .../md5-cache/media-gfx/shotwell-0.22.0-r1 | 4 +- metadata/md5-cache/media-gfx/tintii-2.8.0 | 2 +- metadata/md5-cache/media-gfx/tintii-2.8.2 | 2 +- metadata/md5-cache/media-gfx/tintii-2.9.0 | 2 +- metadata/md5-cache/media-libs/gd-2.1.1-r1 | 4 +- metadata/md5-cache/media-libs/libepoxy-1.3.1 | 4 +- metadata/md5-cache/media-libs/libepoxy-9999 | 4 +- .../media-libs/vamp-plugin-sdk-2.6-r1 | 4 +- metadata/md5-cache/media-libs/wxsvg-1.1.13 | 2 +- metadata/md5-cache/media-libs/wxsvg-1.4.2 | 2 +- metadata/md5-cache/media-libs/wxsvg-1.5.4 | 2 +- metadata/md5-cache/media-libs/wxsvg-1.5.4-r1 | 2 +- metadata/md5-cache/media-libs/wxsvg-1.5.5 | 2 +- .../md5-cache/media-radio/cwdaemon-0.10.2 | 4 +- metadata/md5-cache/media-radio/unixcw-3.5.0 | 4 +- metadata/md5-cache/media-sound/audacity-2.0.2 | 2 +- metadata/md5-cache/media-sound/audacity-2.0.5 | 2 +- .../md5-cache/media-sound/audacity-2.0.5-r1 | 2 +- metadata/md5-cache/media-sound/audacity-2.1.1 | 2 +- .../md5-cache/media-sound/bpmdetect-0.6.1-r1 | 8 +- .../md5-cache/media-sound/guayadeque-0.3.5 | 2 +- .../media-sound/guayadeque-0.3.6_pre1887 | 2 +- .../md5-cache/media-sound/guayadeque-0.3.7 | 2 +- .../md5-cache/media-sound/guayadeque-0.3.7-r1 | 2 +- .../media-sound/miniaudicle-0.1.3.8-r2 | 2 +- .../md5-cache/media-sound/musescore-2.0.2-r1 | 13 + metadata/md5-cache/media-sound/podget-0.6 | 9 - metadata/md5-cache/media-sound/podget-0.6.15 | 10 - metadata/md5-cache/media-sound/podget-0.6.9 | 9 - metadata/md5-cache/media-sound/podget-0.7.9 | 10 + .../md5-cache/media-sound/sooperlooper-1.6.17 | 2 +- .../md5-cache/media-sound/sooperlooper-1.6.18 | 2 +- .../md5-cache/media-sound/sooperlooper-1.7.3 | 2 +- .../media-sound/sooperlooper-1.7.3-r1 | 2 +- metadata/md5-cache/media-sound/spek-0.8.3 | 2 +- metadata/md5-cache/media-sound/spek-0.8.3-r1 | 2 +- metadata/md5-cache/media-tv/xawtv-3.95-r2 | 13 - metadata/md5-cache/media-video/aegisub-3.0.4 | 2 +- metadata/md5-cache/media-video/aegisub-3.2.2 | 2 +- metadata/md5-cache/media-video/aegisub-9999 | 2 +- .../md5-cache/media-video/dvdstyler-2.7.2 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.2 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.3 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.4 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.4-r1 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.5 | 2 +- .../md5-cache/media-video/dvdstyler-2.9.6 | 2 +- .../md5-cache/media-video/mediainfo-0.7.73 | 2 +- .../md5-cache/media-video/mediainfo-0.7.80 | 2 +- .../md5-cache/media-video/mediainfo-0.7.81 | 2 +- .../md5-cache/media-video/mediainfo-0.7.82 | 2 +- metadata/md5-cache/media-video/mpv-0.14.0-r1 | 2 +- metadata/md5-cache/media-video/mpv-0.15.0-r1 | 4 +- metadata/md5-cache/media-video/mpv-9999 | 4 +- .../md5-cache/net-analyzer/cacti-0.8.8f-r1 | 13 + metadata/md5-cache/net-analyzer/fe3d-0.11.2 | 2 +- .../greenbone-security-assistant-6.0.9 | 12 + .../net-analyzer/pnp4nagios-0.6.25-r2 | 13 + .../net-dialup/capi4k-utils-20050718-r6 | 4 +- metadata/md5-cache/net-dns/pdns-3.4.8 | 14 + .../md5-cache/net-firewall/firewalld-0.4.0 | 13 + .../md5-cache/net-firewall/shorewall-4.6.10.1 | 4 +- .../md5-cache/net-firewall/shorewall-4.6.13 | 4 +- .../md5-cache/net-firewall/shorewall-4.6.13.1 | 4 +- .../md5-cache/net-firewall/shorewall-5.0.4 | 14 + metadata/md5-cache/net-fs/samba-4.2.7 | 14 - metadata/md5-cache/net-fs/samba-4.2.8 | 14 + metadata/md5-cache/net-ftp/filezilla-3.12.0.2 | 2 +- metadata/md5-cache/net-ftp/filezilla-3.14.0 | 2 +- metadata/md5-cache/net-ftp/filezilla-3.14.1 | 2 +- metadata/md5-cache/net-ftp/filezilla-3.15.0 | 13 + metadata/md5-cache/net-ftp/filezilla-3.15.0.1 | 13 + metadata/md5-cache/net-ftp/lftp-4.6.5 | 4 +- metadata/md5-cache/net-ftp/yafc-1.3.7 | 13 + metadata/md5-cache/net-im/skype-4.3.0.37-r5 | 15 + .../net-irc/kvirc-5.0_pre20160201053254 | 14 + .../md5-cache/net-libs/courier-authlib-0.66.4 | 4 +- metadata/md5-cache/net-libs/gsoap-2.7.17-r1 | 13 - .../net-libs/{gsoap-2.8.26 => gsoap-2.8.28} | 6 +- metadata/md5-cache/net-libs/libbtbb-9999 | 4 +- metadata/md5-cache/net-libs/nghttp2-1.0.5 | 13 - metadata/md5-cache/net-libs/nghttp2-1.6.0 | 4 +- .../net-libs/{nghttp2-1.5.0 => nghttp2-1.7.0} | 2 +- metadata/md5-cache/net-libs/opal-3.10.11 | 4 +- metadata/md5-cache/net-misc/mikutter-3.3.5 | 14 + metadata/md5-cache/net-misc/mikutter-9999 | 8 +- .../net-misc/openntpd-4.0_pre20080406 | 13 - .../md5-cache/net-misc/openntpd-5.7_p4-r2 | 4 +- metadata/md5-cache/net-misc/socat-1.7.3.1 | 14 + .../{socat-2.0.0_beta8 => socat-2.0.0_beta9} | 8 +- metadata/md5-cache/net-misc/socat-9999 | 6 +- .../md5-cache/net-misc/x2goserver-4.0.1.19-r1 | 14 + .../md5-cache/net-nds/389-ds-base-1.3.4.7 | 13 + metadata/md5-cache/net-nds/nsscache-0.32 | 15 + metadata/md5-cache/net-nds/phpldapadmin-1.2.3 | 4 +- .../md5-cache/net-nds/phpldapadmin-1.2.3-r1 | 4 +- metadata/md5-cache/net-p2p/amule-2.3.1 | 2 +- metadata/md5-cache/net-p2p/amule-2.3.1-r1 | 2 +- metadata/md5-cache/net-p2p/imule-2.3.2.3 | 2 +- metadata/md5-cache/net-p2p/imule-2.3.2.3-r1 | 2 +- metadata/md5-cache/net-p2p/mldonkey-3.1.5 | 6 +- metadata/md5-cache/net-voip/ekiga-4.0.1 | 4 +- .../md5-cache/sci-biology/treeviewx-0.5.1-r2 | 2 +- .../md5-cache/sci-biology/treeviewx-0.5.1-r3 | 2 +- metadata/md5-cache/sci-chemistry/gamessq-1.2 | 2 +- .../sci-chemistry/openbabel-2.3.2-r1 | 2 +- metadata/md5-cache/sci-chemistry/relax-3.3.8 | 2 +- metadata/md5-cache/sci-chemistry/relax-3.3.9 | 2 +- metadata/md5-cache/sci-chemistry/relax-4.0.0 | 2 +- .../md5-cache/sci-chemistry/relax-4.0.0-r1 | 2 +- .../md5-cache/sci-chemistry/wxmacmolplt-7.4.2 | 2 +- .../md5-cache/sci-chemistry/wxmacmolplt-7.5 | 2 +- .../sci-chemistry/wxmacmolplt-7.5-r1 | 2 +- .../md5-cache/sci-electronics/gspiceui-1.1.0 | 2 +- .../md5-cache/sci-electronics/kicad-4.0.0 | 2 +- .../md5-cache/sci-electronics/kicad-4.0.0_rc1 | 2 +- .../md5-cache/sci-electronics/kicad-4.0.0_rc2 | 2 +- .../md5-cache/sci-electronics/kicad-4.0.1 | 2 +- .../md5-cache/sci-geosciences/grass-7.0.1-r5 | 2 +- .../md5-cache/sci-geosciences/grass-7.0.2 | 2 +- .../md5-cache/sci-geosciences/opencpn-3.0.2 | 2 +- .../md5-cache/sci-geosciences/opencpn-3.2.2 | 2 +- .../md5-cache/sci-geosciences/opencpn-4.0.0 | 2 +- .../sci-geosciences/opencpn-4.0.0-r1 | 2 +- .../opencpn-plugin-br24radar-1.1 | 2 +- .../opencpn-plugin-br24radar-1.1-r1 | 2 +- .../opencpn-plugin-climatology-1.0 | 2 +- .../opencpn-plugin-climatology-1.0-r1 | 2 +- .../opencpn-plugin-launcher-1.0 | 2 +- .../opencpn-plugin-launcher-1.0-r1 | 2 +- .../opencpn-plugin-logbookkonni-1.2012 | 2 +- .../opencpn-plugin-logbookkonni-1.2018 | 2 +- .../opencpn-plugin-logbookkonni-1.2018-r1 | 2 +- .../opencpn-plugin-objsearch-0.5.1 | 2 +- .../opencpn-plugin-objsearch-0.5.1-r1 | 2 +- .../opencpn-plugin-ocpndebugger-1.0 | 2 +- .../opencpn-plugin-ocpndebugger-1.0-r1 | 2 +- .../opencpn-plugin-statusbar-0.5 | 2 +- .../opencpn-plugin-statusbar-0.5-r1 | 2 +- .../opencpn-plugin-weather_routing-1.2 | 2 +- .../opencpn-plugin-weatherfax-1.3 | 2 +- .../opencpn-plugin-weatherfax-1.3-r1 | 2 +- .../sci-geosciences/opencpn-plugin-wmm-1.0 | 2 +- .../sci-geosciences/opencpn-plugin-wmm-1.0-r1 | 2 +- metadata/md5-cache/sci-libs/mathgl-2.1.3 | 2 +- metadata/md5-cache/sci-libs/mathgl-2.1.3.1 | 2 +- metadata/md5-cache/sci-libs/mathgl-2.3.3 | 2 +- metadata/md5-cache/sci-libs/plplot-5.10.0-r1 | 2 +- metadata/md5-cache/sci-libs/plplot-5.11.0-r1 | 2 +- metadata/md5-cache/sci-libs/plplot-5.11.1 | 2 +- metadata/md5-cache/sci-libs/plplot-5.11.1-r1 | 2 +- .../sci-mathematics/wxmaxima-13.04.2 | 2 +- .../sci-mathematics/wxmaxima-15.04.0-r1 | 2 +- .../sci-mathematics/wxmaxima-15.08.2 | 2 +- metadata/md5-cache/sci-misc/boinc-7.2.0 | 2 +- metadata/md5-cache/sci-misc/boinc-7.2.0-r1 | 2 +- metadata/md5-cache/sci-misc/boinc-7.4.42-r1 | 2 +- .../md5-cache/sci-misc/mendeleydesktop-1.15.2 | 14 - .../md5-cache/sci-misc/mendeleydesktop-1.15.3 | 14 + .../md5-cache/sci-visualization/extrema-4.4.5 | 2 +- .../md5-cache/sci-visualization/fityk-1.2.1 | 2 +- .../md5-cache/sci-visualization/fityk-1.2.9 | 2 +- .../md5-cache/sci-visualization/gnuplot-4.6.5 | 2 +- .../sci-visualization/gnuplot-5.0.1-r1 | 2 +- metadata/md5-cache/sys-apps/man-db-2.7.5 | 4 +- metadata/md5-cache/sys-apps/openrc-0.19.1 | 4 +- metadata/md5-cache/sys-apps/sandbox-2.10-r1 | 4 +- metadata/md5-cache/sys-apps/sysvinit-2.88-r4 | 13 - metadata/md5-cache/sys-apps/sysvinit-2.88-r6 | 13 - .../{sysvinit-2.88-r5 => sysvinit-2.88-r9} | 8 +- .../{keystone-8.0.1 => keystone-8.0.1-r1} | 2 +- metadata/md5-cache/sys-block/fio-2.2.10 | 2 +- metadata/md5-cache/sys-block/fio-2.2.13 | 2 +- metadata/md5-cache/sys-block/fio-2.5 | 2 +- metadata/md5-cache/sys-block/fio-2.6 | 13 + .../{os-prober-1.68 => os-prober-1.71} | 4 +- metadata/md5-cache/sys-fs/s3ql-2.14-r1 | 15 + .../md5-cache/sys-kernel/aufs-sources-4.1.17 | 15 + .../md5-cache/sys-kernel/aufs-sources-4.3.5 | 15 + .../md5-cache/sys-kernel/aufs-sources-4.4.1 | 15 + .../sys-kernel/gentoo-sources-3.14.60 | 14 + .../sys-kernel/gentoo-sources-3.18.26 | 14 + .../sys-kernel/hardened-sources-4.3.5 | 14 + .../md5-cache/sys-libs/timezone-data-2015g | 4 +- ...imezone-data-2015e => timezone-data-2016a} | 6 +- .../md5-cache/sys-process/cronbase-0.3.7-r1 | 4 +- metadata/md5-cache/virtual/jdk-1.8.0-r1 | 6 +- metadata/md5-cache/virtual/jre-1.8.0-r1 | 4 +- .../{wordpress-4.4.1 => wordpress-4.4.2} | 4 +- ... => google-chrome-unstable-50.0.2638.0_p1} | 2 +- ... chrome-binary-plugins-50.0.2638.0_alpha1} | 2 +- metadata/md5-cache/www-servers/nginx-1.8.1 | 15 + metadata/md5-cache/www-servers/nginx-1.9.6 | 15 - metadata/md5-cache/x11-libs/libxcb-1.11-r1 | 4 +- metadata/md5-cache/x11-libs/pixman-0.34.0 | 13 + metadata/md5-cache/x11-misc/compton-0.1_beta2 | 10 +- metadata/md5-cache/x11-misc/compton-9999 | 10 +- .../md5-cache/x11-misc/light-locker-1.7.0 | 13 + metadata/md5-cache/x11-misc/xdg-utils-1.1.1 | 4 +- .../md5-cache/x11-themes/qtcurve-1.8.18-r1 | 4 +- .../xfce-base/xfce4-session-4.12.1-r1 | 14 + ...xfce4-vala-4.10.3 => xfce4-vala-4.10.3-r2} | 6 +- metadata/news/timestamp.chk | 2 +- metadata/projects.xml | 12 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/cacti/cacti-0.8.8f-r1.ebuild | 62 ++ .../files/cacti-0.8.8f-CVE-2015-8369.patch | 204 ++++++ .../greenbone-security-assistant/Manifest | 1 + .../greenbone-security-assistant-6.0.9.ebuild | 64 ++ .../pnp4nagios/pnp4nagios-0.6.25-r2.ebuild | 109 ++++ .../capi4k-utils-20050718-r6.ebuild | 2 +- net-dns/pdns/Manifest | 1 + net-dns/pdns/metadata.xml | 1 - net-dns/pdns/pdns-3.4.8.ebuild | 177 ++++++ net-firewall/firewalld/Manifest | 1 + net-firewall/firewalld/firewalld-0.4.0.ebuild | 97 +++ net-firewall/shorewall/Manifest | 7 + .../shorewall/shorewall-4.6.10.1.ebuild | 5 +- .../shorewall/shorewall-4.6.13.1.ebuild | 5 +- .../shorewall/shorewall-4.6.13.ebuild | 5 +- net-firewall/shorewall/shorewall-5.0.4.ebuild | 446 +++++++++++++ net-fs/samba/Manifest | 1 + net-fs/samba/samba-4.2.7.ebuild | 193 ------ net-fs/samba/samba-4.2.8.ebuild | 251 ++++++++ net-ftp/filezilla/Manifest | 2 + net-ftp/filezilla/filezilla-3.15.0.1.ebuild | 68 ++ net-ftp/filezilla/filezilla-3.15.0.ebuild | 68 ++ net-ftp/lftp/lftp-4.6.5.ebuild | 2 +- net-ftp/yafc/Manifest | 1 + net-ftp/yafc/yafc-1.3.7.ebuild | 47 ++ net-im/skype/skype-4.3.0.37-r5.ebuild | 121 ++++ net-irc/kvirc/Manifest | 1 + .../kvirc/kvirc-5.0_pre20160201053254.ebuild | 135 ++++ .../courier-authlib-0.66.4.ebuild | 2 +- net-libs/gsoap/Manifest | 2 +- net-libs/gsoap/gsoap-2.7.17-r1.ebuild | 70 -- ...soap-2.8.26.ebuild => gsoap-2.8.28.ebuild} | 8 +- net-libs/libbtbb/libbtbb-9999.ebuild | 3 +- net-libs/nghttp2/Manifest | 3 +- .../files/nghttp2-1.0.2-third-party.patch | 34 - net-libs/nghttp2/nghttp2-1.0.5.ebuild | 61 -- net-libs/nghttp2/nghttp2-1.6.0.ebuild | 2 +- ...ttp2-1.5.0.ebuild => nghttp2-1.7.0.ebuild} | 0 net-libs/opal/opal-3.10.11.ebuild | 2 +- net-misc/mikutter/Manifest | 1 + net-misc/mikutter/mikutter-3.3.5.ebuild | 85 +++ net-misc/mikutter/mikutter-9999.ebuild | 20 +- net-misc/openntpd/Manifest | 2 - .../files/openntpd-20080406-dns-timeout.patch | 46 -- .../files/openntpd-20080406-pidfile.patch | 141 ----- .../files/openntpd-20080406-signal.patch | 57 -- .../openntpd/openntpd-4.0_pre20080406.ebuild | 105 --- net-misc/openntpd/openntpd-5.7_p4-r2.ebuild | 2 +- net-misc/socat/Manifest | 3 +- net-misc/socat/socat-1.7.3.1.ebuild | 50 ++ ..._beta8.ebuild => socat-2.0.0_beta9.ebuild} | 4 +- net-misc/socat/socat-9999.ebuild | 4 +- net-misc/whatportis/Manifest | 2 + net-misc/x2goserver/files/x2goserver.init | 4 +- .../x2goserver/x2goserver-4.0.1.19-r1.ebuild | 88 +++ .../389-ds-base/389-ds-base-1.3.4.7.ebuild | 156 +++++ net-nds/389-ds-base/Manifest | 1 + ...9-ds-base-1.3.4.7-no-instance-script.patch | 396 ++++++++++++ ...89-ds-base-1.3.4.7-shell-corrections.patch | 242 +++++++ net-nds/389-ds-base/files/389-ds.initd-r1 | 88 +++ net-nds/nsscache/Manifest | 1 + net-nds/nsscache/nsscache-0.32.ebuild | 49 ++ .../phpldapadmin/phpldapadmin-1.2.3-r1.ebuild | 4 +- .../phpldapadmin/phpldapadmin-1.2.3.ebuild | 4 +- net-p2p/mldonkey/mldonkey-3.1.5.ebuild | 1 + net-voip/ekiga/ekiga-4.0.1.ebuild | 2 +- profiles/arch/alpha/package.use.mask | 6 +- profiles/arch/arm/package.use.mask | 6 +- profiles/arch/powerpc/ppc32/package.use.mask | 4 + profiles/arch/sparc/package.use.mask | 6 +- profiles/package.mask | 6 + profiles/targets/systemd/package.use.mask | 6 +- profiles/use.local.desc | 1 - sci-misc/mendeleydesktop/Manifest | 4 +- ...2.ebuild => mendeleydesktop-1.15.3.ebuild} | 8 +- sys-apps/i2c-tools/metadata.xml | 3 + sys-apps/man-db/man-db-2.7.5.ebuild | 2 +- sys-apps/openrc/openrc-0.19.1.ebuild | 2 +- sys-apps/sandbox/sandbox-2.10-r1.ebuild | 2 +- sys-apps/sysvinit/files/inittab-2.88 | 60 ++ sys-apps/sysvinit/sysvinit-2.88-r4.ebuild | 104 --- sys-apps/sysvinit/sysvinit-2.88-r5.ebuild | 106 ---- ...2.88-r6.ebuild => sysvinit-2.88-r9.ebuild} | 41 +- .../keystone/files/CVE-2015-7546_8.0.1.patch | 216 +++++++ ...-8.0.1.ebuild => keystone-8.0.1-r1.ebuild} | 1 + sys-block/fio/Manifest | 1 + sys-block/fio/files/fio-2.2.10-libmtd.patch | 12 + sys-block/fio/files/fio-2.2.13-libmtd.patch | 12 + sys-block/fio/fio-2.2.10.ebuild | 1 + sys-block/fio/fio-2.2.13.ebuild | 1 + sys-block/fio/fio-2.5.ebuild | 1 + sys-block/fio/fio-2.6.ebuild | 92 +++ sys-boot/os-prober/Manifest | 2 +- ...ober-1.68.ebuild => os-prober-1.71.ebuild} | 4 +- sys-fs/s3ql/files/s3ql-2.14-ceph.patch | 75 +++ sys-fs/s3ql/s3ql-2.14-r1.ebuild | 59 ++ sys-kernel/aufs-sources/Manifest | 9 + .../aufs-sources/aufs-sources-4.1.17.ebuild | 86 +++ .../aufs-sources/aufs-sources-4.3.5.ebuild | 86 +++ .../aufs-sources/aufs-sources-4.4.1.ebuild | 86 +++ sys-kernel/gentoo-sources/Manifest | 6 + .../gentoo-sources-3.14.60.ebuild | 29 + .../gentoo-sources-3.18.26.ebuild | 29 + sys-kernel/hardened-sources/Manifest | 2 + .../hardened-sources-4.3.5.ebuild | 46 ++ sys-libs/timezone-data/Manifest | 4 +- .../files/timezone-data-2016a-makefile.patch | 84 +++ .../timezone-data/timezone-data-2015g.ebuild | 2 +- ...015e.ebuild => timezone-data-2016a.ebuild} | 34 +- sys-process/cronbase/cronbase-0.3.7-r1.ebuild | 2 +- virtual/jdk/jdk-1.8.0-r1.ebuild | 5 +- virtual/jre/jre-1.8.0-r1.ebuild | 2 +- www-apps/wordpress/Manifest | 2 +- ...ss-4.4.1.ebuild => wordpress-4.4.2.ebuild} | 0 www-client/google-chrome-unstable/Manifest | 2 +- ...gle-chrome-unstable-50.0.2638.0_p1.ebuild} | 0 www-plugins/chrome-binary-plugins/Manifest | 2 +- ...-binary-plugins-50.0.2638.0_alpha1.ebuild} | 0 www-servers/nginx/Manifest | 4 +- ...{nginx-1.9.6.ebuild => nginx-1.8.1.ebuild} | 170 +++-- x11-libs/libxcb/libxcb-1.11-r1.ebuild | 2 +- x11-libs/pixman/Manifest | 1 + x11-libs/pixman/pixman-0.34.0.ebuild | 33 + x11-misc/compton/compton-0.1_beta2.ebuild | 2 +- x11-misc/compton/compton-9999.ebuild | 2 +- x11-misc/light-locker/Manifest | 1 + .../light-locker/light-locker-1.7.0.ebuild | 65 ++ x11-misc/quitcount/metadata.xml | 4 +- x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild | 2 +- x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild | 4 +- x11-wm/awesome/metadata.xml | 5 - ...12.1-light-locker_support_to_xflock4.patch | 17 + .../xfce4-session-4.12.1-r1.ebuild | 74 +++ ...0.3.ebuild => xfce4-vala-4.10.3-r2.ebuild} | 4 +- 1032 files changed, 12899 insertions(+), 4904 deletions(-) create mode 100644 app-admin/keepassx/keepassx-2.0.2.ebuild create mode 100644 app-admin/qtpass/qtpass-1.1.0.ebuild create mode 100644 app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch create mode 100644 app-admin/salt/salt-2015.8.5.ebuild rename app-antivirus/skyldav/files/{skyldav-0.5-conf.patch => skyldav-0.5-conf-r1.patch} (81%) rename app-antivirus/skyldav/{skyldav-0.5-r1.ebuild => skyldav-0.5-r2.ebuild} (90%) rename app-backup/bacula/{bacula-5.0.3-r4.ebuild => bacula-7.4.0.ebuild} (77%) rename app-crypt/acme/{acme-0.2.0.ebuild => acme-0.3.0.ebuild} (100%) delete mode 100644 app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild create mode 100644 app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild delete mode 100644 app-crypt/easy-rsa/files/easy-rsa-2.0.0-pkcs11.patch delete mode 100644 app-crypt/easy-rsa/files/no-licenses.patch rename app-crypt/letsencrypt/{letsencrypt-0.2.0.ebuild => letsencrypt-0.3.0.ebuild} (96%) create mode 100644 app-editors/le/le-1.16.1.ebuild create mode 100644 app-emacs/magit/magit-2.4.1.ebuild create mode 100644 app-emacs/magit/magit-2.5.0.ebuild create mode 100644 app-emacs/with-editor/Manifest create mode 100644 app-emacs/with-editor/files/50with-editor-gentoo.el create mode 100644 app-emacs/with-editor/metadata.xml create mode 100644 app-emacs/with-editor/with-editor-2.5.0-r1.ebuild create mode 100644 app-emulation/ganeti/files/ganeti-2.15.2-remove-sandbox-failing-tests.patch create mode 100644 app-emulation/ganeti/ganeti-2.15.2.ebuild create mode 100644 app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch rename app-emulation/libvirt/{libvirt-1.3.0.ebuild => libvirt-1.3.1.ebuild} (95%) create mode 100644 app-emulation/spice/spice-0.13.0.ebuild create mode 100644 app-i18n/ibus/ibus-1.5.5.ebuild create mode 100644 app-i18n/ibus/ibus-1.5.8-r1.ebuild create mode 100644 app-i18n/ibus/ibus-1.5.9-r1.ebuild rename app-misc/jq/{jq-1.5.ebuild => jq-1.5-r1.ebuild} (90%) create mode 100644 app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch create mode 100644 app-mobilephone/gammu/gammu-1.36.8.ebuild create mode 100644 app-mobilephone/wammu/wammu-0.35-r1.ebuild create mode 100644 app-mobilephone/wammu/wammu-0.40.ebuild create mode 100644 app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch delete mode 100644 app-portage/conf-update/conf-update-1.0.2.ebuild create mode 100644 app-shells/bash/bash-4.3_p42-r2.ebuild create mode 100644 app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch create mode 100644 app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch rename app-text/tesseract/{tesseract-3.04.00-r3.ebuild => tesseract-3.04.00-r4.ebuild} (82%) create mode 100644 dev-java/icedtea-bin/files/icedtea-bin-8.env create mode 100644 dev-java/icedtea-bin/icedtea-bin-3.0.0_pre08.ebuild create mode 100644 dev-lang/crystal/crystal-0.11.1.ebuild create mode 100644 dev-lang/go/go-1.6_rc1.ebuild create mode 100644 dev-lang/moarvm/moarvm-2016.01.ebuild create mode 100644 dev-lang/nqp/nqp-2016.01.ebuild create mode 100644 dev-lang/rakudo/rakudo-2016.01.ebuild delete mode 100644 dev-lang/vala/files/vala-0.24.0-atk-metadata.patch delete mode 100644 dev-lang/vala/vala-0.20.1.ebuild delete mode 100644 dev-lang/vala/vala-0.24.0-r1.ebuild rename dev-lang/vala/{vala-0.30.0.ebuild => vala-0.30.1.ebuild} (93%) delete mode 100644 dev-libs/jansson/jansson-2.4.ebuild delete mode 100644 dev-libs/jansson/jansson-2.6.ebuild rename dev-libs/libusb/{libusb-1.0.19.ebuild => libusb-1.0.19-r1.ebuild} (92%) create mode 100644 dev-libs/libusb/libusb-1.0.20.ebuild create mode 100644 dev-libs/libzip/files/libzip-1.1-missing-extern.patch create mode 100644 dev-libs/libzip/libzip-1.1.ebuild create mode 100644 dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch rename dev-libs/uchardet/{uchardet-0.0.5.ebuild => uchardet-0.0.5-r1.ebuild} (93%) rename dev-libs/vala-common/{vala-common-0.26.2.ebuild => vala-common-0.30.1.ebuild} (91%) create mode 100644 dev-ml/camlp5/camlp5-6.15.ebuild create mode 100644 dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild delete mode 100644 dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.20.0.ebuild delete mode 100644 dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild delete mode 100644 dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.520.0.ebuild rename dev-perl/HTML-Packer/{HTML-Packer-1.4.1.ebuild => HTML-Packer-2.20.0.ebuild} (65%) create mode 100644 dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild create mode 100644 dev-python/colorlog/colorlog-2.6.1.ebuild create mode 100644 dev-python/distlib/distlib-0.2.2.ebuild create mode 100644 dev-python/distlib/files/distlib-0.2.2-unbundle.patch create mode 100644 dev-python/django-classy-tags/django-classy-tags-0.7.1.ebuild create mode 100644 dev-python/django-cms/django-cms-3.2.0.ebuild create mode 100644 dev-python/django-treebeard/django-treebeard-4.0.ebuild rename dev-python/django/{django-1.9.ebuild => django-1.8.9.ebuild} (92%) rename dev-python/django/{django-1.9.1.ebuild => django-1.9.2.ebuild} (100%) create mode 100644 dev-python/djangocms-admin-style/djangocms-admin-style-1.1.0.ebuild create mode 100644 dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.8.1.ebuild create mode 100644 dev-python/flipflop/Manifest create mode 100644 dev-python/flipflop/flipflop-1.0.ebuild create mode 100644 dev-python/flipflop/metadata.xml rename dev-python/freezegun/{freezegun-0.3.5.ebuild => freezegun-0.3.6.ebuild} (75%) create mode 100644 dev-python/ipython/ipython-4.1.0.ebuild create mode 100644 dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch rename dev-python/keystonemiddleware/{keystonemiddleware-2.3.1.ebuild => keystonemiddleware-2.3.1-r1.ebuild} (96%) rename dev-python/keystonemiddleware/{keystonemiddleware-2.3.2.ebuild => keystonemiddleware-2.3.2-r1.ebuild} (97%) create mode 100644 dev-python/libvirt-python/libvirt-python-1.3.1.ebuild create mode 100644 dev-python/mimeparse/mimeparse-1.5.ebuild create mode 100644 dev-python/networkx/networkx-1.11.ebuild delete mode 100644 dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch delete mode 100644 dev-python/nose/files/nose-1.2.1-skiptest.patch delete mode 100644 dev-python/nose/files/nose-1.3.1-doctest.patch delete mode 100644 dev-python/nose/files/nose-1.3.1-pypy-test.patch delete mode 100644 dev-python/nose/files/nose-1.3.1-python3.4.patch delete mode 100644 dev-python/nose/files/nose-1.3.1-version.patch create mode 100644 dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch delete mode 100644 dev-python/nose/nose-1.3.4.ebuild delete mode 100644 dev-python/nose/nose-1.3.6.ebuild rename dev-python/nose/{nose-1.3.7.ebuild => nose-1.3.7-r1.ebuild} (88%) create mode 100644 dev-python/pluggy/Manifest create mode 100644 dev-python/pluggy/metadata.xml create mode 100644 dev-python/pluggy/pluggy-0.3.1.ebuild create mode 100644 dev-python/pyrsistent/pyrsistent-0.11.11.ebuild create mode 100644 dev-python/pytest-cov/pytest-cov-2.2.1.ebuild create mode 100644 dev-python/pytest-xdist/pytest-xdist-1.14.ebuild create mode 100644 dev-python/python-gammu/Manifest create mode 100644 dev-python/python-gammu/metadata.xml create mode 100644 dev-python/python-gammu/python-gammu-2.5.ebuild delete mode 100644 dev-python/responses/responses-0.5.0.ebuild rename dev-python/responses/{responses-0.4.0.ebuild => responses-0.5.1.ebuild} (94%) create mode 100644 dev-python/rpy/rpy-2.7.8.ebuild create mode 100644 dev-python/setuptools/setuptools-19.6.2.ebuild create mode 100644 dev-python/setuptools/setuptools-19.7.ebuild create mode 100644 dev-python/tox/tox-2.3.1.ebuild create mode 100644 dev-python/virtualenv/virtualenv-14.0.5.ebuild create mode 100644 dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild create mode 100644 dev-python/webob/webob-1.6.0_alpha0.ebuild create mode 100644 dev-ruby/capybara/capybara-2.6.2.ebuild delete mode 100644 dev-ruby/ffaker/ffaker-1.32.1.ebuild delete mode 100644 dev-ruby/ffaker/ffaker-2.0.0.ebuild delete mode 100644 dev-ruby/minitest/minitest-5.8.0.ebuild delete mode 100644 dev-ruby/minitest/minitest-5.8.1.ebuild rename dev-ruby/minitest/{minitest-5.8.2.ebuild => minitest-5.8.4.ebuild} (90%) create mode 100644 dev-ruby/nio4r/nio4r-1.2.1.ebuild create mode 100644 dev-ruby/rack-cache/rack-cache-1.6.0.ebuild create mode 100644 dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild create mode 100644 dev-tex/circuit_macros/circuit_macros-8.3.1.ebuild create mode 100644 dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild rename dev-util/jenkins-bin/{jenkins-bin-1.644.ebuild => jenkins-bin-1.646.ebuild} (100%) create mode 100644 dev-vcs/git-tools/git-tools-2015_p20160201.ebuild rename dev-vcs/mercurial/{mercurial-3.6.2.ebuild => mercurial-3.7.ebuild} (98%) delete mode 100644 eclass/bash-completion.eclass delete mode 100644 eclass/emul-linux-x86.eclass rename games-emulation/ppsspp/{ppsspp-9999-r1.ebuild => ppsspp-9999.ebuild} (99%) delete mode 100644 gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild delete mode 100644 gnome-extra/libgda/libgda-5.2.2.ebuild delete mode 100644 lxde-base/lxsession/lxsession-0.4.6.1.ebuild delete mode 100644 lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild delete mode 100644 lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild delete mode 100644 lxde-base/lxsession/lxsession-0.4.9.2.ebuild create mode 100644 mail-mta/exim/files/exim-4.86-TMPDIR.patch create mode 100644 media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch create mode 100644 media-sound/musescore/musescore-2.0.2-r1.ebuild delete mode 100644 media-sound/podget/podget-0.6.15.ebuild delete mode 100644 media-sound/podget/podget-0.6.9.ebuild delete mode 100644 media-sound/podget/podget-0.6.ebuild create mode 100644 media-sound/podget/podget-0.7.9.ebuild delete mode 100644 media-tv/xawtv/xawtv-3.95-r2.ebuild create mode 100644 metadata/md5-cache/app-admin/keepassx-2.0.2 create mode 100644 metadata/md5-cache/app-admin/qtpass-1.1.0 create mode 100644 metadata/md5-cache/app-admin/salt-2015.8.5 rename metadata/md5-cache/app-antivirus/{skyldav-0.5-r1 => skyldav-0.5-r2} (97%) delete mode 100644 metadata/md5-cache/app-backup/bacula-5.0.3-r4 create mode 100644 metadata/md5-cache/app-backup/bacula-7.4.0 rename metadata/md5-cache/app-crypt/{acme-0.2.0 => acme-0.3.0} (98%) delete mode 100644 metadata/md5-cache/app-crypt/easy-rsa-2.2.0-r1 create mode 100644 metadata/md5-cache/app-crypt/easy-rsa-3.0.1 rename metadata/md5-cache/app-crypt/{letsencrypt-0.2.0 => letsencrypt-0.3.0} (88%) create mode 100644 metadata/md5-cache/app-editors/le-1.16.1 create mode 100644 metadata/md5-cache/app-emacs/magit-2.4.1 create mode 100644 metadata/md5-cache/app-emacs/magit-2.5.0 create mode 100644 metadata/md5-cache/app-emacs/with-editor-2.5.0-r1 create mode 100644 metadata/md5-cache/app-emulation/ganeti-2.15.2 rename metadata/md5-cache/app-emulation/{libvirt-1.3.0 => libvirt-1.3.1} (94%) create mode 100644 metadata/md5-cache/app-emulation/spice-0.13.0 create mode 100644 metadata/md5-cache/app-i18n/ibus-1.5.5 create mode 100644 metadata/md5-cache/app-i18n/ibus-1.5.8-r1 create mode 100644 metadata/md5-cache/app-i18n/ibus-1.5.9-r1 rename metadata/md5-cache/app-misc/{jq-1.5 => jq-1.5-r1} (59%) create mode 100644 metadata/md5-cache/app-mobilephone/gammu-1.36.8 create mode 100644 metadata/md5-cache/app-mobilephone/wammu-0.35-r1 create mode 100644 metadata/md5-cache/app-mobilephone/wammu-0.40 delete mode 100644 metadata/md5-cache/app-portage/conf-update-1.0.2 create mode 100644 metadata/md5-cache/app-shells/bash-4.3_p42-r2 rename metadata/md5-cache/app-text/{tesseract-3.04.00-r3 => tesseract-3.04.00-r4} (81%) create mode 100644 metadata/md5-cache/dev-java/icedtea-bin-3.0.0_pre08 create mode 100644 metadata/md5-cache/dev-lang/crystal-0.11.1 create mode 100644 metadata/md5-cache/dev-lang/go-1.6_rc1 create mode 100644 metadata/md5-cache/dev-lang/moarvm-2016.01 create mode 100644 metadata/md5-cache/dev-lang/nqp-2016.01 create mode 100644 metadata/md5-cache/dev-lang/rakudo-2016.01 delete mode 100644 metadata/md5-cache/dev-lang/vala-0.20.1 delete mode 100644 metadata/md5-cache/dev-lang/vala-0.24.0-r1 rename metadata/md5-cache/dev-lang/{vala-0.30.0 => vala-0.30.1} (77%) delete mode 100644 metadata/md5-cache/dev-libs/jansson-2.4 delete mode 100644 metadata/md5-cache/dev-libs/jansson-2.6 rename metadata/md5-cache/dev-libs/{libusb-1.0.19 => libusb-1.0.19-r1} (75%) create mode 100644 metadata/md5-cache/dev-libs/libusb-1.0.20 create mode 100644 metadata/md5-cache/dev-libs/libzip-1.1 rename metadata/md5-cache/dev-libs/{uchardet-0.0.5 => uchardet-0.0.5-r1} (94%) rename metadata/md5-cache/dev-libs/{vala-common-0.26.2 => vala-common-0.30.1} (63%) create mode 100644 metadata/md5-cache/dev-ml/camlp5-6.15 create mode 100644 metadata/md5-cache/dev-perl/Cache-Cache-1.80.0 delete mode 100644 metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.140.0 delete mode 100644 metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.20.0 delete mode 100644 metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.520.0 delete mode 100644 metadata/md5-cache/dev-perl/HTML-Packer-1.4.1 create mode 100644 metadata/md5-cache/dev-perl/HTML-Packer-2.20.0 create mode 100644 metadata/md5-cache/dev-perl/perl-mozldap-1.5.3 create mode 100644 metadata/md5-cache/dev-python/colorlog-2.6.1 create mode 100644 metadata/md5-cache/dev-python/distlib-0.2.2 create mode 100644 metadata/md5-cache/dev-python/django-1.8.9 delete mode 100644 metadata/md5-cache/dev-python/django-1.9 rename metadata/md5-cache/dev-python/{django-1.9.1 => django-1.9.2} (98%) create mode 100644 metadata/md5-cache/dev-python/django-classy-tags-0.7.1 create mode 100644 metadata/md5-cache/dev-python/django-cms-3.2.0 create mode 100644 metadata/md5-cache/dev-python/django-treebeard-4.0 create mode 100644 metadata/md5-cache/dev-python/djangocms-admin-style-1.1.0 create mode 100644 metadata/md5-cache/dev-python/djangocms-text-ckeditor-2.8.1 create mode 100644 metadata/md5-cache/dev-python/flipflop-1.0 delete mode 100644 metadata/md5-cache/dev-python/freezegun-0.3.5 create mode 100644 metadata/md5-cache/dev-python/freezegun-0.3.6 create mode 100644 metadata/md5-cache/dev-python/ipython-4.1.0 rename metadata/md5-cache/dev-python/{keystonemiddleware-2.3.1 => keystonemiddleware-2.3.1-r1} (99%) rename metadata/md5-cache/dev-python/{keystonemiddleware-2.3.2 => keystonemiddleware-2.3.2-r1} (99%) create mode 100644 metadata/md5-cache/dev-python/libvirt-python-1.3.1 create mode 100644 metadata/md5-cache/dev-python/mimeparse-1.5 create mode 100644 metadata/md5-cache/dev-python/networkx-1.11 delete mode 100644 metadata/md5-cache/dev-python/nose-1.3.4 delete mode 100644 metadata/md5-cache/dev-python/nose-1.3.6 rename metadata/md5-cache/dev-python/{nose-1.3.7 => nose-1.3.7-r1} (96%) create mode 100644 metadata/md5-cache/dev-python/pluggy-0.3.1 create mode 100644 metadata/md5-cache/dev-python/pyrsistent-0.11.11 create mode 100644 metadata/md5-cache/dev-python/pytest-cov-2.2.1 create mode 100644 metadata/md5-cache/dev-python/pytest-xdist-1.14 create mode 100644 metadata/md5-cache/dev-python/python-gammu-2.5 delete mode 100644 metadata/md5-cache/dev-python/responses-0.5.0 rename metadata/md5-cache/dev-python/{responses-0.4.0 => responses-0.5.1} (95%) create mode 100644 metadata/md5-cache/dev-python/rpy-2.7.8 create mode 100644 metadata/md5-cache/dev-python/setuptools-19.6.2 create mode 100644 metadata/md5-cache/dev-python/setuptools-19.7 create mode 100644 metadata/md5-cache/dev-python/tox-2.3.1 create mode 100644 metadata/md5-cache/dev-python/virtualenv-14.0.5 create mode 100644 metadata/md5-cache/dev-python/virtualenvwrapper-4.7.1 create mode 100644 metadata/md5-cache/dev-python/webob-1.6.0_alpha0 create mode 100644 metadata/md5-cache/dev-ruby/capybara-2.6.2 delete mode 100644 metadata/md5-cache/dev-ruby/ffaker-1.32.1 delete mode 100644 metadata/md5-cache/dev-ruby/ffaker-2.0.0 delete mode 100644 metadata/md5-cache/dev-ruby/minitest-5.8.0 delete mode 100644 metadata/md5-cache/dev-ruby/minitest-5.8.1 delete mode 100644 metadata/md5-cache/dev-ruby/minitest-5.8.2 create mode 100644 metadata/md5-cache/dev-ruby/minitest-5.8.4 create mode 100644 metadata/md5-cache/dev-ruby/nio4r-1.2.1 create mode 100644 metadata/md5-cache/dev-ruby/rack-cache-1.6.0 create mode 100644 metadata/md5-cache/dev-ruby/ruby_parser-3.7.3 create mode 100644 metadata/md5-cache/dev-tex/circuit_macros-8.3.1 create mode 100644 metadata/md5-cache/dev-util/jenkins-bin-1.642.1 rename metadata/md5-cache/dev-util/{jenkins-bin-1.644 => jenkins-bin-1.646} (85%) create mode 100644 metadata/md5-cache/dev-vcs/git-tools-2015_p20160201 rename metadata/md5-cache/dev-vcs/{mercurial-3.6.2 => mercurial-3.7} (93%) rename metadata/md5-cache/games-emulation/{ppsspp-9999-r1 => ppsspp-9999} (96%) delete mode 100644 metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7 delete mode 100644 metadata/md5-cache/gnome-extra/libgda-5.2.2 delete mode 100644 metadata/md5-cache/lxde-base/lxsession-0.4.6.1 delete mode 100644 metadata/md5-cache/lxde-base/lxsession-0.4.9.2 delete mode 100644 metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1 delete mode 100644 metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2 create mode 100644 metadata/md5-cache/media-sound/musescore-2.0.2-r1 delete mode 100644 metadata/md5-cache/media-sound/podget-0.6 delete mode 100644 metadata/md5-cache/media-sound/podget-0.6.15 delete mode 100644 metadata/md5-cache/media-sound/podget-0.6.9 create mode 100644 metadata/md5-cache/media-sound/podget-0.7.9 delete mode 100644 metadata/md5-cache/media-tv/xawtv-3.95-r2 create mode 100644 metadata/md5-cache/net-analyzer/cacti-0.8.8f-r1 create mode 100644 metadata/md5-cache/net-analyzer/greenbone-security-assistant-6.0.9 create mode 100644 metadata/md5-cache/net-analyzer/pnp4nagios-0.6.25-r2 create mode 100644 metadata/md5-cache/net-dns/pdns-3.4.8 create mode 100644 metadata/md5-cache/net-firewall/firewalld-0.4.0 create mode 100644 metadata/md5-cache/net-firewall/shorewall-5.0.4 delete mode 100644 metadata/md5-cache/net-fs/samba-4.2.7 create mode 100644 metadata/md5-cache/net-fs/samba-4.2.8 create mode 100644 metadata/md5-cache/net-ftp/filezilla-3.15.0 create mode 100644 metadata/md5-cache/net-ftp/filezilla-3.15.0.1 create mode 100644 metadata/md5-cache/net-ftp/yafc-1.3.7 create mode 100644 metadata/md5-cache/net-im/skype-4.3.0.37-r5 create mode 100644 metadata/md5-cache/net-irc/kvirc-5.0_pre20160201053254 delete mode 100644 metadata/md5-cache/net-libs/gsoap-2.7.17-r1 rename metadata/md5-cache/net-libs/{gsoap-2.8.26 => gsoap-2.8.28} (90%) delete mode 100644 metadata/md5-cache/net-libs/nghttp2-1.0.5 rename metadata/md5-cache/net-libs/{nghttp2-1.5.0 => nghttp2-1.7.0} (98%) create mode 100644 metadata/md5-cache/net-misc/mikutter-3.3.5 delete mode 100644 metadata/md5-cache/net-misc/openntpd-4.0_pre20080406 create mode 100644 metadata/md5-cache/net-misc/socat-1.7.3.1 rename metadata/md5-cache/net-misc/{socat-2.0.0_beta8 => socat-2.0.0_beta9} (62%) create mode 100644 metadata/md5-cache/net-misc/x2goserver-4.0.1.19-r1 create mode 100644 metadata/md5-cache/net-nds/389-ds-base-1.3.4.7 create mode 100644 metadata/md5-cache/net-nds/nsscache-0.32 delete mode 100644 metadata/md5-cache/sci-misc/mendeleydesktop-1.15.2 create mode 100644 metadata/md5-cache/sci-misc/mendeleydesktop-1.15.3 delete mode 100644 metadata/md5-cache/sys-apps/sysvinit-2.88-r4 delete mode 100644 metadata/md5-cache/sys-apps/sysvinit-2.88-r6 rename metadata/md5-cache/sys-apps/{sysvinit-2.88-r5 => sysvinit-2.88-r9} (71%) rename metadata/md5-cache/sys-auth/{keystone-8.0.1 => keystone-8.0.1-r1} (99%) create mode 100644 metadata/md5-cache/sys-block/fio-2.6 rename metadata/md5-cache/sys-boot/{os-prober-1.68 => os-prober-1.71} (75%) create mode 100644 metadata/md5-cache/sys-fs/s3ql-2.14-r1 create mode 100644 metadata/md5-cache/sys-kernel/aufs-sources-4.1.17 create mode 100644 metadata/md5-cache/sys-kernel/aufs-sources-4.3.5 create mode 100644 metadata/md5-cache/sys-kernel/aufs-sources-4.4.1 create mode 100644 metadata/md5-cache/sys-kernel/gentoo-sources-3.14.60 create mode 100644 metadata/md5-cache/sys-kernel/gentoo-sources-3.18.26 create mode 100644 metadata/md5-cache/sys-kernel/hardened-sources-4.3.5 rename metadata/md5-cache/sys-libs/{timezone-data-2015e => timezone-data-2016a} (64%) rename metadata/md5-cache/www-apps/{wordpress-4.4.1 => wordpress-4.4.2} (89%) rename metadata/md5-cache/www-client/{google-chrome-unstable-50.0.2633.3_p1 => google-chrome-unstable-50.0.2638.0_p1} (97%) rename metadata/md5-cache/www-plugins/{chrome-binary-plugins-50.0.2633.3_alpha1 => chrome-binary-plugins-50.0.2638.0_alpha1} (90%) create mode 100644 metadata/md5-cache/www-servers/nginx-1.8.1 delete mode 100644 metadata/md5-cache/www-servers/nginx-1.9.6 create mode 100644 metadata/md5-cache/x11-libs/pixman-0.34.0 create mode 100644 metadata/md5-cache/x11-misc/light-locker-1.7.0 create mode 100644 metadata/md5-cache/xfce-base/xfce4-session-4.12.1-r1 rename metadata/md5-cache/xfce-extra/{xfce4-vala-4.10.3 => xfce4-vala-4.10.3-r2} (86%) create mode 100644 net-analyzer/cacti/cacti-0.8.8f-r1.ebuild create mode 100644 net-analyzer/cacti/files/cacti-0.8.8f-CVE-2015-8369.patch create mode 100644 net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild create mode 100644 net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild create mode 100644 net-dns/pdns/pdns-3.4.8.ebuild create mode 100644 net-firewall/firewalld/firewalld-0.4.0.ebuild create mode 100644 net-firewall/shorewall/shorewall-5.0.4.ebuild delete mode 100644 net-fs/samba/samba-4.2.7.ebuild create mode 100644 net-fs/samba/samba-4.2.8.ebuild create mode 100644 net-ftp/filezilla/filezilla-3.15.0.1.ebuild create mode 100644 net-ftp/filezilla/filezilla-3.15.0.ebuild create mode 100644 net-ftp/yafc/yafc-1.3.7.ebuild create mode 100644 net-im/skype/skype-4.3.0.37-r5.ebuild create mode 100644 net-irc/kvirc/kvirc-5.0_pre20160201053254.ebuild delete mode 100644 net-libs/gsoap/gsoap-2.7.17-r1.ebuild rename net-libs/gsoap/{gsoap-2.8.26.ebuild => gsoap-2.8.28.ebuild} (92%) delete mode 100644 net-libs/nghttp2/files/nghttp2-1.0.2-third-party.patch delete mode 100644 net-libs/nghttp2/nghttp2-1.0.5.ebuild rename net-libs/nghttp2/{nghttp2-1.5.0.ebuild => nghttp2-1.7.0.ebuild} (100%) create mode 100644 net-misc/mikutter/mikutter-3.3.5.ebuild delete mode 100644 net-misc/openntpd/files/openntpd-20080406-dns-timeout.patch delete mode 100644 net-misc/openntpd/files/openntpd-20080406-pidfile.patch delete mode 100644 net-misc/openntpd/files/openntpd-20080406-signal.patch delete mode 100644 net-misc/openntpd/openntpd-4.0_pre20080406.ebuild create mode 100644 net-misc/socat/socat-1.7.3.1.ebuild rename net-misc/socat/{socat-2.0.0_beta8.ebuild => socat-2.0.0_beta9.ebuild} (92%) create mode 100644 net-misc/x2goserver/x2goserver-4.0.1.19-r1.ebuild create mode 100644 net-nds/389-ds-base/389-ds-base-1.3.4.7.ebuild create mode 100644 net-nds/389-ds-base/files/389-ds-base-1.3.4.7-no-instance-script.patch create mode 100644 net-nds/389-ds-base/files/389-ds-base-1.3.4.7-shell-corrections.patch create mode 100644 net-nds/389-ds-base/files/389-ds.initd-r1 create mode 100644 net-nds/nsscache/nsscache-0.32.ebuild rename sci-misc/mendeleydesktop/{mendeleydesktop-1.15.2.ebuild => mendeleydesktop-1.15.3.ebuild} (96%) create mode 100644 sys-apps/sysvinit/files/inittab-2.88 delete mode 100644 sys-apps/sysvinit/sysvinit-2.88-r4.ebuild delete mode 100644 sys-apps/sysvinit/sysvinit-2.88-r5.ebuild rename sys-apps/sysvinit/{sysvinit-2.88-r6.ebuild => sysvinit-2.88-r9.ebuild} (72%) create mode 100644 sys-auth/keystone/files/CVE-2015-7546_8.0.1.patch rename sys-auth/keystone/{keystone-8.0.1.ebuild => keystone-8.0.1-r1.ebuild} (99%) create mode 100644 sys-block/fio/files/fio-2.2.10-libmtd.patch create mode 100644 sys-block/fio/files/fio-2.2.13-libmtd.patch create mode 100644 sys-block/fio/fio-2.6.ebuild rename sys-boot/os-prober/{os-prober-1.68.ebuild => os-prober-1.71.ebuild} (96%) create mode 100644 sys-fs/s3ql/files/s3ql-2.14-ceph.patch create mode 100644 sys-fs/s3ql/s3ql-2.14-r1.ebuild create mode 100644 sys-kernel/aufs-sources/aufs-sources-4.1.17.ebuild create mode 100644 sys-kernel/aufs-sources/aufs-sources-4.3.5.ebuild create mode 100644 sys-kernel/aufs-sources/aufs-sources-4.4.1.ebuild create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.14.60.ebuild create mode 100644 sys-kernel/gentoo-sources/gentoo-sources-3.18.26.ebuild create mode 100644 sys-kernel/hardened-sources/hardened-sources-4.3.5.ebuild create mode 100644 sys-libs/timezone-data/files/timezone-data-2016a-makefile.patch rename sys-libs/timezone-data/{timezone-data-2015e.ebuild => timezone-data-2016a.ebuild} (80%) rename www-apps/wordpress/{wordpress-4.4.1.ebuild => wordpress-4.4.2.ebuild} (100%) rename www-client/google-chrome-unstable/{google-chrome-unstable-50.0.2633.3_p1.ebuild => google-chrome-unstable-50.0.2638.0_p1.ebuild} (100%) rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-50.0.2633.3_alpha1.ebuild => chrome-binary-plugins-50.0.2638.0_alpha1.ebuild} (100%) rename www-servers/nginx/{nginx-1.9.6.ebuild => nginx-1.8.1.ebuild} (84%) create mode 100644 x11-libs/pixman/pixman-0.34.0.ebuild create mode 100644 x11-misc/light-locker/light-locker-1.7.0.ebuild create mode 100644 xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch create mode 100644 xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild rename xfce-extra/xfce4-vala/{xfce4-vala-4.10.3.ebuild => xfce4-vala-4.10.3-r2.ebuild} (93%) diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest index 390fc35c578a..9fb887ef58cc 100644 --- a/app-admin/keepassx/Manifest +++ b/app-admin/keepassx/Manifest @@ -1,4 +1,5 @@ DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b DIST keepassx-0.4.4.tar.gz 1371560 SHA256 3e27068ca85e68705347f0921c6b3c9248d7c5a84c79c0483daf22d141c0adc4 SHA512 2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8 WHIRLPOOL 41c987607c8b233292eac5c5d654974caa1ae2a0d277468081ad4a6e9fcd248314239162ba23dc414f0854a5f6ba09e1c1f9d3aa078756438650a0e9151e81d2 DIST keepassx-2.0.1.tar.gz 1530861 SHA256 b3779fd90353f12d8d72e89b1c901db35096358032626bbf062f433798c97e82 SHA512 ad10ce3877c0c06a9b1050ea3fb33ce205e2a289a8f8afb28be906a93c26c7da9fdd2b5ae9f5db260525c939013e20fa1b0092bc3c5081cc8b22a44946d633b8 WHIRLPOOL e413244baa9449de4a26ff8c54af168c01a5aec5082793076e1f60b3607182a302011141b7db52bdf571d295a10f81656d71857a634460fef91690fd14df0f70 +DIST keepassx-2.0.2.tar.gz 1532353 SHA256 204bdcf49c72078cd6f02b4f29b062923cca9e7b2d3551f2bf352763daa236b8 SHA512 3f661d3b5807c5acafc65310ecd8bd4d0bcd51a0c919e219bba616cb3f54434f8f81ba533ab5ccec00d454838355ff048f4ffbc308442fad4f973d1766b95072 WHIRLPOOL 0d793bb3ce4ba015ea9cabc1625c61bdf0cc7fabfe5be67fe09ea180a5fb3654ef850531bff7e09bdc47107d69bf06f5e94fa308dbb0b8d5f9468b3c02349810 DIST keepassx-2.0.tar.gz 1524638 SHA256 0eb40fac3a44d8283dfc1ee28cc6de5c660b22ab975472de82c2b04675c822e6 SHA512 6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788 WHIRLPOOL d325c491687b70e256f9312548451250dadfdda0c659b9b16a6fd8e0d39bdf5ced905e11646730619cf217e3afe3ad885428bf4cff3204dcf68bdd33510cb467 diff --git a/app-admin/keepassx/keepassx-2.0.2.ebuild b/app-admin/keepassx/keepassx-2.0.2.ebuild new file mode 100644 index 000000000000..947568054a51 --- /dev/null +++ b/app-admin/keepassx/keepassx-2.0.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils vcs-snapshot + +DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions" +HOMEPAGE="http://www.keepassx.org/" +SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz" + +LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +DEPEND=" + dev-libs/libgcrypt:0= + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qttest:4 + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXtst +" +RDEPEND="${DEPEND}" + +DOCS=(CHANGELOG) + +src_configure() { + local mycmakeargs=( + -DWITH_TESTS="$(usex test)" + ) + cmake-utils_src_configure +} diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest index f720394d4234..62b807421ce8 100644 --- a/app-admin/qtpass/Manifest +++ b/app-admin/qtpass/Manifest @@ -1 +1,2 @@ DIST qtpass-1.0.5.tar.gz 636461 SHA256 0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281 SHA512 e1b63f1058dc9c194f06376d52acbbb8594d429f4d7fe4ba27baed2cafe10b1c36137b3e33626c1bf33c7f3e1444e6fbe48fc66a83e0f7cd82f5b47f0193d178 WHIRLPOOL acb914d89bcd667343f648e38bb9eb316ebbf0b01f75686d3a7694e82eedd3e3f52ffc99f530bbe3ccbb6089ced727796924fcf48a94c071a3e20b27141b28df +DIST qtpass-1.1.0.tar.gz 671525 SHA256 60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6 SHA512 da7439f2c18c46cbf4df15538210051ad60d036334e62a1c4f62d6c1ccff8e4327fb0c6030ed89f78ffd87b615fcaae8ed5552099ff8663bff713990216132ae WHIRLPOOL 4288ee76762c41a81fece4b72bacb1560b28d5681ce288f5e9b5fd9257fd778e4038fc0c75951bdb2a967afdf6ac66035fc716606b1ad6148834fc4ca81dfe45 diff --git a/app-admin/qtpass/qtpass-1.1.0.ebuild b/app-admin/qtpass/qtpass-1.1.0.ebuild new file mode 100644 index 000000000000..c1737456934c --- /dev/null +++ b/app-admin/qtpass/qtpass-1.1.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qmake-utils + +DESCRIPTION="multi-platform GUI for pass, the standard unix password manager" +HOMEPAGE="https://qtpass.org/" +SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="+qt5" +DOCS=( FAQ.md README.md CONTRIBUTING.md ) + +RDEPEND="qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5[xcb] + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + ) + !qt5? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + app-admin/pass + net-misc/x11-ssh-askpass" +DEPEND="${RDEPEND} + qt5? ( + dev-qt/linguist-tools:5 + dev-qt/qtsvg:5 + ) + !qt5? ( dev-qt/qtsvg:4 )" + +src_prepare() { + # Modify install path + sed -i "s/target.path = \$\$PREFIX/target.path = \$\$PREFIX\/bin/" \ + ${PN}.pro \ + || die "sed failed to modify install path for ${PN}.pro" + + epatch_user +} + +src_configure() { + if use qt5 ; then + eqmake5 PREFIX="${D}"/usr + else + eqmake4 PREFIX="${D}"/usr + fi +} + +src_install() { + default + + insinto /usr/share/applications + doins "${PN}.desktop" + + newicon artwork/icon.svg "${PN}-icon.svg" +} diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 1454c3208d4d..cfcd19467a04 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -1,3 +1,4 @@ DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71 DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2 DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861 +DIST salt-2015.8.5.tar.gz 6877624 SHA256 db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 SHA512 715709798fd1f4410ef204545a84e34d3ecc0f080905b7ae29ce19d273c1ed6865f56e025e59d2506301970ad05081ff119caec0ced03dcbe5803f9f00eb64f8 WHIRLPOOL 69dc332b21ade4735cd8e9d6a2cdfd61ee364a1c7aa3bf047c9d745b6135b94fdd6406117e056fbb6a8cb79dc3b07af5d2f7a781930255b1fe434838b8692de4 diff --git a/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch b/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch new file mode 100644 index 000000000000..ca18f47acf79 --- /dev/null +++ b/app-admin/salt/files/salt-2015.8.4-boto-vpc-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/unit/modules/boto_vpc_test.py b/tests/unit/modules/boto_vpc_test.py +index 0768790..bb89d47 100644 +--- a/tests/unit/modules/boto_vpc_test.py ++++ b/tests/unit/modules/boto_vpc_test.py +@@ -493,7 +493,7 @@ class BotoVpcTestCase(BotoVpcTestCaseBase, BotoVpcTestCaseMixin): + + vpc_properties = dict(id=vpc.id, + cidr_block=six.text_type(cidr_block), +- is_default=False, ++ is_default=None, + state=u'available', + tags={u'Name': u'test', u'test': u'testvalue'}, + dhcp_options_id=u'dopt-7a8b9c2d', diff --git a/app-admin/salt/salt-2015.8.5.ebuild b/app-admin/salt/salt-2015.8.5.ebuild new file mode 100644 index 000000000000..669ea91d430b --- /dev/null +++ b/app-admin/salt/salt-2015.8.5.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python2_7) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="http://saltstack.org/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=(README.rst AUTHORS) + +REQUIRED_USE="|| ( raet zeromq )" + +PATCHES=( + "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" + "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" + "${FILESDIR}/${PN}-2015.8.4-boto-vpc-test.patch" +) + +python_prepare() { + # this test fails because it trys to "pip install distribute" + rm tests/unit/{modules,states}/zcbuildout_test.py \ + tests/unit/modules/{rh_ip,win_network,random_org}_test.py +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -dup /tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + + ( + cleanup() { rm -f "${tempdir}"; } + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-antivirus/skyldav/files/skyldav-0.5-conf.patch b/app-antivirus/skyldav/files/skyldav-0.5-conf-r1.patch similarity index 81% rename from app-antivirus/skyldav/files/skyldav-0.5-conf.patch rename to app-antivirus/skyldav/files/skyldav-0.5-conf-r1.patch index 8255f7a20d12..86b78c335b92 100644 --- a/app-antivirus/skyldav/files/skyldav-0.5-conf.patch +++ b/app-antivirus/skyldav/files/skyldav-0.5-conf-r1.patch @@ -1,11 +1,13 @@ diff -urN skyldav-0.5.orig/examples/etc/skyldav.conf skyldav-0.5/examples/etc/skyldav.conf --- skyldav-0.5.orig/examples/etc/skyldav.conf 2015-02-15 20:32:57.000000000 +0100 -+++ skyldav-0.5/examples/etc/skyldav.conf 2016-01-21 14:02:27.656666425 +0100 -@@ -19,14 +19,21 @@ ++++ skyldav-0.5/examples/etc/skyldav.conf 2016-02-01 11:29:19.449054900 +0100 +@@ -19,14 +19,23 @@ # Directories that shall not be scanned (including subdirectories) # EXCLUDE_PATH = /var/noscan, /opt/noscan -+EXCLUDE_PATH = /usr/portage, /var/db/pkg, /var/tmp/portage, /var/tmp/binpkgs ++# ++# Exclude various portage directories for performance reasons ++EXCLUDE_PATH = /usr/portage, /var/cache/edb, /var/db/pkg, /var/tmp/portage, /var/tmp/binpkgs, /var/log/portage # File systems that are local, virus scan results may be cached. # LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat diff --git a/app-antivirus/skyldav/skyldav-0.5-r1.ebuild b/app-antivirus/skyldav/skyldav-0.5-r2.ebuild similarity index 90% rename from app-antivirus/skyldav/skyldav-0.5-r1.ebuild rename to app-antivirus/skyldav/skyldav-0.5-r2.ebuild index 3175fc8e1c82..9b78b0a7782e 100644 --- a/app-antivirus/skyldav/skyldav-0.5-r1.ebuild +++ b/app-antivirus/skyldav/skyldav-0.5-r2.ebuild @@ -49,7 +49,7 @@ DOCS=( AUTHORS NEWS README ) PATCHES=( "${FILESDIR}/${P}-syslog.patch" "${FILESDIR}/${P}-examples.patch" - "${FILESDIR}/${P}-conf.patch" + "${FILESDIR}/${P}-conf-r1.patch" ) pkg_setup() { @@ -60,18 +60,18 @@ pkg_setup() { ## define contents for README.gentoo if use systemd; then - DOC_CONTENTS='SkyldAV provides a systemd service.'$'\n' + DOC_CONTENTS='Skyld AV provides a systemd service.'$'\n' DOC_CONTENTS+='Please edit the systemd service config file to match your needs:'$'\n' DOC_CONTENTS+='/etc/systemd/system/skyldav.service.d/00gentoo.conf'$'\n' DOC_CONTENTS+='# systemctl daemon-reload'$'\n' DOC_CONTENTS+='# systemctl restart skyldav.service'$'\n' - DOC_CONTENTS+='Example for enabling the SkyldAV service:'$'\n' + DOC_CONTENTS+='Example for enabling the Skyld AV service:'$'\n' DOC_CONTENTS+='# systemctl enable skyldav.service'$'\n' else - DOC_CONTENTS='SkyldAV provides an init script for OpenRC.'$'\n' + DOC_CONTENTS='Skyld AV provides an init script for OpenRC.'$'\n' DOC_CONTENTS+='Please edit the init script config file to match your needs:'$'\n' DOC_CONTENTS+='/etc/conf.d/skyldav'$'\n' - DOC_CONTENTS+='Example for enabling the SkyldAV init script:'$'\n' + DOC_CONTENTS+='Example for enabling the Skyld AV init script:'$'\n' DOC_CONTENTS+='# rc-update add skyldav default'$'\n' fi } diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild index 0d5fd6e46c34..4ca5eca6c966 100644 --- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN/-utils}-${PV/_}" SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR}/${MY_P} EXTRA_DEPEND= fi diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index bf59f2bec5d9..fb06b5b692ec 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -1,4 +1,4 @@ -DIST bacula-5.0.3.tar.gz 3800556 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4 SHA512 feb4a7333b4c898aec175c6e8b45ce5d4eb6e15100a9f27c6010e1a17b44133b7d181d25419e923321d8bd7147d85342bf1e0dca8387d6e9cd269a0e2fec4626 WHIRLPOOL 65a900cc740a300b509a02d953ec5265e3cfbd2ce85d8e40b47e1f1fdd6d77885ec48e68471cc559accd6707fdd9f1cbb34fba22371e806d404abed052a168fb DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8 SHA512 dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 WHIRLPOOL f559a3650ae45e149a80cdc74ab84e32c94f492321c2222c18003bacfb6690615befc3a37826055f6c436a4af6ace4b81497181f2ec4f641b0ad3a13817488a7 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5 DIST bacula-7.2.0.tar.gz 3301720 SHA256 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c SHA512 ff50db48039c9040d4995f53a8d83ad6e5568da254527d07cfe450bf0e4a25717387b5e4aa9f29197c284f513240e714c48d8232d7d7edb9159afbc13cd0cd54 WHIRLPOOL 17f5b19a6fb9bf2a05e79663c7810358cf79aebad7f2709a01fadf15d5d494a243290e9c66e30c8b9bde6a627e238b77c1853a0d40891c5f5f4b390ae0ded1e5 +DIST bacula-7.4.0.tar.gz 3314218 SHA256 fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb SHA512 615cb4d9a4fd597bc794b6d4c901c777d544472f3f5b6e1cdc74d8e41279a3fd0bd6d2c30511095933a3a47a7f24da4372c538ab472eb48c0fb1db59c2a59e1a WHIRLPOOL 669d0e4de172fb1c35a3a5a91e371aa2b87cd90f664974de8dcdf1677f442ac269f66c430627c81ea8a17bf02dd54590158b8b09e0c110ac32e83e0a0d41861d diff --git a/app-backup/bacula/bacula-5.2.13-r3.ebuild b/app-backup/bacula/bacula-5.2.13-r3.ebuild index 933fc9765ebc..724f29b789ee 100644 --- a/app-backup/bacula/bacula-5.2.13-r3.ebuild +++ b/app-backup/bacula/bacula-5.2.13-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,9 +22,9 @@ KEYWORDS=" ~amd64 ~ppc ~sparc ~x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres python qt4 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" - dev-libs/gmp + dev-libs/gmp:0 !bacula-clientonly? ( - postgres? ( dev-db/postgresql[threads] ) + postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) @@ -35,20 +35,20 @@ DEPEND=" ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( >=sys-libs/readline-4.1 ) + readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] - sys-libs/ncurses[static-libs] - ssl? ( dev-libs/openssl[static-libs] ) + sys-libs/ncurses:=[static-libs] + ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo - sys-libs/ncurses - ssl? ( dev-libs/openssl ) + sys-libs/ncurses:= + ssl? ( dev-libs/openssl:0 ) ) python? ( ${PYTHON_DEPS} ) " diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild index e4f77ed0bfb5..f25dd74ac820 100644 --- a/app-backup/bacula/bacula-7.0.5-r1.ebuild +++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,9 +19,9 @@ KEYWORDS="amd64 ppc sparc x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" - dev-libs/gmp + dev-libs/gmp:0 !bacula-clientonly? ( - postgres? ( dev-db/postgresql[threads] ) + postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) @@ -32,20 +32,20 @@ DEPEND=" ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( >=sys-libs/readline-4.1 ) + readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] - sys-libs/ncurses[static-libs] - ssl? ( dev-libs/openssl[static-libs] ) + sys-libs/ncurses:=[static-libs] + ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo - sys-libs/ncurses - ssl? ( dev-libs/openssl ) + sys-libs/ncurses:= + ssl? ( dev-libs/openssl:0 ) )" RDEPEND="${DEPEND} !bacula-clientonly? ( diff --git a/app-backup/bacula/bacula-7.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild index 77a260bd5a69..df443ebf7454 100644 --- a/app-backup/bacula/bacula-7.2.0.ebuild +++ b/app-backup/bacula/bacula-7.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,9 +19,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" - dev-libs/gmp + dev-libs/gmp:0 !bacula-clientonly? ( - postgres? ( dev-db/postgresql[threads] ) + postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) @@ -32,20 +32,20 @@ DEPEND=" ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( >=sys-libs/readline-4.1 ) + readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] - sys-libs/ncurses[static-libs] - ssl? ( dev-libs/openssl[static-libs] ) + sys-libs/ncurses:=[static-libs] + ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo - sys-libs/ncurses - ssl? ( dev-libs/openssl ) + sys-libs/ncurses:= + ssl? ( dev-libs/openssl:0 ) )" RDEPEND="${DEPEND} !bacula-clientonly? ( diff --git a/app-backup/bacula/bacula-5.0.3-r4.ebuild b/app-backup/bacula/bacula-7.4.0.ebuild similarity index 77% rename from app-backup/bacula/bacula-5.0.3-r4.ebuild rename to app-backup/bacula/bacula-7.4.0.ebuild index 10565efe0d55..3303bfbbe3ae 100644 --- a/app-backup/bacula/bacula-5.0.3-r4.ebuild +++ b/app-backup/bacula/bacula-7.4.0.ebuild @@ -1,38 +1,27 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit eutils multilib python-single-r1 qt4-r2 user libtool +inherit eutils multilib qt4-r2 systemd user libtool MY_PV=${PV/_beta/-b} MY_P=${PN}-${MY_PV} -#DOC_VER="${MY_PV}" DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="http://www.bacula.org/" - -#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2" SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" -# doc? ( ${DOC_SRC_URI} ) LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X" -# maintainer comment: -# postgresql-base should have USE=threads (see bug 326333) but fails to build -# atm with it (see bug #300964) DEPEND=" - >=sys-libs/zlib-1.1.4 - dev-libs/gmp + dev-libs/gmp:0 !bacula-clientonly? ( - postgres? ( dev-db/postgresql[threads] ) + postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) @@ -43,21 +32,21 @@ DEPEND=" ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( >=sys-libs/readline-4.1 ) + readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] - sys-libs/ncurses[static-libs] - ssl? ( dev-libs/openssl[static-libs] ) + dev-libs/lzo[static-libs] + sys-libs/ncurses:=[static-libs] + ssl? ( dev-libs/openssl:0[static-libs] ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib - sys-libs/ncurses - ssl? ( dev-libs/openssl ) - ) - python? ( ${PYTHON_DEPS} ) - " + dev-libs/lzo + sys-libs/ncurses:= + ssl? ( dev-libs/openssl:0 ) + )" RDEPEND="${DEPEND} !bacula-clientonly? ( !bacula-nosd? ( @@ -68,8 +57,7 @@ RDEPEND="${DEPEND} vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) - static? ( bacula-clientonly ) - python? ( ${PYTHON_REQUIRED_USE} )" + static? ( bacula-clientonly )" S=${WORKDIR}/${MY_P} @@ -103,8 +91,6 @@ pkg_setup() { einfo fi fi - - use python && python-single-r1_pkg_setup } src_prepare() { @@ -120,32 +106,46 @@ src_prepare() { done popd >&/dev/null || die + # bug 466688 drop deprecated categories from Desktop file + sed -i -e 's/Application;//' scripts/bat.desktop.in || die + + # bug 466690 Use CXXFLAGS instead of CFLAGS + sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + # drop automatic install of unneeded documentation (for bug 356499) - epatch "${FILESDIR}"/${PV}/${P}-doc.patch + epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch # bug #310087 - epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch + epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch # bug #311161 - epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch - - # stop build for errors in subdirs - epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch + epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch # bat needs to respect LDFLAGS - epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch + epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch # bug #328701 - epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch + epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch + + epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.patch + + # do not strip binaries + sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die + sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - epatch "${FILESDIR}"/${PV}/${P}-fix-static.patch + # fix file not found error during make depend + epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - # fix CVE-2012-4430 - epatch "${FILESDIR}"/${PV}/${P}-cve.patch + # Fix systemd unit files: + # bug 497748 + sed -i -e '/Requires/d' platforms/systemd/*.service.in || die + sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die + # bug 504370 + sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. - # It is only needed by i autoconf and gives errors during elibtoolize. + # It is only needed by autoconf and gives errors during elibtoolize. mv autoconf/libtool autoconf/libtool1 || die elibtoolize } @@ -178,9 +178,7 @@ src_configure() { fi myconf="${myconf} \ - --disable-tray-monitor \ $(use_with X x) \ - $(use_with python) \ $(use_enable !readline conio) \ $(use_enable readline) \ $(use_with readline readline /usr) \ @@ -197,7 +195,9 @@ src_configure() { --sysconfdir=/etc/bacula \ --with-subsys-dir=/var/lock/subsys \ --with-working-dir=/var/lib/bacula \ + --with-logdir=/var/lib/bacula \ --with-scriptdir=/usr/libexec/bacula \ + --with-systemd=$(systemd_get_unitdir) \ --with-dir-user=bacula \ --with-dir-group=bacula \ --with-sd-user=root \ @@ -225,9 +225,9 @@ src_install() { emake DESTDIR="${D}" install doicon scripts/bacula.png - # install bat when enabled (for some reason ./configure doesn't pick this up) + # install bat icon and desktop file when enabled + # (for some reason ./configure doesn't pick this up) if use qt4 && ! use static ; then - dosbin "${S}"/src/qt-console/.libs/bat doicon src/qt-console/images/bat_icon.png domenu scripts/bat.desktop fi @@ -272,7 +272,6 @@ src_install() { fi fi - rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1* if ! use qt4; then rm -vf "${D}"/usr/share/man/man1/bat.1* fi @@ -302,7 +301,13 @@ src_install() { fi # documentation - dodoc ChangeLog ReleaseNotes SUPPORT technotes + dodoc ChangeLog ReleaseNotes SUPPORT + + # install examples (bug #457504) + if use examples; then + docinto examples/ + dodoc -r examples/* + fi # vim-files if use vim-syntax; then @@ -351,6 +356,8 @@ src_install() { newconfd "${T}/${script}".confd "${script}" done + systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service + # make sure the working directory exists diropts -m0750 keepdir /var/lib/bacula @@ -373,6 +380,20 @@ pkg_postinst() { einfo " /usr/libexec/bacula/make_${mydbtype}_tables" einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" einfo + + ewarn "ATTENTION!" + ewarn "The format of the database may have changed." + ewarn "If you just upgraded from a version below 7.2.0 you must run" + ewarn "'update_bacula_tables' now." + ewarn "Make sure to have a backup of your catalog before." + ewarn + fi + + if use sqlite; then + einfo + einfo "Be aware that Bacula does not officially support SQLite database anymore." + einfo "Best use it only for a client-only installation. See Bug #445540." + einfo fi einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" diff --git a/app-benchmarks/bonnie++/metadata.xml b/app-benchmarks/bonnie++/metadata.xml index e1a4252e0705..08e898292749 100644 --- a/app-benchmarks/bonnie++/metadata.xml +++ b/app-benchmarks/bonnie++/metadata.xml @@ -2,7 +2,7 @@ - gokturk@binghamton.edu> + gokturk@binghamton.edu Göktürk Yüksek please assign bugs to diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml index 7d279a80345c..5d5529c3de77 100644 --- a/app-benchmarks/filebench/metadata.xml +++ b/app-benchmarks/filebench/metadata.xml @@ -2,7 +2,7 @@ - gokturk@binghamton.edu> + gokturk@binghamton.edu Göktürk Yüksek please assign bugs to diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest index d48ba771d618..f38a307922ad 100644 --- a/app-crypt/acme/Manifest +++ b/app-crypt/acme/Manifest @@ -1 +1 @@ -DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572 +DIST letsencrypt-0.3.0.tar.gz 627761 SHA256 a21e496ab130cf9fcaeef69019a4eef7aaf86dad84131d601db531add4f98e1a SHA512 c3fbb6d8a50ee9a84b425d16f28626cecb3b50a5149c1263d02d447854d9117c6fe4f3f2eef7f026c9d7692a499a054895a2b007da9f768c203ea91836382f36 WHIRLPOOL fa87cb033c4a45737abeb706312ac9c4fa2ab921c07cc05f1feaeb4f083727f4ba1a819035345e5dfead536d762025ef8a4eeaa6d039b64efa3350f2a64e64a5 diff --git a/app-crypt/acme/acme-0.2.0.ebuild b/app-crypt/acme/acme-0.3.0.ebuild similarity index 100% rename from app-crypt/acme/acme-0.2.0.ebuild rename to app-crypt/acme/acme-0.3.0.ebuild diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest index f1fa3a85ccdf..34355848ab54 100644 --- a/app-crypt/easy-rsa/Manifest +++ b/app-crypt/easy-rsa/Manifest @@ -1,2 +1,2 @@ DIST EasyRSA-2.2.2.tgz 10492 SHA256 68da869085dde7c6a964e9c6104b86e4af91c4c592f8ec2a2f6cfc9d20808991 SHA512 b09bd1a71c1bfeb3c2ff63f10b7781badf6d2b4888d97d917565436435b85fb90eebf7727db293bdc44039f23c7f3c3c4e762a22bf7d6e9ed7642a2f07e1ffe4 WHIRLPOOL 27b7d761a317d8787526dbdc1878e62326e6ca13730ddf9b50fe918f010c23d1535dfa4f6bfb76bf26bd005942105a0e862359579faf7b6fe803ad7ca53d627e -DIST easy-rsa-2.2.0_master.tar.gz 80460 SHA256 d23ddc3a764b40d03ada76f387c92ae4dcf4f5266da54c2bae130325b05eebe2 SHA512 81b5d6e805c5d9fcadf6425dbc311b6a151d857cb837ce9b419b653ee546e5742d13864d25e9ab8caffee95e5116d1611323288e80c65c3c88730533919e2fb4 WHIRLPOOL ff65ca8e3b47123aa3765937d508682afe51c9831e8dbc3e57cb5000088cc69ad5e086618e647e90677481c2d5e7d34733fd7ba50a067810e1a42c876d348823 +DIST EasyRSA-3.0.1.tgz 40960 SHA256 dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e SHA512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f WHIRLPOOL 64d54af059e136409f4ad3488450cccc846e2b5d9dfb9e002dd466cf603b6677dc8f0b788471b73eebda918c5773673efc120e6a76dbf407a3e1605db14e62cd diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild deleted file mode 100644 index 59e09d68bfb5..000000000000 --- a/app-crypt/easy-rsa/easy-rsa-2.2.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils - -DESCRIPTION="Small RSA key management package, based on OpenSSL" -HOMEPAGE="http://openvpn.net/" -SRC_URI="http://swupdate.openvpn.net/community/releases/${P}_master.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86" -IUSE="" - -DEPEND=">=dev-libs/openssl-0.9.6:0" -RDEPEND="${DEPEND} - ! - djc@gentoo.org - Dirkjan Ochtman + mrueg@gentoo.org + Manuel Rüger OpenVPN/easy-rsa diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest index d48ba771d618..f38a307922ad 100644 --- a/app-crypt/letsencrypt/Manifest +++ b/app-crypt/letsencrypt/Manifest @@ -1 +1 @@ -DIST letsencrypt-0.2.0.tar.gz 564016 SHA256 71324323eb6c9fe9a2cee95f012a44e9c7bdc8c9dfe14c26d56129306f188650 SHA512 a00618c0f3ae78cfdb70adfea81ff9d672123fa38585cfda8ed44659be14bd37143f2c5bc076b92d116356437ea08af079142a4ae09a8a6ad06f2793276b973e WHIRLPOOL cd413fd1ca4d2e462bcc573c8b0403010cfc27dca577c56c1465e5d794e7769a0621bac361078762eec12f2296d968421572cb8794cb1a49824b37292dbab572 +DIST letsencrypt-0.3.0.tar.gz 627761 SHA256 a21e496ab130cf9fcaeef69019a4eef7aaf86dad84131d601db531add4f98e1a SHA512 c3fbb6d8a50ee9a84b425d16f28626cecb3b50a5149c1263d02d447854d9117c6fe4f3f2eef7f026c9d7692a499a054895a2b007da9f768c203ea91836382f36 WHIRLPOOL fa87cb033c4a45737abeb706312ac9c4fa2ab921c07cc05f1feaeb4f083727f4ba1a819035345e5dfead536d762025ef8a4eeaa6d039b64efa3350f2a64e64a5 diff --git a/app-crypt/letsencrypt/letsencrypt-0.2.0.ebuild b/app-crypt/letsencrypt/letsencrypt-0.3.0.ebuild similarity index 96% rename from app-crypt/letsencrypt/letsencrypt-0.2.0.ebuild rename to app-crypt/letsencrypt/letsencrypt-0.3.0.ebuild index baf81fa53f3c..0ef00d4fa434 100644 --- a/app-crypt/letsencrypt/letsencrypt-0.2.0.ebuild +++ b/app-crypt/letsencrypt/letsencrypt-0.3.0.ebuild @@ -29,7 +29,7 @@ RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}] >=dev-python/cryptography-0.7[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/parsedatetime[${PYTHON_USEDEP}] - >=dev-python/psutil-2.1.0[${PYTHON_USEDEP}] + >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}] diff --git a/app-crypt/letsencrypt/letsencrypt-9999.ebuild b/app-crypt/letsencrypt/letsencrypt-9999.ebuild index baf81fa53f3c..0ef00d4fa434 100644 --- a/app-crypt/letsencrypt/letsencrypt-9999.ebuild +++ b/app-crypt/letsencrypt/letsencrypt-9999.ebuild @@ -29,7 +29,7 @@ RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}] >=dev-python/cryptography-0.7[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/parsedatetime[${PYTHON_USEDEP}] - >=dev-python/psutil-2.1.0[${PYTHON_USEDEP}] + >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}] dev-python/pyrfc3339[${PYTHON_USEDEP}] >=dev-python/pythondialog-3.2.2:python-2[${PYTHON_USEDEP}] diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml index 18d51ff808f9..defaad06f8c3 100644 --- a/app-editors/diakonos/metadata.xml +++ b/app-editors/diakonos/metadata.xml @@ -2,6 +2,6 @@ - maintainer-neededgentoo.org + maintainer-needed@gentoo.org diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest index b55fc3de09aa..5cba485570bd 100644 --- a/app-editors/le/Manifest +++ b/app-editors/le/Manifest @@ -1 +1,2 @@ DIST le-1.14.3.tar.lzma 392205 SHA256 dae1222168f388f0aa264bb2849df50ce0a51f565257327409adf5076c6b4379 SHA512 5f09680ba365d80a71dcb09975d2347c0dcb725b8db6c08588fadd82a3a844bd370c3de597b644c57ecfed1c4557d22544a6e9aee6323b1e43f6d8c423843339 WHIRLPOOL 2cee978d8eadea0d213e514318f3ce780d037ce1059503441ad625e09033f2149579496d6effe9508a5059b7c0c10976970c641c0177b2918e8607ce05b2e960 +DIST le-1.16.1.tar.gz 977143 SHA256 54b7382054f69f4af8a9098d196c6463508219f5d4ceb46c1628165861e786b5 SHA512 77dda0a3c9cf98d9775937373eed2489f22b641ed870f3152cd59dacff373844f5d8d85f4df864c396b812995625bcdb8f5444de93336495ecb1ea7df27e464e WHIRLPOOL d8367cb0ecbad6e47151c509168a962d91f5eebb5e1b15fbcde8b7158d933a47e1c599ef4188ecf1e64ab85c64641b8bfb25f05fafb41da0587f907ce0d80988 diff --git a/app-editors/le/le-1.14.3.ebuild b/app-editors/le/le-1.14.3.ebuild index 28d20c48be2b..91a3b3292df7 100644 --- a/app-editors/le/le-1.14.3.ebuild +++ b/app-editors/le/le-1.14.3.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 + DESCRIPTION="Terminal text editor" HOMEPAGE="https://www.gnu.org/directory/text/editors/le-editor.html" SRC_URI="ftp://ftp.yars.free.net/pub/source/le/le-${PV}.tar.lzma" @@ -11,11 +13,11 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -RDEPEND=">=sys-libs/ncurses-5.2-r5" +RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND} app-arch/xz-utils" src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO } diff --git a/app-editors/le/le-1.16.1.ebuild b/app-editors/le/le-1.16.1.ebuild new file mode 100644 index 000000000000..e4191a21505e --- /dev/null +++ b/app-editors/le/le-1.16.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Terminal text editor" +HOMEPAGE="http://lav.yar.ru/programs.html" +SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND} + app-arch/xz-utils" + +src_install() { + emake DESTDIR="${D}" install + dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO +} diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml index 097975e3adc2..5f22208aec43 100644 --- a/app-editors/le/metadata.xml +++ b/app-editors/le/metadata.xml @@ -1,4 +1,13 @@ + + gentoo@schellstede.de + Gerold Schellstede + Proxy maintainer - assign bugs to him + + + proxy-maint@gentoo.org + Proxy Maintainers + diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest index 4ecb6334be7b..b6d422822e04 100644 --- a/app-emacs/magit/Manifest +++ b/app-emacs/magit/Manifest @@ -2,3 +2,5 @@ DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca DIST magit-2.2.2.tar.gz 244326 SHA256 08e61898e23dbeb3a152d82e58fc9f6c769fe36d35d87617dcd1e69b2f91b3c6 SHA512 fcb8a27597988fd29b824be58b145f483a492a0d199e505478cf7cab09068a608e5e9d314abda7e8954712c2db3012ee578c8a5bbdfd79e909a8b9d1ef45e0d4 WHIRLPOOL f45d4bfe3942d4203918b8c5309b640efcb9204d7a05f74df746349d9a49ae40df34d744d91388db23e718fc7579e303ea0a704d7f30235efbf63b9da360082a DIST magit-2.3.1.tar.gz 262976 SHA256 ee9574dc20cd078d62d669dc19caf8ffc29480a01184d6bc5e90cfa6c800ddf2 SHA512 3c640887263dd5284a446b396975495878b33f1f1b2a2d76f657beb921099acb27dd8a036cb38f2b00e21c0d30b3b412bec26921d3d960e8be79b28cd327c713 WHIRLPOOL a8d017f89cfb327e7ca5ef02ca6c0e90b67b6e80e5b403858a3c65d8c25d348f6a21f34a69ad4bdf06b0eaa5b850b0d107029a7915aef51f42a4f5a9c72ced23 DIST magit-2.4.0.tar.gz 277515 SHA256 57b7198970d6f10f822964db67661313fed5c9ceff519c8eacc1003328a96af1 SHA512 5e06064c5baa38e279f4fcba7d133bf2e00d3eaed55af101f792f5ef894353aef1d71d0d62e4d5f10f6853f81f4d89daff026518476c465830ac51c221d94ec0 WHIRLPOOL 82f98830a93a3d36288aedfc4f7d30d7b8b26521f2b4c241c5f63acd8ed20fc1996ce4a505ba83cd36426d937dabf779fdc7351353eb4c5710cefdf906b28aa6 +DIST magit-2.4.1.tar.gz 275628 SHA256 f53fc3cb94692d3f3c157f1156be373c763cabefb9e524b4a3b5ccb56a74e8e3 SHA512 a2ae4749766f7353e4042fa4200a8575933516554ba64e5ea3a76d587cc002d2a89da089eb85776c9940171a2b8c09f60f10303ae5208610445357aa8c488224 WHIRLPOOL 4b9dd74c99a915ef0c92bcfc608c8bdb23acd1fa7f454ac994bf748b08fe67c873559ea4a5f0c9d494ca80c178c2bbe447dcbdf2e3e747352c1cbe31e3c4d1ed +DIST magit-2.5.0.tar.gz 269518 SHA256 aaebcea4317c5f3a92f4d106e5196e5803171f6251c1c69c9f84fdaf4bbfd844 SHA512 02cc70bff28263351a781bf695bc3013e20bcdf027ce3495230928705ffdef9afd588d7de689cb40427ecc5fe4a6df1ccb2fb53321521db99dea2a2ddac2435f WHIRLPOOL a8d0cce7bcb9348f3ed7c53b7fe65a50b54c75507588235a1c5bd029c490ed4f61582cfb686fdb93e1d3c1a6c7ca42f5ef6afbb3b097a429deb4e89d62e73e4e diff --git a/app-emacs/magit/magit-2.4.1.ebuild b/app-emacs/magit/magit-2.4.1.ebuild new file mode 100644 index 000000000000..7a258ff2a713 --- /dev/null +++ b/app-emacs/magit/magit-2.4.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +NEED_EMACS=24 + +inherit elisp + +DESCRIPTION="A Git porcelain inside Emacs" +HOMEPAGE="http://magit.vc/" +SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${P}/lisp" +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="../Documentation/*.texi" +DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt" + +DEPEND=">=app-emacs/dash-2.12.1" +RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4" diff --git a/app-emacs/magit/magit-2.5.0.ebuild b/app-emacs/magit/magit-2.5.0.ebuild new file mode 100644 index 000000000000..cf776f7a1f49 --- /dev/null +++ b/app-emacs/magit/magit-2.5.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +NEED_EMACS=24 + +inherit elisp + +DESCRIPTION="A Git porcelain inside Emacs" +HOMEPAGE="http://magit.vc/" +SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${P}/lisp" +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="../Documentation/*.texi" +DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt" + +DEPEND=">=app-emacs/dash-2.12.1 >=app-emacs/with-editor-2.5.0" +RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4" diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest new file mode 100644 index 000000000000..1e7142962518 --- /dev/null +++ b/app-emacs/with-editor/Manifest @@ -0,0 +1 @@ +DIST with-editor-2.5.0.tar.gz 14940 SHA256 8091465eefee4057a4a0daab72db1f2f0415e2abfe965d1e8b8206f3031aeba5 SHA512 aae01ebc2f5922af1742648eb5e25ccadcf460118c872caa2b79c2139ec85ae13a59ca63880c3d077eb846d333323d054341916b5439acd97fa3ca1a62847533 WHIRLPOOL 85c5959a5644cfd4f00200dac76dc8bc4e0598c144d3138bec72194bf4b5557dc2c9c6ec77c70a86c0c8e04bbebe0df1c34418387168ae5479936ac0c63140e2 diff --git a/app-emacs/with-editor/files/50with-editor-gentoo.el b/app-emacs/with-editor/files/50with-editor-gentoo.el new file mode 100644 index 000000000000..431f7e90ae73 --- /dev/null +++ b/app-emacs/with-editor/files/50with-editor-gentoo.el @@ -0,0 +1 @@ +(add-to-list 'load-path "@SITELISP@") diff --git a/app-emacs/with-editor/metadata.xml b/app-emacs/with-editor/metadata.xml new file mode 100644 index 000000000000..dabf564478f9 --- /dev/null +++ b/app-emacs/with-editor/metadata.xml @@ -0,0 +1,18 @@ + + + + + gnu-emacs@gentoo.org + Gentoo GNU Emacs project + + + This library makes it possible to reliably use the Emacsclient as + the $EDITOR of child processes. It makes sure that they know how to + call home. For remote processes a substitute is provided, which + communicates with Emacs on standard output/input instead of using a + socket as the Emacsclient does. + + + magit/with-editor + + diff --git a/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild new file mode 100644 index 000000000000..91902d2def2b --- /dev/null +++ b/app-emacs/with-editor/with-editor-2.5.0-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +NEED_EMACS=24 + +inherit elisp + +DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes" +HOMEPAGE="http://magit.vc/manual/with-editor" +SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="*.texi" +DOCS="README.md with-editor.org" + +# Versions of magit before 2.5.0 bundled with-editor +RDEPEND="!! "${testfile}" + done + + # take the sledgehammer approach to bug #526270 + grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' + + [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh + rm autotools/missing + eautoreconf +} + +src_configure () { + # this is kind of a hack to work around the removal of the qemu-kvm wrapper + local kvm_arch + + if use amd64; then + kvm_arch=x86_64 + elif use x86; then + kvm_arch=i386 + elif use kvm; then + die "Could not determine qemu system to use for kvm" + fi + + econf --localstatedir=/var \ + --sharedstatedir=/var \ + --disable-symlinks \ + --docdir=/usr/share/doc/${P} \ + --with-ssh-initscript=/etc/init.d/sshd \ + --with-export-dir=/var/lib/ganeti-storage/export \ + --with-os-search-path=/usr/share/${PN}/os \ + $(use_enable test haskell-tests) \ + $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ + $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ + $(use_enable syslog) \ + $(use_enable monitoring) \ + $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ + $(usex haskell-daemons "--enable-confd=haskell" '' '' '') +} + +src_install () { + emake V=1 DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} + newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} + + if use kvm; then + newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff + newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff + fi + + # ganeti installs it's own docs in a generic location + rm -rf "${D}"/{usr/share/doc/${PN},run} + + sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion + newbashcomp doc/examples/bash_completion gnt-instance + bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ + h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ + gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} + + dodoc INSTALL UPGRADE NEWS README doc/*.rst + dohtml -r doc/html/* doc/css/*.css + + docinto examples + dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf + + docinto examples/hooks + dodoc doc/examples/hooks/{ipsec,ethers} + + insinto /etc/cron.d + newins doc/examples/ganeti.cron ${PN} + + insinto /etc/logrotate.d + newins doc/examples/ganeti.logrotate ${PN} + + # need to dodir rather than keepdir here (bug #552482) + dodir /var/lib/${PN} + + keepdir /var/log/${PN}/ + keepdir /usr/share/${PN}/${SERIES}/os/ + keepdir /var/lib/ganeti-storage/{export,file,shared}/ + + dosym ${SERIES} "/usr/share/${PN}/default" + dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" + + python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} +} + +pkg_postinst() { + if use multiple-users; then + elog "You have enable multiple user support, the users for this must" + elog "be created. You can use the provided tool for this, which is" + elog "located at:" + elog " /usr/$(get_libdir)/${PN}/tools/users-setup" + fi +} + +src_test () { + PATH="${S}/scripts:${S}/src:${PATH}" \ + TMPDIR="/tmp" \ + GANETI_MASTER="$(hostname -f)" \ + emake check || die "emake check failed" +} diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index a7622e1e11bf..16ca1d022fd7 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -2,3 +2,4 @@ DIST libvirt-1.2.21-20151222.tar.xz 1684 SHA256 6c97f288470ec58bcbe98507563c6a19 DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650 DIST libvirt-1.3.0-20151222.tar.xz 1684 SHA256 3628c3398862eae2966ccf0e55822e4cb8f47e6e8c1b0d17b6fdb9f69dc5490b SHA512 71c8dabc9cb8ead2858bf2d77d3831db59ac34076c99a4ae607c7bb4678b0af28a9f31fdca047ee174237f0e91fbb8db3a843e605256514e1d0ad527fc412275 WHIRLPOOL 47ebd21dd7d17812b8e97ebb70453574550cac18b0cf88cd38c152565d1e01f725a6da90878c41c7836a59318c1294859870e5bb523981954618fdde6704360e DIST libvirt-1.3.0.tar.gz 30114683 SHA256 ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64 SHA512 e252390a05b76e9cd9ed02caadd0ee0d674505f60940bb6ced955e17f69c7dd55fe5b38204ae5c25b6e5703415a0f6a12fc545d138d0e8b016457a85dc8fa2b8 WHIRLPOOL 852c592b27be86d3fb2ec75ca5debf9a1e0ac5de6d1ab06c55c2d70e83de125d10c2fc967b7578fba9137ed7a30b7a7e195f4e5f8d35708deeeddc97424d5e40 +DIST libvirt-1.3.1.tar.gz 29900143 SHA256 a5d43fbed34d31eeffc641d2ac9b6026a57bf1a4fa74d0fa19a9891d9ec2c21a SHA512 a109c09d947f7c5e924fdbc9c9b6c0a9d6ff64d9411aedd9a3e710d20f749b088ff9895e882dd888b88bfea7724a8933534be4078f16cb9d2047da761515e804 WHIRLPOOL 62fb8486bfa53d55b397d9a90750d32a83f0a73cf2e6685f296489390abf9c62efc69fecd6d011fc51e9f562f75f5b8ce03208c350e98d20de0a5560721c675e diff --git a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch index 8e19c0fd77b1..c6082952817b 100644 --- a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch +++ b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch @@ -1,18 +1,3 @@ -From bde898de482645f6963b673e8ff0b486a0a6db25 Mon Sep 17 00:00:00 2001 -From: Matthias Maier -Date: Tue, 28 Jul 2015 11:10:59 -0500 -Subject: [PATCH] adapt paths for gentoo's fs layout - -https://bugs.gentoo.org/show_bug.cgi?id=554628 ---- - examples/apparmor/Makefile.am | 4 +- - examples/apparmor/usr.lib.libvirt.virt-aa-helper | 48 ------------------------ - examples/apparmor/usr.libexec.virt-aa-helper | 48 ++++++++++++++++++++++++ - examples/apparmor/usr.sbin.libvirtd | 4 +- - 4 files changed, 52 insertions(+), 52 deletions(-) - delete mode 100644 examples/apparmor/usr.lib.libvirt.virt-aa-helper - create mode 100644 examples/apparmor/usr.libexec.virt-aa-helper - diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index 7a20e16..c3c67b6 100644 --- a/examples/apparmor/Makefile.am diff --git a/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch new file mode 100644 index 000000000000..990fbacc217d --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch @@ -0,0 +1,147 @@ +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 2adcefb..cdee23b 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -23,7 +23,7 @@ EXTRA_DIST = \ + apparmor/TEMPLATE.lxc \ + apparmor/libvirt-qemu \ + apparmor/libvirt-lxc \ +- apparmor/usr.lib.libvirt.virt-aa-helper \ ++ apparmor/usr.libexec.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + lxcconvert/virt-lxc-convert \ + polkit/libvirt-acl.rules \ +@@ -55,7 +55,7 @@ rename_rename_SOURCES = rename/rename.c + if WITH_APPARMOR_PROFILES + apparmordir = $(sysconfdir)/apparmor.d/ + apparmor_DATA = \ +- apparmor/usr.lib.libvirt.virt-aa-helper \ ++ apparmor/usr.libexec.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + $(NULL) + +diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper +deleted file mode 100644 +index b34fb35..0000000 +--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ /dev/null +@@ -1,48 +0,0 @@ +-# Last Modified: Mon Apr 5 15:10:27 2010 +-#include +- +-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { +- #include +- +- # needed for searching directories +- capability dac_override, +- capability dac_read_search, +- +- # needed for when disk is on a network filesystem +- network inet, +- +- deny @{PROC}/[0-9]*/mounts r, +- @{PROC}/[0-9]*/net/psched r, +- owner @{PROC}/[0-9]*/status r, +- @{PROC}/filesystems r, +- +- # for hostdev +- /sys/devices/ r, +- /sys/devices/** r, +- +- /usr/{lib,lib64}/libvirt/virt-aa-helper mr, +- /sbin/apparmor_parser Ux, +- +- /etc/apparmor.d/libvirt/* r, +- /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, +- +- # for backingstore -- allow access to non-hidden files in @{HOME} as well +- # as storage pools +- audit deny @{HOME}/.* mrwkl, +- audit deny @{HOME}/.*/ rw, +- audit deny @{HOME}/.*/** mrwkl, +- audit deny @{HOME}/bin/ rw, +- audit deny @{HOME}/bin/** mrwkl, +- @{HOME}/ r, +- @{HOME}/** r, +- /var/lib/libvirt/images/ r, +- /var/lib/libvirt/images/** r, +- /{media,mnt,opt,srv}/** r, +- +- /**.img r, +- /**.qcow{,2} r, +- /**.qed r, +- /**.vmdk r, +- /**.[iI][sS][oO] r, +- /**/disk{,.*} r, +-} +diff --git a/examples/apparmor/usr.libexec.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper +new file mode 100644 +index 0000000..08b871a +--- /dev/null ++++ b/examples/apparmor/usr.libexec.virt-aa-helper +@@ -0,0 +1,48 @@ ++# Last Modified: Mon Apr 5 15:10:27 2010 ++#include ++ ++profile virt-aa-helper /usr/libexec/virt-aa-helper { ++ #include ++ ++ # needed for searching directories ++ capability dac_override, ++ capability dac_read_search, ++ ++ # needed for when disk is on a network filesystem ++ network inet, ++ ++ deny @{PROC}/[0-9]*/mounts r, ++ @{PROC}/[0-9]*/net/psched r, ++ owner @{PROC}/[0-9]*/status r, ++ @{PROC}/filesystems r, ++ ++ # for hostdev ++ /sys/devices/ r, ++ /sys/devices/** r, ++ ++ /usr/libexec/virt-aa-helper mr, ++ /sbin/apparmor_parser Ux, ++ ++ /etc/apparmor.d/libvirt/* r, ++ /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, ++ ++ # for backingstore -- allow access to non-hidden files in @{HOME} as well ++ # as storage pools ++ audit deny @{HOME}/.* mrwkl, ++ audit deny @{HOME}/.*/ rw, ++ audit deny @{HOME}/.*/** mrwkl, ++ audit deny @{HOME}/bin/ rw, ++ audit deny @{HOME}/bin/** mrwkl, ++ @{HOME}/ r, ++ @{HOME}/** r, ++ /var/lib/libvirt/images/ r, ++ /var/lib/libvirt/images/** r, ++ /{media,mnt,opt,srv}/** r, ++ ++ /**.img r, ++ /**.qcow{,2} r, ++ /**.qed r, ++ /**.vmdk r, ++ /**.[iI][sS][oO] r, ++ /**/disk{,.*} r, ++} +diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd +index 5d606e6..b2cd8c6 100644 +--- a/examples/apparmor/usr.sbin.libvirtd ++++ b/examples/apparmor/usr.sbin.libvirtd +@@ -58,8 +58,10 @@ + audit deny /sys/kernel/security/apparmor/.* rwxl, + /sys/kernel/security/apparmor/profiles r, + /usr/{lib,lib64}/libvirt/* PUxr, +- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix, +- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, ++ /usr/libexec/virt-aa-helper PUxr, ++ /usr/libexec/libvirt_lxc PUxr, ++ /usr/libexec/libvirt_parthelper ix, ++ /usr/libexec/libvirt_iohelper ix, + /etc/libvirt/hooks/** rmix, + /etc/xen/scripts/** rmix, + diff --git a/app-emulation/libvirt/libvirt-1.3.0.ebuild b/app-emulation/libvirt/libvirt-1.3.1.ebuild similarity index 95% rename from app-emulation/libvirt/libvirt-1.3.0.ebuild rename to app-emulation/libvirt/libvirt-1.3.1.ebuild index 0f03ffa5a7dd..d1be49be67c7 100644 --- a/app-emulation/libvirt/libvirt-1.3.0.ebuild +++ b/app-emulation/libvirt/libvirt-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit eutils user autotools-utils linux-info systemd readme.gentoo -BACKPORTS="20151222" # CVE-2015-5313 +BACKPORTS="" if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -218,9 +218,9 @@ src_prepare() { fi epatch \ - "${FILESDIR}"/${P}-do_not_use_sysconf.patch \ + "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ - "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch + "${FILESDIR}"/${P}-fix_paths_for_apparmor.patch [[ -n ${BACKPORTS} ]] && EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ @@ -229,11 +229,11 @@ src_prepare() { epatch_user # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die + cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \ - -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \ - -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \ + -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \ + -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \ + -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \ -i "${S}/libvirtd.init" || die "sed failed" AUTOTOOLS_AUTORECONF=true diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index f07387ffca7e..22d4afbc0148 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -220,7 +220,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \ - "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch + "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch [[ -n ${BACKPORTS} ]] && EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index cd51bb5e3c5d..4d02ae787819 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -1 +1,2 @@ DIST spice-0.12.6.tar.bz2 1181088 SHA256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 SHA512 877d9c447a09055c61db7839ae1a2bbd97ab1178d8fd30fff83883064f8a2f269479649e696732095833ed3fda2d0cc0cbe2a420decb89d36d2cf2f18ad9a3db WHIRLPOOL e381cf469a29be9a91ab442ee5f426a44ee569528d9297401df1c927cbf558e9daee7709cd69a4cc6389481b0c5aa26b19e56f0e97576e270d768842581544fe +DIST spice-0.13.0.tar.bz2 1215334 SHA256 4862e2d11da10abdf46dd6cc834d79fa4ef3490efac8dbcdd19fa96f81147bbb SHA512 be9960e8f40415f2d0c2445aca701729f904b4598492b64993fc53b2cfb27652642f11721b43c44c953e6ba4982865b15260c995bb12c4f29ea9c7e962043795 WHIRLPOOL 88d92a4498e76eb279c073e4da87a0b0efe7697f6da1211b4830681a1cc6c828809dcaaec54e0876766a8fd4365e55439910c13c03e7a50d0ccbdcf98bbec781 diff --git a/app-emulation/spice/spice-0.13.0.ebuild b/app-emulation/spice/spice-0.13.0.ebuild new file mode 100644 index 000000000000..9f06219e096b --- /dev/null +++ b/app-emulation/spice/spice-0.13.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4} ) + +inherit eutils python-any-r1 + +DESCRIPTION="SPICE server" +HOMEPAGE="http://spice-space.org/" +SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl sasl smartcard static-libs" + +# the libspice-server only uses the headers of libcacard +RDEPEND=" + >=dev-libs/glib-2.22:2[static-libs(+)?] + >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] + media-libs/opus[static-libs(+)?] + sys-libs/zlib[static-libs(+)?] + virtual/jpeg:0=[static-libs(+)?] + >=x11-libs/pixman-0.17.7[static-libs(+)?] + !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) + libressl? ( dev-libs/libressl[static-libs(+)?] ) + smartcard? ( >=app-emulation/libcacard-0.1.2 ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )" + +DEPEND=" + >=app-emulation/spice-protocol-0.12.10 + virtual/pkgconfig + $(python_gen_any_dep ' + >=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') + smartcard? ( app-emulation/qemu[smartcard] ) + ${RDEPEND}" + +python_check_deps() { + has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" + has_version "dev-python/six[${PYTHON_USEDEP}]" +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup +} + +# maintainer notes: +# * opengl support is currently broken + +src_prepare() { + epatch "${FILESDIR}/0.11.0-gold.patch" + + epatch_user +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with sasl) \ + $(use_enable smartcard) \ + --disable-gui +} + +src_install() { + default + use static-libs || prune_libtool_files +} diff --git a/app-emulation/spim/spim-8.0-r1.ebuild b/app-emulation/spim/spim-8.0-r1.ebuild index f00ca7fe089b..fb0b06b97595 100644 --- a/app-emulation/spim/spim-8.0-r1.ebuild +++ b/app-emulation/spim/spim-8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,6 +23,8 @@ DEPEND="${RDEPEND} x11-proto/xproto ) >=sys-apps/sed-4 sys-devel/bison" +# test hangs forever, disabling it +RESTRICT="test" src_prepare() { # fix bugs 240005 and 243588 @@ -60,8 +62,7 @@ src_install() { fi doicon "${FILESDIR}"/xspim.svg || die - make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education" \ - "Comment=Graphical MIPS32 Assembly language emulator" + make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education" dohtml Documentation/SPIM.html || die dodoc ChangeLog Documentation/BLURB README VERSION || die diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild index eecb91fcb213..8790327b7918 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild @@ -75,6 +75,7 @@ RDEPEND="!!app-emulation/virtualbox x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp + sys-fs/lvm2 python? ( ${PYTHON_DEPS} )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 63f546c448dc..91e92c82d91c 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,3 +1,7 @@ DIST ibus-1.5.10.tar.gz 2169299 SHA256 1d01b7806602875a1f3004f32e1000a39be01f59731d6baf36446498e26f5594 SHA512 2f7f07c20cac5f934f24c3bc99b29efe30aa5ced501ac442a9da16454cb889d946fa262b3495c1778f200c8f62a1fd8d67f47f43ae6ee214d3d392feb6e413c9 WHIRLPOOL 575d5bba84ed8afb608030260b5fbbd47bdfc4ff1368590e0c34b2fed1cf2878e71bdb7b6da286d0b0d5a27f7fcc9e2a02675a86bbc9417c1d060246b7a6acbd DIST ibus-1.5.11.tar.gz 2177026 SHA256 49995a298a39a137e65c6ee77811b030850ff344b875f29d4ed088f623a546bc SHA512 7745a06a4dc9502a957bdfa7faba3e6ff857ee102f34acfbc5d1c8ca5935eaf5660ebe6d837ee7bae584818c08a1769cf8a9daa012f87d43a1f10917c04615c2 WHIRLPOOL ae724b6609323e22f6fdff767484ec1259a6e3e4465b1a539cdfaa9178920d23d062d4eb6627fd3b45416d7fa9170a5bf467d6cddd4b1e80ae568a31e851be24 DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293 +DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d +DIST ibus-1.5.8.tar.gz 2120220 SHA256 cfc562ae73de753dc8cb9ae30fe117286ddd94cd109002108f2eeb47e8101a29 SHA512 428e40be7ebea57832295e76b5c4350351c6d40c5178c57c61c8d6f31e524a315184c3d533ad88592e53ae7c6cb4beed67796ad61910f99f260fc9c243b2fc98 WHIRLPOOL 2fc0059a75b3f4b253770303a8c9c8ae02947153eaf7b9c220e2e10657275293a556b068ba4cad0d27f315b7374ffaedb53b20cd13f8408a3729cfaaea869d78 +DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83ae093149b2c827d480705836f0bf8a29706f1e0 SHA512 98c323de9793938d8c0bd646071d0ea7860212e3ae826e97ed0e0a092ec715084529b3a3cee3def63958dd3d56357b2e33e4e3d3946cca90bec3409469cf14d4 WHIRLPOOL 0aaf7aaba36de96525f0339a16df2c435e2f2c5cc6168c9b2da25bd7003af88f6d55ca53ae692c9c611b563ddfcb48a0e19e915f8361ba51a4aac813edc45f41 +DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221 diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild new file mode 100644 index 000000000000..3fed965844fb --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.5.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +VALA_MIN_API_VERSION="0.20" +VALA_USE_DEPEND="vapigen" +# Vapigen is needed for the vala binding +# Valac is needed when building from git for the engine + +inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" +SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +REQUIRED_USE="|| ( gtk gtk3 X ) + deprecated? ( python ) + python? ( + ${PYTHON_REQUIRED_USE} + || ( deprecated ( gtk3 introspection ) ) )" #342903 + +COMMON_DEPEND=" + >=dev-libs/glib-2.26:2 + gnome-base/librsvg:2 + sys-apps/dbus[X?] + app-text/iso-codes + >=gnome-base/dconf-0.13.4 + x11-libs/libnotify + + gconf? ( >=gnome-base/gconf-2.12:2 ) + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + python? ( ${PYTHON_DEPS} ) + X? ( + x11-libs/libX11 + x11-libs/gtk+:2 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) + nls? ( virtual/libintl ) + wayland? ( dev-libs/wayland )" +RDEPEND="${COMMON_DEPEND} + x11-apps/setxkbmap + python? ( + dev-python/pyxdg + deprecated? ( + >=dev-python/dbus-python-0.83 + dev-python/pygobject:2 + dev-python/pygtk:2 ) + gtk3? ( + dev-python/pygobject:3 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-libs/gtk+:3[introspection] ) + )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5.8.1 + dev-util/gtk-doc-am + dev-util/intltool + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.16.1 ) + vala? ( $(vala_depend) ) + gnome-base/gconf" + +# stress test in bus/ fails +# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed +RESTRICT="test" + +DOCS="AUTHORS ChangeLog NEWS README" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="To use ibus, you should: +1. Get input engines from sunrise overlay. +Run \"emerge -s ibus-\" in your favorite terminal +for a list of packages we already have. + +2. Setup ibus: +$ ibus-setup + +3. Set the following in your user startup scripts +such as .xinitrc, .xsession or .xprofile: + +export XMODIFIERS=\"@im=ibus\" +export GTK_IM_MODULE=\"ibus\" +export QT_IM_MODULE=\"xim\" +ibus-daemon -d -x +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations + sed -e 's/dconf update/$(NULL)/' \ + -i data/dconf/Makefile.{am,in} || die + use vala && vala_src_prepare + cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die +} + +src_configure() { + local python_conf + if use python; then + python_conf="PYTHON=${PYTHON} + $(use_enable deprecated python-library) + $(use_enable gtk3 setup)" + else + python_conf="--disable-python-library --disable-setup" + fi + econf \ + --enable-dconf \ + $(use_enable introspection) \ + $(use_enable gconf) \ + $(use_enable gtk gtk2) \ + $(use_enable gtk xim) \ + $(use_enable gtk3) \ + $(use_enable gtk3 ui) \ + $(use_enable nls) \ + $(use_enable test tests) \ + $(use_enable X xim) \ + $(use_enable vala) \ + $(use_enable wayland) \ + ${python_conf} +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + Xemake check || die +} + +src_install() { + default + + prune_libtool_files --all + + mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" + rm -rf "${ED}"/usr/share/bash-completion || die + newbashcomp "${T}"/ibus.bash ${PN} + insinto /etc/X11/xinit/xinput.d + newins xinput-ibus ibus.conf + + keepdir /usr/share/ibus/{engine,icons} #289547 + + use deprecated && python_optimize + use python && use gtk3 && python_optimize + + readme.gentoo_create_doc +} + +pkg_preinst() { + use gconf && gnome2_gconf_savelist + gnome2_schemas_savelist + gnome2_icon_savelist +} + +pkg_postinst() { + use gconf && gnome2_gconf_install + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + gnome2_schemas_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + use gconf && gnome2_schemas_update + gnome2_schemas_savelist + gnome2_icon_cache_update +} diff --git a/app-i18n/ibus/ibus-1.5.8-r1.ebuild b/app-i18n/ibus/ibus-1.5.8-r1.ebuild new file mode 100644 index 000000000000..57b1cf57f708 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.8-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +VALA_MIN_API_VERSION="0.20" +VALA_USE_DEPEND="vapigen" +# Vapigen is needed for the vala binding +# Valac is needed when building from git for the engine + +inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" +SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" +REQUIRED_USE="|| ( gtk gtk3 X ) + deprecated? ( python ) + python? ( + ${PYTHON_REQUIRED_USE} + || ( deprecated ( gtk3 introspection ) ) )" #342903 + +COMMON_DEPEND=" + >=dev-libs/glib-2.26:2 + gnome-base/librsvg:2 + sys-apps/dbus[X?] + app-text/iso-codes + >=gnome-base/dconf-0.13.4 + x11-libs/libnotify + + gconf? ( >=gnome-base/gconf-2.12:2 ) + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + python? ( ${PYTHON_DEPS} ) + X? ( + x11-libs/libX11 + x11-libs/gtk+:2 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) + nls? ( virtual/libintl ) + wayland? ( dev-libs/wayland )" +RDEPEND="${COMMON_DEPEND} + x11-apps/setxkbmap + python? ( + dev-python/pyxdg + deprecated? ( + >=dev-python/dbus-python-0.83 + dev-python/pygobject:2 + dev-python/pygtk:2 ) + gtk3? ( + dev-python/pygobject:3 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-libs/gtk+:3[introspection] ) + )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5.8.1 + dev-util/gtk-doc-am + dev-util/intltool + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.16.1 ) + vala? ( $(vala_depend) ) + gnome-base/gconf" + +# stress test in bus/ fails +# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed +RESTRICT="test" + +DOCS="AUTHORS ChangeLog NEWS README" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="To use ibus, you should: +1. Get input engines from sunrise overlay. +Run \"emerge -s ibus-\" in your favorite terminal +for a list of packages we already have. + +2. Setup ibus: +$ ibus-setup + +3. Set the following in your user startup scripts +such as .xinitrc, .xsession or .xprofile: + +export XMODIFIERS=\"@im=ibus\" +export GTK_IM_MODULE=\"ibus\" +export QT_IM_MODULE=\"xim\" +ibus-daemon -d -x +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations + sed -e 's/dconf update/:/' \ + -i data/dconf/Makefile.{am,in} || die + use vala && vala_src_prepare +} + +src_configure() { + local python_conf + if use python; then + python_conf="PYTHON=${PYTHON} + $(use_enable deprecated python-library) + $(use_enable gtk3 setup)" + else + python_conf="--disable-python-library --disable-setup" + fi + econf \ + --enable-dconf \ + $(use_enable introspection) \ + $(use_enable gconf) \ + $(use_enable gtk gtk2) \ + $(use_enable gtk xim) \ + $(use_enable gtk3) \ + $(use_enable gtk3 ui) \ + $(use_enable nls) \ + $(use_enable test tests) \ + $(use_enable X xim) \ + $(use_enable vala) \ + $(use_enable wayland) \ + ${python_conf} +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + Xemake check || die +} + +src_install() { + default + + prune_libtool_files --all + + mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" + rm -rf "${ED}"/usr/share/bash-completion || die + newbashcomp "${T}"/ibus.bash ${PN} + insinto /etc/X11/xinit/xinput.d + newins xinput-ibus ibus.conf + + keepdir /usr/share/ibus/{engine,icons} #289547 + + use deprecated && python_optimize + use python && use gtk3 && python_optimize + + readme.gentoo_create_doc +} + +pkg_preinst() { + use gconf && gnome2_gconf_savelist + gnome2_schemas_savelist + gnome2_icon_savelist +} + +pkg_postinst() { + use gconf && gnome2_gconf_install + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + gnome2_schemas_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + use gconf && gnome2_schemas_update + gnome2_schemas_savelist + gnome2_icon_cache_update +} diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild new file mode 100644 index 000000000000..725ef8f6e1e0 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.9-r1.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +VALA_MIN_API_VERSION="0.20" +VALA_USE_DEPEND="vapigen" +# Vapigen is needed for the vala binding +# Valac is needed when building from git for the engine +UPSTREAM_VER=0 + +inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test +vala wayland +X" +REQUIRED_USE=" + || ( gtk gtk3 X ) + deprecated? ( python ) + vala? ( introspection ) + python? ( + ${PYTHON_REQUIRED_USE} + || ( deprecated ( gtk3 introspection ) ) )" #342903 + +[[ -n ${UPSTREAM_VER} ]] && \ + UPSTRAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + +SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz + ${UPSTRAM_PATCHSET_URI}" + +COMMON_DEPEND=" + >=dev-libs/glib-2.26:2 + gnome-base/librsvg:2 + sys-apps/dbus[X?] + app-text/iso-codes + >=gnome-base/dconf-0.13.4 + x11-libs/libnotify + gconf? ( >=gnome-base/gconf-2.12:2 ) + gtk? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + python? ( ${PYTHON_DEPS} ) + X? ( + x11-libs/libX11 + x11-libs/gtk+:2 ) + introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) + nls? ( virtual/libintl ) + wayland? ( dev-libs/wayland )" +RDEPEND="${COMMON_DEPEND} + x11-apps/setxkbmap + python? ( + dev-python/pyxdg + deprecated? ( + >=dev-python/dbus-python-0.83 + dev-python/pygobject:2 + dev-python/pygtk:2 ) + gtk3? ( + dev-python/pygobject:3 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-libs/gtk+:3[introspection] ) + )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5.8.1 + dev-util/gtk-doc-am + dev-util/intltool + virtual/pkgconfig + nls? ( >=sys-devel/gettext-0.16.1 ) + vala? ( $(vala_depend) )" + +# stress test in bus/ fails +# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed +RESTRICT="test" + +DOCS="AUTHORS ChangeLog NEWS README" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="To use ibus, you should: +1. Get input engines from sunrise overlay. +Run \"emerge -s ibus-\" in your favorite terminal +for a list of packages we already have. + +2. Setup ibus: +$ ibus-setup + +3. Set the following in your user startup scripts +such as .xinitrc, .xsession or .xprofile: + +export XMODIFIERS=\"@im=ibus\" +export GTK_IM_MODULE=\"ibus\" +export QT_IM_MODULE=\"xim\" +ibus-daemon -d -x +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + epatch "${WORKDIR}"/patches-upstream + fi + + # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations + sed -e 's/dconf update/:/' \ + -i data/dconf/Makefile.{am,in} || die + use vala && vala_src_prepare + + eautoreconf +} + +src_configure() { + local python_conf + if use python; then + python_conf="PYTHON=${PYTHON} + $(use_enable deprecated python-library) + $(use_enable gtk3 setup)" + else + python_conf="--disable-python-library --disable-setup" + fi + econf \ + --enable-dconf \ + $(use_enable introspection) \ + $(use_enable gconf) \ + $(use_enable gtk gtk2) \ + $(use_enable gtk xim) \ + $(use_enable gtk3) \ + $(use_enable gtk3 ui) \ + $(use_enable nls) \ + $(use_enable test tests) \ + $(use_enable X xim) \ + $(use_enable vala) \ + $(use_enable wayland) \ + ${python_conf} +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + Xemake check || die +} + +src_install() { + default + + prune_libtool_files --all + + mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" + rm -rf "${ED}"/usr/share/bash-completion || die + newbashcomp "${T}"/ibus.bash ${PN} + insinto /etc/X11/xinit/xinput.d + newins xinput-ibus ibus.conf + + keepdir /usr/share/ibus/{engine,icons} #289547 + + use deprecated && python_optimize + use python && use gtk3 && python_optimize + + readme.gentoo_create_doc +} + +pkg_preinst() { + use gconf && gnome2_gconf_savelist + gnome2_schemas_savelist + gnome2_icon_savelist +} + +pkg_postinst() { + use gconf && gnome2_gconf_install + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + gnome2_schemas_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + use gconf && gnome2_schemas_update + gnome2_schemas_savelist + gnome2_icon_cache_update +} diff --git a/app-misc/jq/jq-1.5.ebuild b/app-misc/jq/jq-1.5-r1.ebuild similarity index 90% rename from app-misc/jq/jq-1.5.ebuild rename to app-misc/jq/jq-1.5-r1.ebuild index 4bf14a4d8d75..df24e2f78f45 100644 --- a/app-misc/jq/jq-1.5.ebuild +++ b/app-misc/jq/jq-1.5-r1.ebuild @@ -15,10 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~x64-macos" IUSE="oniguruma static-libs test" -DEPEND="sys-devel/bison +DEPEND=">=sys-devel/bison-3.0 sys-devel/flex oniguruma? ( dev-libs/oniguruma[static-libs?] ) test? ( dev-util/valgrind )" +RDEPEND="!static-libs? ( + oniguruma? ( dev-libs/oniguruma[static-libs?] ) + )" DOCS=( AUTHORS README ) diff --git a/app-misc/media-player-info/media-player-info-22.ebuild b/app-misc/media-player-info/media-player-info-22.ebuild index 57e5f6a8093f..db343f85afde 100644 --- a/app-misc/media-player-info/media-player-info-22.ebuild +++ b/app-misc/media-player-info/media-player-info-22.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{3_3,3_4} ) +PYTHON_COMPAT=( python3_{3,4,5} ) inherit eutils python-any-r1 diff --git a/app-misc/pdfpc/pdfpc-4.0.1.ebuild b/app-misc/pdfpc/pdfpc-4.0.1.ebuild index 3df909ebf748..7faff1565cb1 100644 --- a/app-misc/pdfpc/pdfpc-4.0.1.ebuild +++ b/app-misc/pdfpc/pdfpc-4.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=5 VALA_MIN_API_VERSION="0.26" -VALA_MAX_API_VERSION="0.28" # fix sed line if you increase this +VALA_MAX_API_VERSION="0.30" # fix sed line if you increase this inherit vala cmake-utils @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} $(vala_depend)" src_prepare() { - sed -i -e "s/valac-0.20/valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die + sed -i -e "s/valac-0.20/valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die vala_src_prepare } diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index 40e50c604033..08f608eeed48 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1 +1,2 @@ DIST gammu-1.33.0.tar.bz2 6535262 SHA256 b326223e36a334dbaed68252a9cf2d90fd898d6de4d1085dcf9c2320881aece3 SHA512 42252a36c7ad5a2945fcf23fcb1b5bb0201d27e8830d3b4a7f4c36bf00f12f5a0f7797e17098bda8d526d4ddc3b1808c0786dfae0feef9424516fa68bf2f3f1e WHIRLPOOL 27c0110da7b686bc7dd19f4f897c59d4e66aa6dbec78dec208fa8c90f70b80c1375c7b8a4b54fe40295d388de61efb11695823a503d1f85a46797c97ddf988fa +DIST gammu-1.36.8.tar.bz2 2095289 SHA256 0ed9c91b4cc5844cad04531e765bc1194cb02bc3e69e6658cd88bfb1cad74f80 SHA512 4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09 WHIRLPOOL 36172cbf129647b2de48dbbe14122e71fc4f46e2f6ddb29ce546a1e37ea5c2ee0cad28ee37b29b7ddfb9605e6984c6d80d50108bfe0962417da35a1c5b2688ef diff --git a/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch new file mode 100644 index 000000000000..aceef3da9805 --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.36.8-bashcompdir.patch @@ -0,0 +1,12 @@ +diff -BurpN gammu-1.36.8.orig/contrib/CMakeLists.txt gammu-1.36.8/contrib/CMakeLists.txt +--- gammu-1.36.8.orig/contrib/CMakeLists.txt 2015-12-08 13:38:11.000000000 +0300 ++++ gammu-1.36.8/contrib/CMakeLists.txt 2016-01-16 15:49:45.870431342 +0300 +@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) + if (INSTALL_BASH_COMPLETION) + macro_optional_find_package (BashCompletion) + if (NOT BASH_COMPLETION_FOUND) +- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "/usr/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d") + endif (NOT BASH_COMPLETION_FOUND) + install ( + FILES bash-completion/gammu diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild new file mode 100644 index 000000000000..2db6755d7963 --- /dev/null +++ b/app-mobilephone/gammu/gammu-1.36.8.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils cmake-utils + +DESCRIPTION="A tool to handle your cellular phone" +HOMEPAGE="http://wammu.eu/gammu/" +SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bluetooth curl dbi debug irda mysql nls postgres usb" + +# TODO: figure out a way to disable gudev +RDEPEND="dev-libs/glib:2= + virtual/libgudev:= + bluetooth? ( net-wireless/bluez:= ) + curl? ( net-misc/curl:= ) + dbi? ( >=dev-db/libdbi-0.8.3:= ) + mysql? ( virtual/mysql:= ) + postgres? ( dev-db/postgresql:=[server] ) + usb? ( virtual/libusb:1= ) + dev-util/dialog" +DEPEND="${RDEPEND} + irda? ( virtual/os-headers ) + nls? ( sys-devel/gettext )" + +# sys-devel/gettext is needed for creating .mo files +# Supported languages and translated documentation +# Be sure all languages are prefixed with a single space! +MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW" +IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" + +src_prepare() { + epatch "${FILESDIR}/${PN}-skip-locktest.patch" \ + "${FILESDIR}/${PN}-1.36.8-bashcompdir.patch" + + local lang support_linguas=no + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if use linguas_${lang} ; then + support_linguas=yes + break + fi + done + # install all languages when all selected LINGUAS aren't supported + if [ "${support_linguas}" = "yes" ]; then + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if ! use linguas_${lang} ; then + rm -rf locale/${lang} || die + fi + done + fi +} + +src_configure() { + # debug flag is used inside cmake-utils.eclass + local mycmakeargs=( + $(cmake-utils_use_with bluetooth Bluez) + $(cmake-utils_use_with irda IRDA) + $(cmake-utils_use_with curl CURL) + $(cmake-utils_use_with usb USB) + $(cmake-utils_use_with mysql MySQL) + $(cmake-utils_use_with postgres Postgres) + $(cmake-utils_use_with dbi LibDBI) + $(cmake-utils_use_with nls GettextLibs) + $(cmake-utils_use_with nls Iconv) + -DBUILD_SHARED_LIBS=ON + -DINSTALL_DOC_DIR="share/doc/${PF}" + ) + cmake-utils_src_configure +} + +src_test() { + LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test +} diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml index 33356c6c5c65..65a0f7a08c49 100644 --- a/app-mobilephone/gammu/metadata.xml +++ b/app-mobilephone/gammu/metadata.xml @@ -1,7 +1,10 @@ - - Enables infrared support - + + Enables infrared support + + + gammu/gammu + diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest index fd46156e79cd..c110d24d1d3f 100644 --- a/app-mobilephone/wammu/Manifest +++ b/app-mobilephone/wammu/Manifest @@ -1,2 +1,3 @@ DIST wammu-0.35.tar.bz2 572550 SHA256 fba70bb0a067f20bb5da5f16061e6cc70a49761ca11f49a897af678271666d7a SHA512 c9c24a170d0a1b1507799f77719d544a04b0c894172e0158efc782f25ec894eaa65e2a89b53db431a96b5f88ccadf4dddc5025ba84ac09d54aa5d37b2e658461 WHIRLPOOL 8b6b4edc77c46f20b449077f198d4e51ad81edd6846c69a4945ebf207ae01431a3cb31541e8f07c1b8c90fa37c2034acec771e5d563e0bf756aba1f175f93a9f DIST wammu-0.36.tar.bz2 581781 SHA256 8107d69438adc5c9c24565f455cac31ecd5b9ef754f26a6b5ebab03b49131696 SHA512 08caaeb7ade5877b441baad2f3f1f653ed1c25c3fab213e093213525fe326f09ee8ccda4db834f82b00a9d7e9b2cb235da7be7f328c091b6067543d9cdbfb14c WHIRLPOOL 6b4b8aff5363bbf39bb9b67765c9373600642592bc910d3b4d83d09d88d5b5ad4945d4f27f2c75c383ae55f66cc71e21756fcd93e1adee3dfeeef5a766f449c8 +DIST wammu-0.40.tar.bz2 687062 SHA256 cffd4fc6cc7b9433b3f589d51671a5ac5e188abbf676ebe0ce94011933fdb2ff SHA512 2ed5d5cdd63b3731808c5fa8cc36caf394c4ccf714eb4ef39a25f1e7967d8ccf8b69db5aeff37ff0d1bbf7cefec51fe070a5f0b90d0cb8271f1a3d243eaf06fd WHIRLPOOL b05dac88593c5ae3c01f63984824690991a347e4efff2bf3595b1088d9903843e018690845391ab48f62ab7d17f11d0b3a801103a1c408822b1c9afdd88f7150 diff --git a/app-mobilephone/wammu/wammu-0.35-r1.ebuild b/app-mobilephone/wammu/wammu-0.35-r1.ebuild new file mode 100644 index 000000000000..b8d262e425f1 --- /dev/null +++ b/app-mobilephone/wammu/wammu-0.35-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="3" + +PYTHON_DEPEND="2" + +inherit distutils + +DESCRIPTION="Front-end for gammu to access mobile phones easily" +HOMEPAGE="http://www.wammu.eu/" +SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bluetooth gnome" + +RDEPEND=">=app-mobilephone/gammu-1.25.0[python] =dev-python/wxpython-2.8 + bluetooth? ( dev-python/pybluez + gnome? ( net-wireless/gnome-bluetooth ) + )" +DEPEND="${RDEPEND}" + +# Supported languages and translated documentation +# Be sure all languages are prefixed with a single space! +MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv zh_CN zh_TW" +IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + local lang support_linguas=no + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if use linguas_${lang} ; then + support_linguas=yes + break + fi + done + # install all languages when all selected LINGUAS aren't supported + if [ "${support_linguas}" = "yes" ]; then + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if ! use linguas_${lang} ; then + rm -r locale/${lang} || die + fi + done + fi + + python_convert_shebangs -r 2 . +} + +src_compile() { + # SKIPWXCHECK: else 'import wx' results in + # Xlib: connection to ":0.0" refused by server + SKIPWXCHECK=yes distutils_src_compile +} + +src_install() { + DOCS="AUTHORS FAQ" + SKIPWXCHECK=yes distutils_src_install +} diff --git a/app-mobilephone/wammu/wammu-0.36-r1.ebuild b/app-mobilephone/wammu/wammu-0.36-r1.ebuild index 4c84990ca76d..5b974e6d2018 100644 --- a/app-mobilephone/wammu/wammu-0.36-r1.ebuild +++ b/app-mobilephone/wammu/wammu-0.36-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="bluetooth gnome" -RDEPEND=">=app-mobilephone/gammu-1.25.0[python] +RDEPEND=">=app-mobilephone/gammu-1.25.0[python] =dev-python/wxpython-2.8[${PYTHON_USEDEP}] bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] gnome? ( net-wireless/gnome-bluetooth ) diff --git a/app-mobilephone/wammu/wammu-0.40.ebuild b/app-mobilephone/wammu/wammu-0.40.ebuild new file mode 100644 index 000000000000..6707609bb58b --- /dev/null +++ b/app-mobilephone/wammu/wammu-0.40.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Front-end for gammu to access mobile phones easily" +HOMEPAGE="http://www.wammu.eu/" +SRC_URI="http://dl.cihar.com/wammu/v0/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bluetooth gnome" + +RDEPEND="|| ( ( >=app-mobilephone/gammu-1.36 dev-python/python-gammu ) + >=app-mobilephone/gammu-1.25.0[python] ) + >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] + bluetooth? ( dev-python/pybluez[${PYTHON_USEDEP}] + gnome? ( net-wireless/gnome-bluetooth ) + )" +DEPEND="${RDEPEND}" + +# Supported languages and translated documentation +# Be sure all languages are prefixed with a single space! +MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr uk zh_CN zh_TW" +IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" + +# Required to source locale content out of the box +DISTUTILS_IN_SOURCE_BUILD=1 + +src_prepare() { + local lang support_linguas=no + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if use linguas_${lang} ; then + support_linguas=yes + break + fi + done + # install all languages when all selected LINGUAS aren't supported + if [ "${support_linguas}" = "yes" ]; then + for lang in ${MY_AVAILABLE_LINGUAS} ; do + if ! use linguas_${lang} ; then + rm -r locale/${lang} || die + fi + done + fi + + distutils-r1_src_prepare +} + +src_compile() { + # SKIPWXCHECK: else 'import wx' results in + # Xlib: connection to ":0.0" refused by server + SKIPWXCHECK=yes distutils-r1_src_compile +} + +src_install() { + SKIPWXCHECK=yes distutils-r1_src_install +} diff --git a/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch new file mode 100644 index 000000000000..9a49eb39282e --- /dev/null +++ b/app-office/magicpoint/files/magicpoint-1.13a_p20121015-fontconfig.patch @@ -0,0 +1,33 @@ +# Bug #572658 +--- kit.orig/configure.in 2009-05-04 09:36:47.000000000 +0200 ++++ kit/configure.in 2016-01-23 04:25:17.047720246 +0100 +@@ -16,6 +16,7 @@ + AC_PROG_AWK + AC_PROG_YACC + AC_PROG_LEX ++PKG_PROG_PKG_CONFIG([0.22]) + AC_PATH_PROGS(mgp_cv_path_perl, perl5 perl, no) + AC_SUBST(mgp_cv_path_perl) + AC_PATH_PROGS(mgp_cv_path_uuencode, uuencode, no) +@@ -385,9 +386,9 @@ + if test "$mgp_use_xft2" = "yes"; then + AC_MSG_CHECKING(for xft2 library..) + AC_CHECK_LIB(Xft, XftFontOpen, +- [LIBS="$LIBS -lXft -lfontconfig" ++ [LIBS="$LIBS -lXft `pkg-config --libs fontconfig`" + AC_DEFINE(USE_XFT2) +- mgp_xft2_found=yes], [], [-lfontconfig]) ++ mgp_xft2_found=yes], [], [`pkg-config --libs fontconfig`]) + fi + fi + fi +@@ -507,6 +508,9 @@ + AC_DEFINE(USE_M17N) + OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`" + LIBS="$LIBS `m17n-config X --libs` -lm17n-core" ++ if test "x$ac_cv_header_fontconfig_fontconfig_h" = "xyes"; then ++ LIBS="$LIBS `pkg-config --libs fontconfig`" ++ fi + fi + fi + diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild index 7c25f03ececa..872fe4cc4add 100644 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://member.wide.ad.jp/wg/mgp/" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cjk contrib doc emacs examples gif imlib m17n-lib mng nls png truetype" +IUSE="cjk contrib doc emacs examples fontconfig gif imlib m17n-lib mng nls png truetype" REQUIRED_USE="imlib? ( !gif !png )" S="${WORKDIR}/kit" @@ -29,9 +29,15 @@ COMMON_DEPEND="x11-libs/libICE gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) - truetype? ( x11-libs/libXft ) + truetype? ( + x11-libs/libXft + media-libs/fontconfig + ) emacs? ( virtual/emacs ) - m17n-lib? ( dev-libs/m17n-lib ) + m17n-lib? ( + dev-libs/m17n-lib + fontconfig? ( media-libs/fontconfig ) + ) mng? ( media-libs/libmng )" DEPEND="${COMMON_DEPEND} sys-devel/autoconf @@ -51,6 +57,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.11b-gentoo.diff \ + "${FILESDIR}"/${PN}-1.13a_p20121015-fontconfig.patch \ "${FILESDIR}"/${PN}-1.13a_p20121015-parse-empty.patch \ "${FILESDIR}"/${PN}-1.13a_p20121015-draw-charset.patch \ "${FILESDIR}"/${PN}-1.13a_p20121015-draw-stringtoolong.patch \ diff --git a/app-portage/conf-update/Manifest b/app-portage/conf-update/Manifest index 4483e2bae835..719176083efc 100644 --- a/app-portage/conf-update/Manifest +++ b/app-portage/conf-update/Manifest @@ -1,2 +1 @@ -DIST conf-update-1.0.2.tar.bz2 18243 SHA256 1246b83d8927e4333cfcb535217e5f055bc9aa0290f617c2ab1bb97dbeb3de9c SHA512 8611b30e58a9222a024e19d67e957a63d9c44627067a241e4ee5e761f1950ae7f1aa1491f055ba267be65f813ee7da1a8703028736b65dfd2c4ef79ace906f49 WHIRLPOOL 139e07105eed7d8ee5246c24833ecc110c92a5361892a5ee98ea2eee5d30199cbee788f47497d5d32c95c387bbf2df16589faa79c2dbf00b5ca5d347d7483c9e DIST conf-update-1.0.3.tar.bz2 18296 SHA256 5b8479447904e809338375c7d586803a3e8f8d6150cfc33da2c83763119a9a54 SHA512 7f20a4974f804d73729105d9abc0f3205a7574c6e2c6dbf020404f3161500b5ecc60d141e0833e9ae0f43a814591a74cd885a5033f50864bbcfb36ba452175b7 WHIRLPOOL e078895290de9cc116847a48c6fd6d190bc9a3700001de6d31a5728a7eefd2bc41bb34b67a3922ef10730f4668415a0b519861152ba4e54fe0150ec01232d578 diff --git a/app-portage/conf-update/conf-update-1.0.2.ebuild b/app-portage/conf-update/conf-update-1.0.2.ebuild deleted file mode 100644 index fd40c3dc17f7..000000000000 --- a/app-portage/conf-update/conf-update-1.0.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="${PN} is a ncurses-based config management utility" -HOMEPAGE="https://dev.gentoo.org/~nimiux/app-portage/${PN}" -SRC_URI="https://dev.gentoo.org/~nimiux/app-portage/${PN}/distfiles/${PF}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="colordiff" - -RDEPEND=">=dev-libs/glib-2.6 - sys-libs/ncurses - dev-libs/openssl - colordiff? ( app-misc/colordiff )" -DEPEND="virtual/pkgconfig - ${RDEPEND}" - -src_prepare() { - sed -i -e "s/\$Rev:.*\\$/${PVR}/" "${S}"/"${PN}".h || \ - die 'version-sed failed' - - if use colordiff ; then - sed -i -e "s/diff_tool=diff/diff_tool=colordiff/" ${PN}.conf || \ - die 'colordiff-sed failed' - fi -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/app-shells/bash/bash-4.3_p42-r2.ebuild b/app-shells/bash/bash-4.3_p42-r2.ebuild new file mode 100644 index 000000000000..c914d0429b89 --- /dev/null +++ b/app-shells/bash/bash-4.3_p42-r2.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs multilib + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_PV=${MY_PV/_/-} +MY_P=${PN}-${MY_PV} +[[ ${PV} != *_p* ]] && PLEVEL=0 +patches() { + local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} + [[ ${plevel} -eq 0 ]] && return 1 + eval set -- {1..${plevel}} + set -- $(printf "${pn}${pv/\.}-%03d " "$@") + if [[ ${opt} == -s ]] ; then + echo "${@/#/${DISTDIR}/}" + else + local u + for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do + printf "${u}/${pn}-${pv}-patches/%s " "$@" + done + fi +} + +# The version of readline this bash normally ships with. +READLINE_VER="6.3" + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" +[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2 + readline? ( >=sys-libs/readline-${READLINE_VER} ) + nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + !/dev/null \ - && match_lhs=$(dircolors --print-database) -[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true - -if ${use_color} ; then +# first to take advantage of user additions. +use_color=false +if type -P dircolors >/dev/null ; then # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) - elif [[ -f /etc/DIR_COLORS ]] ; then - eval $(dircolors -b /etc/DIR_COLORS) - fi + LS_COLORS= + if [[ -f ~/.dir_colors ]] ; then + # If you have a custom file, chances are high that it's not the default. + used_default_dircolors="no" + eval "$(dircolors -b ~/.dir_colors)" + elif [[ -f /etc/DIR_COLORS ]] ; then + # People might have customized the system database. + used_default_dircolors="maybe" + eval "$(dircolors -b /etc/DIR_COLORS)" + else + used_default_dircolors="yes" + eval "$(dircolors -b)" fi + if [[ -n ${LS_COLORS:+set} ]] ; then + use_color=true + # The majority of systems out there do not customize these files, so we + # want to avoid always exporting the large $LS_COLORS variable. This + # keeps the active env smaller, and it means we don't have to deal with + # running new/old (incompatible) versions of `ls` compared to when we + # last sourced this file. + case ${used_default_dircolors} in + no) ;; + yes) unset LS_COLORS ;; + *) + ls_colors=$(eval "$(dircolors -b)"; echo "${LS_COLORS}") + if [[ ${ls_colors} == "${LS_COLORS}" ]] ; then + unset LS_COLORS + fi + ;; + esac + fi + unset used_default_dircolors +else + # Some systems (e.g. BSD & embedded) don't typically come with + # dircolors so we need to hardcode some terminals in here. + case ${TERM} in + [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;; + esac +fi + +if ${use_color} ; then if [[ ${EUID} == 0 ]] ; then PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' else @@ -105,4 +123,4 @@ for sh in /etc/bash/bashrc.d/* ; do done # Try to keep environment pollution down, EPA loves us. -unset use_color safe_term match_lhs sh +unset use_color sh diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild index cf15c8d5e91d..3a89b6f3633d 100644 --- a/app-shells/zsh/zsh-5.2.ebuild +++ b/app-shells/zsh/zsh-5.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then inherit git-r3 autotools EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" else - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SRC_URI="http://www.zsh.org/pub/${P}.tar.xz doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )" fi diff --git a/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch b/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch new file mode 100644 index 000000000000..50d342c25c1e --- /dev/null +++ b/app-text/tesseract/files/tesseract-3.04.00-leptonica-1.73-compat.patch @@ -0,0 +1,24 @@ +--- tesseract-3.04.00/opencl/openclwrapper.cpp.orig 2016-01-31 11:55:02.535154846 +0100 ++++ tesseract-3.04.00/opencl/openclwrapper.cpp 2016-01-31 12:04:23.727809089 +0100 +@@ -14,6 +14,21 @@ + #include "otsuthr.h" + #include "thresholder.h" + ++/* ++ Convenience macro to test the version of Leptonica. ++*/ ++#if defined(LIBLEPT_MAJOR_VERSION) && defined(LIBLEPT_MINOR_VERSION) ++# define TESSERACT_LIBLEPT_PREREQ(maj, min) \ ++ ((LIBLEPT_MAJOR_VERSION) > (maj) || ((LIBLEPT_MAJOR_VERSION) == (maj) && (LIBLEPT_MINOR_VERSION) >= (min))) ++#else ++# define TESSERACT_LIBLEPT_PREREQ(maj, min) 0 ++#endif ++ ++#if TESSERACT_LIBLEPT_PREREQ(1,73) ++# define CALLOC LEPT_CALLOC ++# define FREE LEPT_FREE ++#endif ++ + #ifdef USE_OPENCL + + #if ON_APPLE diff --git a/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch new file mode 100644 index 000000000000..decee3a52f40 --- /dev/null +++ b/app-text/tesseract/files/tesseract-3.04.00-use-system-piccolo2d.patch @@ -0,0 +1,39 @@ +--- a/java/Makefile.am 2015-07-11 03:53:12.000000000 -0400 ++++ b/java/Makefile.am 2016-01-20 22:20:37.505713349 -0500 +@@ -36,10 +36,9 @@ + com/google/scrollview/ScrollView.class + + SCROLLVIEW_LIBS = \ +- $(srcdir)/piccolo2d-core-3.0.jar \ +- $(srcdir)/piccolo2d-extras-3.0.jar ++ /usr/share/piccolo2d/lib/piccolo2d.jar + +-CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar ++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar + + ScrollView.jar : $(SCROLLVIEW_CLASSES) + $(JAR) cf $@ com/google/scrollview/*.class \ +--- a/viewer/svutil.cpp 2015-07-11 03:53:12.000000000 -0400 ++++ b/viewer/svutil.cpp 2016-01-21 01:46:30.203461826 -0500 +@@ -302,7 +302,7 @@ + #else + const char* cmd_template = "-c \"trap 'kill %%1' 0 1 2 ; java " + "-Xms1024m -Xmx2048m -Djava.library.path=%s -cp %s/ScrollView.jar:" +- "%s/piccolo2d-core-3.0.jar:%s/piccolo2d-extras-3.0.jar" ++ "/usr/share/piccolo2d/lib/piccolo2d.jar" + " com.google.scrollview.ScrollView" + " & wait\""; + #endif +--- a/viewer/Makefile.am 2015-07-11 03:53:12.000000000 -0400 ++++ b/viewer/Makefile.am 2016-01-21 03:37:04.355789682 -0500 +@@ -5,6 +5,10 @@ + -fvisibility=hidden -fvisibility-inlines-hidden + endif + ++if !GRAPHICS_DISABLED ++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/ ++endif ++ + noinst_HEADERS = \ + scrollview.h svmnode.h svutil.h + diff --git a/app-text/tesseract/tesseract-3.04.00-r3.ebuild b/app-text/tesseract/tesseract-3.04.00-r4.ebuild similarity index 82% rename from app-text/tesseract/tesseract-3.04.00-r3.ebuild rename to app-text/tesseract/tesseract-3.04.00-r4.ebuild index 76400019720b..3c43d7bbc5b2 100644 --- a/app-text/tesseract/tesseract-3.04.00-r3.ebuild +++ b/app-text/tesseract/tesseract-3.04.00-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,8 +6,9 @@ EAPI=5 MY_PN="tesseract-ocr" URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/" +JAVA_PKG_OPT_USE="scrollview" -inherit eutils autotools autotools-utils +inherit eutils autotools java-pkg-opt-2 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source." HOMEPAGE="https://github.com/tesseract-ocr" @@ -65,24 +66,35 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW" # With opencl USE=tiff is necessary in leptonica -DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?] - opencl? ( virtual/opencl - media-libs/tiff:0 - >=media-libs/leptonica-1.71[zlib,tiff,jpeg?,png?,webp?] - ) +CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] + opencl? ( + virtual/opencl + media-libs/tiff:0= + media-libs/leptonica:=[tiff] + ) + scrollview? ( + >=dev-java/piccolo2d-3.0:0 + ) training? ( - dev-libs/icu - x11-libs/pango - x11-libs/cairo + dev-libs/icu:= + x11-libs/pango:= + x11-libs/cairo:= ) " -RDEPEND="${DEPEND}" + +DEPEND="${CDEPEND} + scrollview? ( >=virtual/jdk-1.7 )" + +RDEPEND="${CDEPEND} + scrollview? ( >=virtual/jre-1.7 )" DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes ) PATCHES=( "${FILESDIR}/tesseract-2.04-gcc47.patch" "${FILESDIR}/${P}-fix-scrollview-disabled.patch" + "${FILESDIR}/${P}-use-system-piccolo2d.patch" + "${FILESDIR}/${P}-leptonica-1.73-compat.patch" ) src_unpack() { @@ -92,28 +104,36 @@ src_unpack() { -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die } +src_prepare() { + epatch "${PATCHES[@]}" + eautoreconf + + java-pkg-opt-2_src_prepare +} + src_configure() { local myeconfargs=( - $(use_enable opencl) \ + --enable-shared + $(use_enable opencl) $(use_enable scrollview graphics) - ) - autotools-utils_src_configure + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" } src_compile() { default - if use training; then - emake training - fi - } + use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)" + use training && emake training +} src_install() { - autotools-utils_src_install + default + prune_libtool_files if use training; then - pushd "${BUILD_DIR}" emake DESTDIR="${D}" training-install - popd fi if use examples; then @@ -122,10 +142,10 @@ src_install() { fi if use doc; then - dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/* + dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/* fi - # install language files insinto /usr/share/tessdata - doins "${S}"/tessdata/*traineddata* + doins tessdata/*traineddata* # language files + use scrollview && doins java/ScrollView.jar # scrollview } diff --git a/app-text/txt2man/txt2man-1.5.6.ebuild b/app-text/txt2man/txt2man-1.5.6.ebuild index 30e388de9a7e..30f253dd6766 100644 --- a/app-text/txt2man/txt2man-1.5.6.ebuild +++ b/app-text/txt2man/txt2man-1.5.6.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://mvertes.free.fr/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="" RDEPEND="app-shells/bash diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml index 0c25aeec9f70..c10e79b35f37 100644 --- a/dev-db/firebird/metadata.xml +++ b/dev-db/firebird/metadata.xml @@ -21,6 +21,8 @@ Proxy Maintainers - bear1650@mail.ru> + bear1650@mail.ru + Andrey Matrosov + Proxied maintainer, assign bugs to him diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild index 58343b44b6f6..ae7b82512511 100644 --- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild index 587f8410671a..2b4de94ea5a4 100644 --- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild +++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest index 1b1cb207bb9e..5fde820d2dfc 100644 --- a/dev-java/icedtea-bin/Manifest +++ b/dev-java/icedtea-bin/Manifest @@ -1,16 +1,20 @@ +DIST icedtea-bin-core-3.0.0_pre08-ppc64.tar.xz 49938816 SHA256 870e853f4108b6b916d23e9f826a85bd65880db934a28c993c303aae70f7c65a SHA512 9eedbb033bc64010cf54c9459cbf50fed4d87c3b016883ffb80ece0cae01be50f7e6532c4eb135fe7292a83bc82a175f0eb21b1bb60d75f20d7e16f0ee057fb6 WHIRLPOOL 60ed17f1dd131fc417245dcddd04f79fc477357695662731d511afb2ace92f7d6c358d50dce01c61a529357b3bd9df8f1b65fefe1a4c12fef621d6bca7814309 DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7 DIST icedtea-bin-core-7.2.6.4-amd64.tar.xz 53010708 SHA256 16e33d1f686c657c9b16c63d206bfbc6b079dd2112108f4205057e6998291345 SHA512 ee6674d99d2ffcc9c9209eb22f9efc0f2ff4a57e1cdf6763de7ff505e312cc740068a68c4ad77ff8f9941ebc5407cd2b3cacb17dda22fefb77c9a0dab4ea66a6 WHIRLPOOL e86c06eefd6f7eb605c7a39c6865f8eb56260febe595527cbbd6db41ea2fcb7c0a65bb60846dd2bfaaf6b2ee3548297a0bb3af61df900d10b8c5a7605d95737e DIST icedtea-bin-core-7.2.6.4-arm.tar.xz 43993060 SHA256 980d3185cda11cc4b7b6287d3a7a5ea7c87e5b138f066f9fc6d2a2ec6b7157d6 SHA512 892b7e0268baabd2e921d5144e233c127698bff21da075f77c3b96b0c70a0a4b9515cd184bc992f89c3821eea9decaac3bee507ceeb0758573280b51f92e6928 WHIRLPOOL ba334447e3ae703c8240667be155844b470b54753792dc6c8ae207a73b3a9b278752eee4a085d13cc5b6fa5371da631cc6e02607d524810df14f056745821ac9 DIST icedtea-bin-core-7.2.6.4-ppc64.tar.xz 42990476 SHA256 b5a94318086797e230e9cdc3f87224464979b5024ce0a02a6a10875e15bc5609 SHA512 be065eeb6682163b290ad4374a2d24ed4c7cb042d2253962bb9c2129d1a78ec97439c3e0fa4f3a6db74fbaee2f9ef8f09dd80188d55b5aabde320a13c1c8d2e4 WHIRLPOOL 266bbb109cae1d97befc1cca6a915f989ec5d43b689499c42a26d3be7a5903bd4c9ae7cc571f044b59f0a786ab74bd68b8eb46691ac743f31b9e20eb23cedd5f DIST icedtea-bin-core-7.2.6.4-x86.tar.xz 54661536 SHA256 9329914ee4a6072afb940e2a3f63b5ee356cb1d332a94b46d38e54ea68c2a4b2 SHA512 42348aca553722161102f7eaa9833ff4723b183a2844d5a2cdab9d1dd88ac02e991971a61c8b934f1455b21f9a11947b2a753283941135495c84717ca55cd825 WHIRLPOOL 3548ec0058b38cfc551a687f8f1fc998872975d3c9bd07124b3593ed8da59c2a689de133c414ec934cee8a47e5a4ef915e42ab9c4541cbf7d2b358505e6d729c +DIST icedtea-bin-doc-3.0.0_pre08.tar.xz 11639920 SHA256 8bac327c2b7ee9f6d025e7d1c45f68f807b065a9c498d26ccffdbecf3227d4ca SHA512 77eca88faf7d0a59b43f56448ef4667cb43127df0673778f7508ee90f95aaf1d24720148b8a91548e842bab129b9298e47f3a8caa79ea99289983e22123f378a WHIRLPOOL 6747394f96a789ab4e716e38e67b60dbccdfacd491b8c8e13571b6fc250b7342661aab32928e79d6d6fbcb5543afeddbe4fe48cac26eb7d051e4abdae2662d75 DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907 DIST icedtea-bin-doc-7.2.6.4.tar.xz 10603692 SHA256 07e1bf90c61b56bf311d528891f30ed0cd67f073e6019aa92c8907c86bf1c6ac SHA512 6c97c37926989b1a36bb1fe9712caf6270c539646aeb76d30a10e9479ecbf734f2f56ef934f774a9cfe4d713651fd0b8c99872f6651f2d7e3c86a18294f9ea79 WHIRLPOOL 023eb8ee8851882101cff967d7ee58f69aa569257f113e512faef2ba3eebf066f01b80440cfbb59c7ed67b36630426ea88300724e7348611ae80c498e5da8b84 +DIST icedtea-bin-examples-3.0.0_pre08-ppc64.tar.xz 1804960 SHA256 3b0226b82194b575cfc6efd7dd1e08bedd6e2ad97f73e6087d6b189ec115eb5c SHA512 fb8a42e21aa94b7ae497e41b13e8bd09f17c2f435e01336d340d9d52eeac3bd647f91f1405224d707ecad9444695e85de43006ab9f072bff7d577699f005e5da WHIRLPOOL 3408560bec2dd5eb1fec83291f8062362044d1b31c9fac7fbf1e20a809d017e1666dc8a017fc1a547b5af3918f2e68cd27e0f2d7321259ca4b77e15375c05bc3 DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816 DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e DIST icedtea-bin-examples-7.2.6.4-amd64.tar.xz 1796924 SHA256 1cba4146c597bd9cae873965b2f198fa944a368fe4bd39deb0e0a06df8638143 SHA512 10be9af6a44e0e10fff7df279e4c0912df4f53e48b6fbb3891a1f9b72eb4ca7c696019eee780ad7bfd2cf9001e8acdc44739ba8c95706a46e33278e104c1bbbd WHIRLPOOL d5272f7a711dbf69d976b83623b64e1f55cb1d459a081aa5c71dffb585675c2b05b00798fe034007e7f58d94f7dabb0c8a47c9ffec740c2d55bfbfbec35326cd DIST icedtea-bin-examples-7.2.6.4-arm.tar.xz 1779692 SHA256 2b0965c93b8b1fe97ac25519739f132824f2f6cfb0662dcc93e5016f640f3024 SHA512 a16bcf86f3fba0dfd09d233cc53cb7e49f52317479b84db5d49939e3d22afdc31c2e75ec81bc8ebe7635e993097d0bc0d7b0e9610cfe3c6491b0f69f578e4e55 WHIRLPOOL 1ecbc914e22fe52697a57d0e5cb202c96478a07447f33877a7e3ad3b8e27f35e640ecf856e35c4c1e288220208efc0244b0b1f93ff6f1b83df0e64b001695e5c DIST icedtea-bin-examples-7.2.6.4-ppc64.tar.xz 1790468 SHA256 cb0b8ce994281676259f92e91b513f23765ad7364367986f46bbbeca661a914d SHA512 d749f6d42a7c05bc2499a4df69b6921e0fc36bbf12bef1cd64cf79fc13b1c256c2b10159f120bbf5546696777a3d71e64a3370903cfc49d095925931eb12f75f WHIRLPOOL 44b41eb5f857f695e305f85ab7f3a6b71989372f1b327ba6d8dab1251237fe9ea274bf29e32663644298b44febef3b5b220fa740793bc62e40811b1a0a9aded2 DIST icedtea-bin-examples-7.2.6.4-x86.tar.xz 1796620 SHA256 16591cca92ef9470873f89c6c2291b458c4dc441a8adac1e4a1c34bd5f9514a4 SHA512 7ca0d297247a367c63de0c016949a1157f987592d6481347d31d2b127db71f932f6444c75c42c55357494579357fed65c3261a25ad046f14d473cf58b585822f WHIRLPOOL 8d28811e3c83534e5a2545a15ce3729827073099095e43923d653b6ac3d6d6f4838e24757e6aefd87603e22f27a2a82cacc219459bfe7f2b5f5346750d9cb25a +DIST icedtea-bin-src-3.0.0_pre08.tar.xz 45637496 SHA256 3a4365c4c4b648141a895cbce0bbb28c2e3ccaeff6ff426210459322437102e1 SHA512 c686bae2b5b283a769c64bc61bd4d184180414e477b22e85a0bf2fb8995ce810bb4e4283c3bb1e75f6dee55c380cd843902ed17517d6575682a46ca5f02e4094 WHIRLPOOL a7d4d2c57548fd082fd77086f38dd4d2f68379b34cfd649232c7e9ed7c1271f949d80779052e91f77ffd0a3e4d5ba3da8ecc815b87a3f72c8647a2666f380f8b DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79 DIST icedtea-bin-src-7.2.6.4.tar.xz 40039764 SHA256 62f0cc8dee7a518c01e3fb1cc821686440171c67e32936faedbfd57500d7a252 SHA512 e4e208766f35b9a0d720c5e853bbded04cc38f5f972ff83c759786bdaef43e5a454361be61f677ff57686007d9e393e15345ba9577abf189f94ebb6067ca885c WHIRLPOOL dc9102f20caf079d61a816ed21c791348fe1717cf4424d5b5b8e1928010bcee7eab885bf44a438934ccf6562f1f8b6259a31f45d32b1bf752e893e1153c1cb0e diff --git a/dev-java/icedtea-bin/files/icedtea-bin-8.env b/dev-java/icedtea-bin/files/icedtea-bin-8.env new file mode 100644 index 000000000000..e6feaabd034d --- /dev/null +++ b/dev-java/icedtea-bin/files/icedtea-bin-8.env @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +VERSION="IcedTea JDK @PV@" +JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@" +JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@" +JAVAC="${JAVA_HOME}/bin/javac" +PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" +LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" +MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man" +PROVIDES_TYPE="JDK JRE" +PROVIDES_VERSION="1.8" +# Taken from sun.boot.class.path property +BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/jfr.jar" +GENERATION="2" +ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/icedtea-bin/icedtea-bin-3.0.0_pre08.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.0.0_pre08.ebuild new file mode 100644 index 000000000000..eeecaf8b832d --- /dev/null +++ b/dev-java/icedtea-bin/icedtea-bin-3.0.0_pre08.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit java-vm-2 multilib prefix toolchain-funcs + +dist="https://dev.gentoo.org/~chewi/distfiles" +TARBALL_VERSION="${PV}" + +DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" +HOMEPAGE="http://icedtea.classpath.org" +SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz ) + source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )" + +for arch in ppc64; do + SRC_URI+=" + ${arch}? ( + ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz + examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz ) + )" +done + +LICENSE="GPL-2-with-linking-exception" +SLOT="8" +KEYWORDS="-* ~ppc64" + +IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source +webstart" +REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )" + +RESTRICT="preserve-libs strip" +QA_PREBUILT="opt/.*" + +RDEPEND=">=dev-libs/glib-2.42:2 + >=dev-libs/nss-3.16.1-r1 + >=dev-libs/nspr-4.10 + media-fonts/dejavu + >=media-libs/fontconfig-2.11:1.0 + >=media-libs/freetype-2.5.5:2 + >=media-libs/lcms-2.6:2 + >=sys-devel/gcc-4.9.3 + >=sys-libs/glibc-2.21 + >=sys-libs/zlib-1.2.8-r1 + virtual/jpeg:62 + alsa? ( >=media-libs/alsa-lib-1.0 ) + !headless-awt? ( + >=media-libs/giflib-4.1.6-r1 + media-libs/libpng:0/16 + >=x11-libs/libX11-1.6 + >=x11-libs/libXext-1.3 + >=x11-libs/libXi-1.7 + >=x11-libs/libXrender-0.9.8 + >=x11-libs/libXtst-1.2 + ) + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + media-fonts/lklug + media-fonts/lohit-fonts + media-fonts/sazanami + ) + cups? ( >=net-print/cups-2.0 ) + gtk? ( + >=dev-libs/atk-2.16.0 + >=x11-libs/cairo-1.14.2 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.24:2 + >=x11-libs/pango-1.36 + ) + selinux? ( sec-policy/selinux-java )" + +DEPEND="!arm? ( dev-util/patchelf )" + +PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) + nsplugin? ( >=dev-java/icedtea-web-1.6.1:0 ) + pulseaudio? ( dev-java/icedtea-sound )" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_prepare() { + if ! use alsa; then + rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die + fi + + if use headless-awt; then + rm -vr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ + {,jre/}bin/policytool bin/appletviewer || die + fi + + if [[ -n "${EPREFIX}" ]]; then + # The binaries are built on a non-prefixed system so the + # fontconfig needs to have prefixes inserted. + sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die + eprefixify jre/lib/fontconfig.Gentoo.properties + fi + + # Fix the RPATHs, except on arm. + # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3 + # https://github.com/NixOS/patchelf/issues/8 + if use arm; then + ewarn "The RPATHs on these binaries are normally modified to avoid" + ewarn "conflicts with an icedtea installation built from source. This" + ewarn "is currently not possible on ARM so please refrain from" + ewarn "installing dev-java/icedtea on the same system." + else + local old="/usr/$(get_libdir)/icedtea${SLOT}" + local new="${EPREFIX}/opt/${P}" + local elf rpath + + for elf in $(find -type f -executable ! -name "*.cgi" || die); do + rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}") + + if [[ -n "${rpath}" ]]; then + patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}" + fi + done + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest#/}" + dodir "${dest}" + + # doins doesn't preserve executable bits. + cp -pRP bin include jre lib man "${ddest}" || die + + dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} + use doc && dodoc -r doc/html + + if use examples; then + cp -pRP demo sample "${ddest}" || die + fi + + if use source; then + cp src.zip "${ddest}" || die + fi + + if use webstart || use nsplugin; then + dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings" + dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings" + fi + if use webstart; then + dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws" + dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws" + fi + + # Both icedtea itself and the icedtea ebuild set PAX markings but we + # disable them for the icedtea-bin build because the line below will + # respect end-user settings when icedtea-bin is actually installed. + java-vm_set-pax-markings "${ddest}" + + set_java_env + java-vm_revdep-mask "${dest}" + java-vm_sandbox-predict /proc/self/coredump_filter +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst +} diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 5aa669aa969b..cb465e24e7c5 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -1,6 +1,9 @@ -DIST crystal-0.7.7-1-linux-i686.tar.gz 11289486 SHA256 7a1ccdce29c1437da1cbaafa3fefd5ebc3c4b84b885964a6d4eaf8bfc5922831 -DIST crystal-0.7.7-1-linux-x86_64.tar.gz 10907197 SHA256 433acbe8e88fe0c3df67ad64bd436349a6bcfc146284f0a690283ebefb93b5e6 -DIST crystal-0.7.7.tar.gz 709692 SHA256 5506f69ed59592666aa667a33ba90b07f1de2cc1ebeee25e771715f8521065f8 -DIST crystal-0.8.0-1-linux-i686.tar.gz 11465702 SHA256 47b96c790458daa4179a777ba9356959e597f38cfda535a3f9069d46b362579d -DIST crystal-0.8.0-1-linux-x86_64.tar.gz 11004413 SHA256 6a0414b903cd99bfed8ebe2a447dc0c85f4fbc31e493064e44d37770e95a4b0e -DIST crystal-0.8.0.tar.gz 731304 SHA256 986a000bb2eded22e446fd55c543062770ec4000e28791f0b07f63fcee37b245 +DIST crystal-0.11.1-1-linux-i686.tar.gz 12283213 SHA256 2db84f6a287925d02832192cb7c5b99d0f543afd5323286a3a8c1799d5952abe SHA512 c4cfcd51efa76492c0174d8a5273303d17e672273de1b35eafcce920710afadd031e7cfec775880ccedd7d6e87d0f2c27958b1499c8ce494fcc849c6e78ec2a5 WHIRLPOOL 849abefe1ebbf9b8aae484567662973b5712e1d55a45a123cd41f7f0cfd4ecd5f7bfe5d27e6ce227922b4985772f4b70acfb8e94ff8042c48a48f08c9cab5887 +DIST crystal-0.11.1-1-linux-x86_64.tar.gz 11854829 SHA256 742ee62b23d2ada2a9baa39d0f30973ca0b5b003504b04f2aad8483ef9b6f07b SHA512 ff0a8f25a5732936797f9d9359be9725d4d93f80d1d33ddf43e1833d4fd9dc9dcfc99e6d3a54e51c380cbdaacf0c8bf7b0077b939739434e604ad33f38dc56e0 WHIRLPOOL d26aa43fe08d05f29e38885b005ccd43a3f35a51e909d2ff4c343f1d617041d7b3c7f80414781abee482f43115b9d4a9963fa5001391a5d9a487f89580605811 +DIST crystal-0.11.1.tar.gz 830437 SHA256 bdff81fcb4f2dfdd50d79abba8a1ed0260bad4c1f055002cd16b9b6f443b8a15 SHA512 ba2dc5a74925c8cc84e0654773e4befb604b3c485294d54e8ed738d7f1eef42173bb94aa12a08b65845e29494073b83b1da7bbe9438df0ba0ed30dd8491ce4ba WHIRLPOOL 9cf36214ef6df4d1e9249e8f725343eb3235cb12323416b9247c478dbca97b42c3be317c58d478576dd1cb81dc3d57b8c5e8118a4fd11d6c103a40b277de7cbe +DIST crystal-0.7.7-1-linux-i686.tar.gz 11289486 SHA256 7a1ccdce29c1437da1cbaafa3fefd5ebc3c4b84b885964a6d4eaf8bfc5922831 SHA512 758e1c6b9a00fca3080abd33adbb995157ad8a335e58899b7c6aba4d9eea5ff4cae27ac1476865b04d6b349dfd2bea0809fea7fcadcd5b08f617f30ec3e809cf WHIRLPOOL 465c3455d5ec1200345e6735e4616269f43e1e31097f22f81d0d3e6e6b3ea18f786e647da9d0d97da73de057a222d8ef234c3dbb4978a3a730ee1b498e709116 +DIST crystal-0.7.7-1-linux-x86_64.tar.gz 10907197 SHA256 433acbe8e88fe0c3df67ad64bd436349a6bcfc146284f0a690283ebefb93b5e6 SHA512 c2e895d3bc3c92da49aca6eba3f2cf5cefe5d88cf49c4230f887dd81d094a4a78d67eb10fcec8445fd66e29ad5167108807362ae9257c89859d2aa6c614ab0a9 WHIRLPOOL c1970d4ec8cde2bb181749f1d5d8d80ba4b309f07ce176d5d6312f6e978e0de8db83914e967da9d4995ee243d57cd0bb50739f5b726ff43a2553b65f00112477 +DIST crystal-0.7.7.tar.gz 709692 SHA256 5506f69ed59592666aa667a33ba90b07f1de2cc1ebeee25e771715f8521065f8 SHA512 ba0911bec52e82b9768a1535406a62b675bcfb996929d62e86791533847be233cbf3bd8f09dc7803de7b6b9c7d791f7fecaea6d6f3d1425d0c67047d7751322f WHIRLPOOL f70f8e40ff6ad86c4a868984aa2fba12ca31dbb3f8383f1fffa960f8d104fa7af3c253dfd9539691adadfb21c172e5cf4c19b9a06fbdbbbdcbe265021b98b4a2 +DIST crystal-0.8.0-1-linux-i686.tar.gz 11465702 SHA256 47b96c790458daa4179a777ba9356959e597f38cfda535a3f9069d46b362579d SHA512 c3cd58cc13014652bff816796e5138824e3f9c08ff898be50c5890cb0927a86d61c69fa845225bf8b83b1589ebfbff4c5cf10e54b742b2132db42c79c757cb37 WHIRLPOOL 7d19c859e5b47fb9481e33302112998502e596fedd9cf22c2c5aeb25ecd0db83181ddb649b4c736f7472c62ca824e8bc183ba8e23537a7eea908cfad4f05d2f1 +DIST crystal-0.8.0-1-linux-x86_64.tar.gz 11004413 SHA256 6a0414b903cd99bfed8ebe2a447dc0c85f4fbc31e493064e44d37770e95a4b0e SHA512 c065799cab222ce2c074a79ccb3eb957fa381156173e07fa14525d1cb87991574179a5ad05691223a577ea37053ef9d5d5c18f96ac5a3ecd5676e1e43cc99641 WHIRLPOOL 262be369485b593b76d569338024c2e51d70d6e79d9956e43499b35d48202d14fcf97c734b0368cce8b4a95c94a74886384c909e3770fd688add979348efc343 +DIST crystal-0.8.0.tar.gz 731304 SHA256 986a000bb2eded22e446fd55c543062770ec4000e28791f0b07f63fcee37b245 SHA512 a431abaf98addd67decbc62b264e46e7fe56ef5c83cbbd8576e39b67b863b0e0d487b0b9dc0ed02831e165824c7b5daaf5537c0368668302614549ddf9629bce WHIRLPOOL 876b6ec023cd621996acd24803a8f285058fa1ae810fb8afea97cc155cfaa4370abfeb6ae7f9246653e6da6044240e561346e10e7aeaab518abf37f294559345 diff --git a/dev-lang/crystal/crystal-0.11.1.ebuild b/dev-lang/crystal/crystal-0.11.1.ebuild new file mode 100644 index 000000000000..b5f4005864ac --- /dev/null +++ b/dev-lang/crystal/crystal-0.11.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib + +BV=${PV}-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="http://crystal-lang.org" +SRC_URI="https://github.com/manastech/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz + amd64? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/manastech/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples +xml +yaml" + +# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382 +DEPEND=" + -Date: Sun, 30 Mar 2014 13:47:08 +0200 -Subject: atk: Update and fix metadata - -Fixes bug 727029 - -Conflicts: - vapi/metadata/Atk-1.0-custom.vala - vapi/metadata/Atk-1.0.metadata ---- - vapi/atk.vapi | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 81 insertions(+), 4 deletions(-) - -diff --git a/vapi/atk.vapi b/vapi/atk.vapi -index 55db067..cc17cfb 100644 ---- a/vapi/atk.vapi -+++ b/vapi/atk.vapi -@@ -41,12 +41,15 @@ namespace Atk { - public class Misc : GLib.Object { - [CCode (has_construct_function = false)] - protected Misc (); -+ [Deprecated] - public static unowned Atk.Misc get_instance (); -+ [Deprecated] - public virtual void threads_enter (); -+ [Deprecated] - public virtual void threads_leave (); - } - [CCode (cheader_filename = "atk/atk.h", type_id = "atk_no_op_object_get_type ()")] -- public class NoOpObject : Atk.Object, Atk.Action, Atk.Component, Atk.Document, Atk.EditableText, Atk.Hypertext, Atk.Image, Atk.Selection, Atk.Table, Atk.Text, Atk.Value, Atk.Window { -+ public class NoOpObject : Atk.Object, Atk.Action, Atk.Component, Atk.Document, Atk.EditableText, Atk.Hypertext, Atk.Image, Atk.Selection, Atk.Table, Atk.TableCell, Atk.Text, Atk.Value, Atk.Window { - [CCode (has_construct_function = false, type = "AtkObject*")] - public NoOpObject (GLib.Object obj); - } -@@ -65,6 +68,7 @@ namespace Atk { - [CCode (has_construct_function = false)] - protected Object (); - public bool add_relationship (Atk.RelationType relationship, Atk.Object target); -+ [Deprecated] - public virtual uint connect_property_change_handler (Atk.PropertyChangeHandler handler); - public virtual Atk.AttributeSet get_attributes (); - public virtual unowned string get_description (); -@@ -82,9 +86,11 @@ namespace Atk { - public virtual Atk.Role get_role (); - public virtual void initialize (void* data); - public void notify_state_change (Atk.State state, bool value); -+ public unowned Atk.Object peek_parent (); - public Atk.Object ref_accessible_child (int i); - public virtual Atk.RelationSet ref_relation_set (); - public virtual Atk.StateSet ref_state_set (); -+ [Deprecated] - public virtual void remove_property_change_handler (uint handler_id); - public bool remove_relationship (Atk.RelationType relationship, Atk.Object target); - public virtual void set_description (string description); -@@ -105,27 +111,33 @@ namespace Atk { - public Atk.Object accessible_parent { owned get; set; } - [NoAccessorMethod] - public int accessible_role { get; set; } -+ [Deprecated] - [NoAccessorMethod] - public string accessible_table_caption { owned get; set; } - [NoAccessorMethod] - public Atk.Object accessible_table_caption_object { owned get; set; } -+ [Deprecated] - [NoAccessorMethod] - public string accessible_table_column_description { owned get; set; } -+ [Deprecated] - [NoAccessorMethod] - public Atk.Object accessible_table_column_header { owned get; set; } -+ [Deprecated] - [NoAccessorMethod] - public string accessible_table_row_description { owned get; set; } -+ [Deprecated] - [NoAccessorMethod] - public Atk.Object accessible_table_row_header { owned get; set; } - [NoAccessorMethod] - public Atk.Object accessible_table_summary { owned get; set; } -+ [Deprecated] - [NoAccessorMethod] - public double accessible_value { get; set; } - public virtual signal void active_descendant_changed (void* child); - public virtual signal void children_changed (uint change_index, void* changed_child); - [Deprecated] - public virtual signal void focus_event (bool focus_in); -- public signal void property_change (void* arg1); -+ public virtual signal void property_change (void* values); - public virtual signal void state_change (string name, bool state_set); - public virtual signal void visible_data_changed (); - } -@@ -145,6 +157,17 @@ namespace Atk { - [NoWrapper] - public virtual string get_object_id (); - } -+ [CCode (cheader_filename = "atk/atk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atk_range_get_type ()")] -+ [Compact] -+ public class Range { -+ [CCode (has_construct_function = false)] -+ public Range (double lower_limit, double upper_limit, string description); -+ public Atk.Range copy (); -+ public void free (); -+ public unowned string get_description (); -+ public double get_lower_limit (); -+ public double get_upper_limit (); -+ } - [CCode (cheader_filename = "atk/atk.h")] - public class Registry : GLib.Object { - [Deprecated] -@@ -280,7 +303,9 @@ namespace Atk { - public abstract void get_extents (int x, int y, int width, int height, Atk.CoordType coord_type); - public abstract Atk.Layer get_layer (); - public abstract int get_mdi_zorder (); -+ [Deprecated] - public abstract void get_position (int x, int y, Atk.CoordType coord_type); -+ [Deprecated] - public abstract void get_size (int width, int height); - public abstract bool grab_focus (); - public abstract Atk.Object ref_accessible_at_point (int x, int y, Atk.CoordType coord_type); -@@ -371,13 +396,16 @@ namespace Atk { - public abstract bool add_column_selection (int column); - public abstract bool add_row_selection (int row); - public abstract unowned Atk.Object get_caption (); -+ [Deprecated] - public abstract int get_column_at_index (int index_); - public abstract unowned string get_column_description (int column); - public abstract int get_column_extent_at (int row, int column); - public abstract unowned Atk.Object get_column_header (int column); -+ [Deprecated] - public abstract int get_index_at (int row, int column); - public abstract int get_n_columns (); - public abstract int get_n_rows (); -+ [Deprecated] - public abstract int get_row_at_index (int index_); - public abstract unowned string get_row_description (int row); - public abstract int get_row_extent_at (int row, int column); -@@ -405,6 +433,16 @@ namespace Atk { - public virtual signal void row_inserted (int row, int num_inserted); - public virtual signal void row_reordered (); - } -+ [CCode (cheader_filename = "atk/atk.h", type_id = "atk_table_cell_get_type ()")] -+ public interface TableCell : Atk.Object { -+ public abstract GLib.GenericArray get_column_header_cells (); -+ public abstract int get_column_span (); -+ public abstract bool get_position (out int row, out int column); -+ public abstract bool get_row_column_span (out int row, out int column, out int row_span, out int column_span); -+ public abstract GLib.GenericArray get_row_header_cells (); -+ public abstract int get_row_span (); -+ public abstract Atk.Object get_table (); -+ } - [CCode (cheader_filename = "atk/atk.h")] - public interface Text : GLib.Object { - public abstract bool add_selection (int start_offset, int end_offset); -@@ -418,6 +456,7 @@ namespace Atk { - public static Atk.TextAttribute attribute_register (string name); - public static void free_ranges ([CCode (array_length = false)] Atk.TextRange[] ranges); - [CCode (array_length = false, array_null_terminated = true)] -+ [NoWrapper] - public virtual Atk.TextRange[] get_bounded_ranges (Atk.TextRectangle rect, Atk.CoordType coord_type, Atk.TextClipType x_clip_type, Atk.TextClipType y_clip_type); - public abstract int get_caret_offset (); - public abstract unichar get_character_at_offset (int offset); -@@ -450,11 +489,22 @@ namespace Atk { - } - [CCode (cheader_filename = "atk/atk.h", type_id = "atk_value_get_type ()")] - public interface Value : GLib.Object { -+ [Deprecated] - public abstract void get_current_value (GLib.Value value); -+ public abstract double get_increment (); -+ [Deprecated] - public abstract void get_maximum_value (GLib.Value value); -+ [Deprecated] - public abstract void get_minimum_increment (GLib.Value value); -+ [Deprecated] - public abstract void get_minimum_value (GLib.Value value); -+ public abstract Atk.Range get_range (); -+ public abstract GLib.SList get_sub_ranges (); -+ public abstract void get_value_and_text (out double value, out string text); -+ [Deprecated] - public abstract bool set_current_value (GLib.Value value); -+ public abstract void set_value (double new_value); -+ public signal void value_changed (double value, string text); - } - [CCode (cheader_filename = "atk/atk.h", type_id = "atk_window_get_type ()")] - public interface Window : Atk.Object { -@@ -484,8 +534,7 @@ namespace Atk { - public uint16 keycode; - public uint32 timestamp; - } -- [CCode (cheader_filename = "atk/atk.h", cname = "_AtkPropertyValues", has_type_id = false)] -- [GIR (name = "_PropertyValues")] -+ [CCode (cheader_filename = "atk/atk.h", has_type_id = false)] - public struct PropertyValues { - public weak string property_name; - public GLib.Value old_value; -@@ -688,6 +737,9 @@ namespace Atk { - MATH, - RATING, - TIMER, -+ DESCRIPTION_LIST, -+ DESCRIPTION_TERM, -+ DESCRIPTION_VALUE, - LAST_DEFINED; - [CCode (cheader_filename = "atk/atk.h")] - public static Atk.Role for_name (string name); -@@ -696,6 +748,7 @@ namespace Atk { - [CCode (cheader_filename = "atk/atk.h")] - public static unowned string get_name (Atk.Role role); - [CCode (cheader_filename = "atk/atk.h")] -+ [Deprecated] - public static Atk.Role register (string name); - } - [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_STATE_", type_id = "atk_state_type_get_type ()")] -@@ -814,6 +867,29 @@ namespace Atk { - LINE, - PARAGRAPH - } -+ [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_VALUE_", type_id = "atk_value_type_get_type ()")] -+ public enum ValueType { -+ VERY_WEAK, -+ WEAK, -+ ACCEPTABLE, -+ STRONG, -+ VERY_STRONG, -+ VERY_LOW, -+ LOW, -+ MEDIUM, -+ HIGH, -+ VERY_HIGH, -+ VERY_BAD, -+ BAD, -+ GOOD, -+ VERY_GOOD, -+ BEST, -+ LAST_DEFINED; -+ [CCode (cheader_filename = "atk/atk.h")] -+ public static unowned string get_localized_name (Atk.ValueType value_type); -+ [CCode (cheader_filename = "atk/atk.h")] -+ public static unowned string get_name (Atk.ValueType value_type); -+ } - [CCode (cheader_filename = "atk/atk.h", has_target = false)] - public delegate void EventListener (Atk.Object obj); - [CCode (cheader_filename = "atk/atk.h", has_target = false)] -@@ -826,6 +902,7 @@ namespace Atk { - [CCode (cheader_filename = "atk/atk.h", instance_pos = 1.9)] - public delegate int KeySnoopFunc (Atk.KeyEventStruct event); - [CCode (cheader_filename = "atk/atk.h", has_target = false)] -+ [Deprecated] - public delegate void PropertyChangeHandler (Atk.Object obj, Atk.PropertyValues vals); - [CCode (cheader_filename = "atk/atk.h", cname = "GSignalEmissionHook", has_target = false)] - public delegate bool SignalEmissionHook (GLib.SignalInvocationHint ihint, [CCode (array_length_pos = 1.9)] Atk.Value[] param_values, void* data); diff --git a/dev-lang/vala/vala-0.20.1.ebuild b/dev-lang/vala/vala-0.20.1.ebuild deleted file mode 100644 index 2d18ac05e270..000000000000 --- a/dev-lang/vala/vala-0.20.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://live.gnome.org/Vala" - -LICENSE="LGPL-2.1" -SLOT="0.20" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="test +vapigen" - -RDEPEND=" - >=dev-libs/glib-2.18:2 - >=dev-libs/vala-common-${PV}" -DEPEND="${RDEPEND} - !${CATEGORY}/${PN}:0 - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 )" - -src_configure() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable vapigen) -} diff --git a/dev-lang/vala/vala-0.24.0-r1.ebuild b/dev-lang/vala/vala-0.24.0-r1.ebuild deleted file mode 100644 index 64409701d2b4..000000000000 --- a/dev-lang/vala/vala-0.24.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 eutils - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Vala" - -LICENSE="LGPL-2.1" -SLOT="0.24" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="test +vapigen" - -RDEPEND=" - >=dev-libs/glib-2.18:2 - >=dev-libs/vala-common-${PV} -" -DEPEND="${RDEPEND} - !${CATEGORY}/${PN}:0 - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 ) -" - -src_prepare() { - # atk: Update and fix metadata (from 'master', backport from Debian), bug #508704 - epatch "${FILESDIR}/${PN}-0.24.0-atk-metadata.patch" - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable vapigen) -} diff --git a/dev-lang/vala/vala-0.30.0.ebuild b/dev-lang/vala/vala-0.30.1.ebuild similarity index 93% rename from dev-lang/vala/vala-0.30.0.ebuild rename to dev-lang/vala/vala-0.30.1.ebuild index 9739c4d19e74..0f2884d51e6d 100644 --- a/dev-lang/vala/vala-0.30.0.ebuild +++ b/dev-lang/vala/vala-0.30.1.ebuild @@ -8,7 +8,7 @@ GCONF_DEBUG="no" inherit gnome2 DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0.30" diff --git a/dev-libs/efl/efl-1.15.2.ebuild b/dev-libs/efl/efl-1.15.2.ebuild index 08d9bb719a89..f11ad9c22f5b 100644 --- a/dev-libs/efl/efl-1.15.2.ebuild +++ b/dev-libs/efl/efl-1.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/dev-libs/efl/efl-1.16.1.ebuild b/dev-libs/efl/efl-1.16.1.ebuild index 10fab6deb1a2..e8ae205e3ec6 100644 --- a/dev-libs/efl/efl-1.16.1.ebuild +++ b/dev-libs/efl/efl-1.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index 40c6956e748d..b8cfed493122 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1,3 +1 @@ -DIST jansson-2.4.tar.gz 401597 SHA256 1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41 SHA512 52c82ea2e70b9a1b72a62e07d917e5b2f8dc1b0fd6022397cbdd60b98aee176cc02f8c65b60d371b4007c60644898667f6bc0dfd11a26a411f167fac0e4df9a0 WHIRLPOOL c028243d8ecd0763f6f6d012113cbbb6ac58698532f94563372994311650762a7eb2d7f1831779dabcce0be2c013d4cb103bde5c3ad919afeeb82f2c875c2460 -DIST jansson-2.6.tar.gz 428175 SHA256 98fa4dd0e0dff679e5085490f5fafa38bdda088f4553348c0281832d24afe541 SHA512 9781cc109c9e76bc2f15b5ad6af95f8a3b52d60424d101ff90103f33679db5c5bfe2fcc7443698e1808aaf87dce563f7c11a48aa4ac5bfa34688499cbc21277c WHIRLPOOL a8aea19e518290c8b00f8788b67d9b6efac0e03442216ce9ecc672659560854eefc71f9821abe472aec5b6abd693e41076f66678dbcab0d2c9dd4d542755bf22 DIST jansson-2.7.tar.gz 445179 SHA256 7905e6590fb316c0ff943df3dc6a21cd81a59cff7a6d12514054c359d04d78d7 SHA512 657b715868c2fbf8da1e41befee2691524190e12255214c472652ca3e3793b03e2b384dc3aedb1071b67b0b8cb57fd495103979983fe21a2404f12cd70295a28 WHIRLPOOL 684c0a1cae8cbd86d1a4e19bcfa59f36bf6094853ce5e18bd600fcb27fb1afac250e52c1983f888fcae06437c6e142b2ea3823c911b5a2923f4775494d26690f diff --git a/dev-libs/jansson/jansson-2.4.ebuild b/dev-libs/jansson/jansson-2.4.ebuild deleted file mode 100644 index f07d058bda58..000000000000 --- a/dev-libs/jansson/jansson-2.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -DESCRIPTION="C library for encoding, decoding and manipulating JSON data" -HOMEPAGE="http://www.digip.org/jansson/" -SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="doc static-libs" - -DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" -RDEPEND="" - -DOCS=(CHANGES README.rst) - -src_prepare() { - sed -ie 's/-Werror//' src/Makefile.am || die - autotools-utils_src_prepare -} - -src_compile() { - autotools-utils_src_compile - - use doc && autotools-utils_src_compile html -} - -src_install() { - use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/_build/html/") - autotools-utils_src_install -} diff --git a/dev-libs/jansson/jansson-2.6.ebuild b/dev-libs/jansson/jansson-2.6.ebuild deleted file mode 100644 index 84638f6b2f8a..000000000000 --- a/dev-libs/jansson/jansson-2.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils - -DESCRIPTION="C library for encoding, decoding and manipulating JSON data" -HOMEPAGE="http://www.digip.org/jansson/" -SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="doc static-libs" - -DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )" -RDEPEND="" - -DOCS=(CHANGES README.rst) - -src_prepare() { - sed -ie 's/-Werror//' src/Makefile.am || die - autotools-utils_src_prepare -} - -src_compile() { - autotools-utils_src_compile - - use doc && autotools-utils_src_compile html -} - -src_install() { - use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/_build/html/") - autotools-utils_src_install -} diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest index de29c6e7fa24..da7eacb7d1f8 100644 --- a/dev-libs/libusb/Manifest +++ b/dev-libs/libusb/Manifest @@ -1,3 +1,4 @@ DIST libusb-1.0.18.tar.bz2 502160 SHA256 c73f5cec45a5de94418da4e151b7232958571926984acfb9bce02b9424e83720 SHA512 bbc3d75cb91f4e6a024549c2bac38ee85aeda8529a4553fd36bc8e8a5c223cd89eb952eda71fcc0071d6c6c818a0631d4cca084fed69d4986eee5dcf9a87d662 WHIRLPOOL fcc663884fb6d03bcf5f08c30bfded1d05c5b9ac836a2b99335553476201f956fed327c4a51609e19f54182bf5db125a0f22b41496def0443b5b4152a9f60a45 DIST libusb-1.0.19.tar.bz2 521496 SHA256 6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840 SHA512 f42f0187bfec16ebabad64efef7a7651ee85dcf2af1b7cbe543b7de615f9c6432f7eea5fcc6b23335591dcad287c905eb9bd56199cc5d3b47435027ad678f2c1 WHIRLPOOL 95bc30575cc0e9306584453f6b7549902083ff95ff170f0fc2c89734841f7fb82cf9e25a6443ba6a0b04e1f111096deb1e4a6dc8aa13a68d13f02e02b5d274c6 +DIST libusb-1.0.20.tar.bz2 795247 SHA256 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765 WHIRLPOOL 2d270f77352e108cfeba5f33799a2480535402108efe28c030599f071872d4394ce58464930fd405b66c14879b18309ff189d42892b9ae15aebc2496639026a6 DIST libusb-1.0.9.tar.bz2 421971 SHA256 e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b SHA512 5eba3e9df2c1db71d685becebebf5b1310ee87e442f97a2553a430fd11655a2d9ce50e4ec2ffd62fe322286b0d6bc9e142ce552effc2466ee50424deba035ee5 WHIRLPOOL 9886cb6660d4530fe199441a8b5b76cb8a00012d69a13a40276bf3b880561eeb31301c186828b6fd08b687e038fac640475ba280473053e252cf23f15ca38372 diff --git a/dev-libs/libusb/libusb-1.0.19.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild similarity index 92% rename from dev-libs/libusb/libusb-1.0.19.ebuild rename to dev-libs/libusb/libusb-1.0.19-r1.ebuild index fd36b4fa8b4f..b16d9a335107 100644 --- a/dev-libs/libusb/libusb-1.0.19.ebuild +++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SLOT="1" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug doc examples static-libs test udev" -RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) +RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild new file mode 100644 index 000000000000..fa3032969986 --- /dev/null +++ b/dev-libs/libusb/libusb-1.0.20.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils toolchain-funcs multilib-minimal + +DESCRIPTION="Userspace access to USB devices" +HOMEPAGE="http://libusb.info/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug doc examples static-libs test udev" + +RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + !udev? ( virtual/os-headers )" + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(use_enable udev) \ + $(use_enable debug debug-log) \ + $(use_enable test tests-build) +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi; then + use doc && emake -C doc docs + fi +} + +multilib_src_test() { + emake check + + # noinst_PROGRAMS from tests/Makefile.am + tests/stress || die +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + gen_usr_ldscript -a usb-1.0 + + use doc && dohtml doc/html/* + fi +} + +multilib_src_install_all() { + prune_libtool_files + + dodoc AUTHORS ChangeLog NEWS PORTING README TODO + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.{c,h} + insinto /usr/share/doc/${PF}/examples/getopt + doins examples/getopt/*.{c,h} + fi +} diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 9d18e7b78308..5a167ef9121c 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1 +1,2 @@ DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 +DIST libzip-1.1.tar.xz 458528 SHA256 13b0b49637f9857ab8ba7335f529e26d02aadacf2074bf0c9b28889a0fc83b24 SHA512 0a250835155eb2ed19a00718e086b3e05741c9bcf01c7c73ed6e83fd989d9fb0bddf192f69c989f75860e4e9a44490b263fd08d9b06994e534fc0374667df2f0 WHIRLPOOL 7d59cbfb32d96230ef57e4dd7e57fbef5e3d2e1a3c92044bcee876c8de855e84eb189608c0c123265cb9e47ccf4b3cf216186f27a0f6afb14c1dca3dfd4d42fc diff --git a/dev-libs/libzip/files/libzip-1.1-missing-extern.patch b/dev-libs/libzip/files/libzip-1.1-missing-extern.patch new file mode 100644 index 000000000000..b678871adbb7 --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.1-missing-extern.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Thomas Klausner +# Date 1453987295 -3600 +# Thu Jan 28 14:21:35 2016 +0100 +# Node ID 1472ec4a4519a53165a8ce66ffb5d328305509b9 +# Parent 25c609cdb41d1963cffff26338ac3b8d47072196 +Add 'extern int optopt;' for Linux and perhaps others. + +Reported by Remi Collet. + +diff -r 25c609cdb41d -r 1472ec4a4519 src/ziptool.c +--- a/src/ziptool.c Thu Jan 28 09:54:45 2016 +0100 ++++ b/src/ziptool.c Thu Jan 28 14:21:35 2016 +0100 +@@ -48,6 +48,7 @@ + #ifndef HAVE_GETOPT + #include "getopt.h" + #endif ++extern int optopt; + + #include "zip.h" + #include "compat.h" diff --git a/dev-libs/libzip/libzip-1.1.ebuild b/dev-libs/libzip/libzip-1.1.ebuild new file mode 100644 index 000000000000..75c3201563ee --- /dev/null +++ b/dev-libs/libzip/libzip-1.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools-utils + +DESCRIPTION="Library for manipulating zip archives" +HOMEPAGE="http://www.nih.at/libzip/" +SRC_URI="http://www.nih.at/libzip/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0/4" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +IUSE="static-libs" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND} + app-arch/xz-utils +" + +DOCS=( AUTHORS NEWS README THANKS ) + +PATCHES=( + "${FILESDIR}/${PN}-0.11.2-headers.patch" + "${FILESDIR}/${P}-missing-extern.patch" +) diff --git a/dev-libs/openssl/openssl-1.0.2f.ebuild b/dev-libs/openssl/openssl-1.0.2f.ebuild index 2ac80d27cefc..a7c3eb620a05 100644 --- a/dev-libs/openssl/openssl-1.0.2f.ebuild +++ b/dev-libs/openssl/openssl-1.0.2f.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild index 8793f9d6b9f1..ad1385d9762a 100644 --- a/dev-libs/ppl/ppl-1.1.ebuild +++ b/dev-libs/ppl/ppl-1.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz LICENSE="GPL-3" SLOT="0/4.13" # SONAMEs -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris" IUSE="+cxx doc lpsol pch static-libs test" RDEPEND=">=dev-libs/gmp-6[cxx] diff --git a/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch new file mode 100644 index 000000000000..3b943afea15d --- /dev/null +++ b/dev-libs/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch @@ -0,0 +1,19 @@ +commit 248d6dbd351c22989090d318128cb38b11a89f98 +Author: Jehan +Date: Thu Jan 21 18:16:42 2016 +0100 + + tools: exit with non-zero value on uchardet error. + +diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp +index 91912a0..bcfa234 100644 +--- a/src/tools/uchardet.cpp ++++ b/src/tools/uchardet.cpp +@@ -60,7 +60,7 @@ void detect(FILE * fp) + if (retval != 0) + { + fprintf(stderr, "Handle data error.\n"); +- exit(0); ++ exit(1); + } + } + uchardet_data_end(handle); diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml index d54fa6a4c09b..3fc943d3aa94 100644 --- a/dev-libs/uchardet/metadata.xml +++ b/dev-libs/uchardet/metadata.xml @@ -6,10 +6,6 @@ Coacher Proxied maintainer; set to assignee in all bugs - - rion4ik@gmail.com - Rion - proxy-maint@gentoo.org Proxy Maintainers diff --git a/dev-libs/uchardet/uchardet-0.0.5.ebuild b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild similarity index 93% rename from dev-libs/uchardet/uchardet-0.0.5.ebuild rename to dev-libs/uchardet/uchardet-0.0.5-r1.ebuild index 1c0d57eb5393..0dd07643a822 100644 --- a/dev-libs/uchardet/uchardet-0.0.5.ebuild +++ b/dev-libs/uchardet/uchardet-0.0.5-r1.ebuild @@ -18,6 +18,7 @@ IUSE="static-libs test" PATCHES=( "${FILESDIR}/${P}-fix-ASCII-detection.patch" "${FILESDIR}/${P}-use-proper-package-name.patch" + "${FILESDIR}/${P}-fix-return-code-on-error.patch" ) src_prepare() { diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index 97e8ed4306b7..a8cfc97cdc60 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,3 +1,3 @@ -DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4 DIST vala-0.30.0.tar.xz 2725736 SHA256 61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf SHA512 2c2cf53ae7f350ab42d2ebe75802b8bc2eff474f2e0e0e4c817d44b2a7cf958619732bd04d109ed34b86a94816564c856fe09e18e982a35e523f937820c1cef7 WHIRLPOOL 53428587f1fbd017de3649ddcf312fd4858d7a75f5f397284ae12911f745c0e0b85bb4b815555413b5135507fd32ce3042b8fc58d9c1cf63ab641c7997ad01fd +DIST vala-0.30.1.tar.xz 2727204 SHA256 23add78e5c6a5e6df019d4a885c9c79814c9e0b957519ec8a4f4d826c4e5df2c SHA512 abc8d775b1ee7ca5f38dc48becdd3f83cdcdfa7425d5bea49172f35d6ed554982799c6cd16ed397fc340a5326bf3d0fc8a032376b1394bd7ed17023822e29dc3 WHIRLPOOL a1da2580743103b0b7a4d3bf234057ede4f88d8aadd355779841b0b819ab25341dd9bb97493017a37319432e69028a4f7c7d292aea20e8427cce0baad11c2078 diff --git a/dev-libs/vala-common/vala-common-0.26.2.ebuild b/dev-libs/vala-common/vala-common-0.30.1.ebuild similarity index 91% rename from dev-libs/vala-common/vala-common-0.26.2.ebuild rename to dev-libs/vala-common/vala-common-0.30.1.ebuild index 84a825ff4751..05615377031f 100644 --- a/dev-libs/vala-common/vala-common-0.26.2.ebuild +++ b/dev-libs/vala-common/vala-common-0.30.1.ebuild @@ -8,11 +8,11 @@ GNOME_ORG_MODULE="vala" inherit gnome.org DESCRIPTION="Build infrastructure for packages that use Vala" -HOMEPAGE="https://wiki.gnome.org/Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="" # Previously ${PN} was part of dev-lang/vala diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest index 9c3a37242710..d38913a38e42 100644 --- a/dev-ml/camlp5/Manifest +++ b/dev-ml/camlp5/Manifest @@ -1 +1,2 @@ DIST camlp5-6.14.tgz 748674 SHA256 09f9ed12893d2ec39c88106af2306865c966096bedce0250f2fe52b67d2480e2 SHA512 7dd57b8725953099726fc2e5f6dda01ed74485a4bbf41cb30ccd2163ee38bc6dff36fd83069c58d7990522527d266c9e180a8e333b36a42bc216315dc88a25e9 WHIRLPOOL 305bb842e449775352cbbf3c89a301a188419c10462f0959b00e181596218b5251dac50856f152ad471fd680e557e6595978c395e9c2864c38ddacd7287c4e3b +DIST camlp5-6.15.tgz 756199 SHA256 2e0e1e31e0537f2179766820dd9bd0a4d424bc5ab9c610e6dbf9145f27747f2b SHA512 658ff32d1d124e91e85d8eba47039bb75573b3807d67fae723335bb06d3237c4151f6d671fb3b068ec4ebffdde03f7956174c9f0ca29eafa5990974987bc2aca WHIRLPOOL d449b7a485967b79efbc030527513d99dd19d4856ebc132133d09d7028c210b4314ac401de65ac7671d3066f6a2184df157a0091fc173f4d6e7ae8bc7ad2c432 diff --git a/dev-ml/camlp5/camlp5-6.15.ebuild b/dev-ml/camlp5/camlp5-6.15.ebuild new file mode 100644 index 000000000000..4fcf3b9f748d --- /dev/null +++ b/dev-ml/camlp5/camlp5-6.15.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit multilib findlib eutils + +MY_P=${P%_p*} +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="http://camlp5.gforge.inria.fr/" +SRC_URI="http://camlp5.gforge.inria.fr/distrib/src/${MY_P}.tgz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="doc +ocamlopt" + +DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]" +RDEPEND="${DEPEND}" + +PATCHLEVEL=${PV#*_p} +PATCHLIST="" + +if [ "${PATCHLEVEL}" != "${PV}" ] ; then + for (( i=1; i<=PATCHLEVEL; i++ )) ; do + SRC_URI="${SRC_URI} + http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch" + PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch" + done +fi + +S=${WORKDIR}/${MY_P} + +src_prepare() { + for i in ${PATCHLIST} ; do + epatch "${DISTDIR}/${i}" + done +} + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile(){ + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_install() { + emake DESTDIR="${D}" install + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META + + use doc && dohtml -r doc/* + + dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE +} diff --git a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild index 8aa4eb23c133..d0d95e176332 100644 --- a/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild +++ b/dev-perl/B-Keywords/B-Keywords-1.140.0.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names" # GPL-2 - no later clause LICENSE="|| ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" SRC_TEST="do" diff --git a/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild new file mode 100644 index 000000000000..dfd7d8729bf0 --- /dev/null +++ b/dev-perl/Cache-Cache/Cache-Cache-1.80.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=RJBS +DIST_VERSION=1.08 +inherit perl-module + +DESCRIPTION="Generic cache interface and implementations" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-solaris" +IUSE="" + +RDEPEND=" + >=dev-perl/Digest-SHA1-2.20.0 + >=dev-perl/Error-0.150.0 + >=virtual/perl-File-Spec-0.820.0 + >=dev-perl/IPC-ShareLite-0.90.0 + >=virtual/perl-Storable-1.14.0 +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/dev-perl/Cache-Cache/Manifest b/dev-perl/Cache-Cache/Manifest index 880ef3755cf1..73065469974a 100644 --- a/dev-perl/Cache-Cache/Manifest +++ b/dev-perl/Cache-Cache/Manifest @@ -1 +1,2 @@ DIST Cache-Cache-1.06.tar.gz 34506 SHA256 703d93793ab0b3bd984cfde89943ce1a98c0991f94afc9d1d531c752f52a4793 SHA512 db78376e049625dd1572386f2bc0dbc416569162f2ba997f584f3523a4be279ab67895cd16f51cd52bd160ab39d7225cb437786bbc52d66fa44fad15b501c85f WHIRLPOOL 9a631be52ac3daeec097c708dfbface080760999a53d94620c2c0a808cc6206eae3d4fc739dfb6f0d8b8b7b7a5d75184dc83ef51b1b2c400d327a5762acc3541 +DIST Cache-Cache-1.08.tar.gz 35124 SHA256 d2c7fd5dba5dd010b7d8923516890bb6ccf6b5f188ccb69f35cb0fd6c031d1e8 SHA512 7b0f215b9c765840a1ca1e831735aeff610288048c352889408d514d41820b9315d2de03712b4ad6637d9f0db59467240a0918c22c1257a3f87bc62add4f0e06 WHIRLPOOL de944e5f3e06bf4af5bfdc2a1f1be413de75f0bbb73d9d6dab84d9cbcd130fca602a6e5c0230eacb90c15369df421c8dd294cdfe1db4b36b4114fd047c0df4aa diff --git a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild index 547251587381..ca18c8f38b2d 100644 --- a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild +++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Change nature of data within a structure" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" IUSE="" RDEPEND=" diff --git a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild index cdadeab9032d..cad5edd8c193 100644 --- a/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild +++ b/dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Find memory cycles in objects" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RDEPEND=" diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild index c091a6434a5a..af25ac050bd0 100644 --- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild +++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION='A wrapper for perl'\''s configuration' LICENSE=" || ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild index 9511dea5bbc1..d6031f0c4b03 100644 --- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild +++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION='Various portability utilities for module builders' LICENSE=" || ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild index 018df7557d87..516e2103d97f 100644 --- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild +++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION='Build.PL install path logic made easy' LICENSE=" || ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild index a98b98955e43..97378f054a63 100644 --- a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild +++ b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="flock() wrapper. Auto-create locks" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" SRC_TEST="do" diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild index c37c84226a03..2d50e35ade2f 100644 --- a/dev-perl/Filter/Filter-1.540.0.ebuild +++ b/dev-perl/Filter/Filter-1.540.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Interface for creation of Perl Filters" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild index 4afc2302b610..78b560ec2ce1 100644 --- a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild +++ b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86" IUSE="test" # virtual/perl-Data-Dumper currently commented out in the code diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.20.0.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.20.0.ebuild deleted file mode 100644 index bc64bd586ca9..000000000000 --- a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.20.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=SFRYER -MODULE_VERSION=0.02 -inherit perl-module - -DESCRIPTION="Converts HTML to text with tables intact" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-perl/HTML-FormatText-WithLinks - dev-perl/HTML-Tree - test? ( virtual/perl-Test-Simple ) -" - -S="${WORKDIR}/${PN}" - -SRC_TEST="do" diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest index 8d5428b80eb1..8baadcb07116 100644 --- a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest +++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest @@ -1,2 +1 @@ -DIST HTML-FormatText-WithLinks-AndTables-0.02.tar.gz 6937 SHA256 4e97159a8b8ab5ea0c417da2931221124dc0e1221a3307b270891d6f21852224 SHA512 905bb42cbdf9591418dcf738ee1aaa6b6e1d56c47aaf8c4194bb17b43745cc6d82a4eb65d74ad8c95531940ad67c539329b327d5385f88e80f0a879a6e10bba2 WHIRLPOOL 59c4022248c126a81ae6e43fbb5c22ed0ceeac67610bdadac4e2c60396b3b418d71b533193a3dcf1306cf871a3b5d5c453649b3ea5c66895d9dc51fbbebf56c7 DIST HTML-FormatText-WithLinks-AndTables-0.06.tar.gz 299894 SHA256 e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa SHA512 c930fcc5919d20a67a00826aec11d1d2416a3ae145cf30acee98aa45bc64523858ba49907957c5772b4bedaa1e79ed7a0afef3101c29f913fcf983ce1dddd4c2 WHIRLPOOL 6cf0c0053bc020448d73334ef7d5f2a8ef1ac99dee5eea15bfb75517d37e535863bb0f9f341fab65b09762592d6cb37ca14fc833a9fcc6e55faa96979baedc8f diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild deleted file mode 100644 index 121ef2133bb4..000000000000 --- a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=STRUAN -MODULE_VERSION=0.14 -inherit perl-module - -DESCRIPTION="HTML to text conversion with links as footnotes" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-perl/HTML-Format-2 - dev-perl/HTML-Tree - dev-perl/URI - test? ( virtual/perl-Test-Simple ) -" - -SRC_TEST="do" diff --git a/dev-perl/HTML-FormatText-WithLinks/Manifest b/dev-perl/HTML-FormatText-WithLinks/Manifest index d995af1e39de..e338dd8a6872 100644 --- a/dev-perl/HTML-FormatText-WithLinks/Manifest +++ b/dev-perl/HTML-FormatText-WithLinks/Manifest @@ -1,2 +1 @@ -DIST HTML-FormatText-WithLinks-0.14.tar.gz 11339 SHA256 35ececbc8a3ceda23e03c1e88b1e1ba02193deb455630d093ed30365e845e8ff SHA512 ec2cf859401985aaac45ba5ae1da18b3a142d51d821154ad40497a1ec468d86a6a6b85d7a1a66ec2d06bac49fe699def702c4cad86f1fa52da364cb29b6994b7 WHIRLPOOL 53515b3a6ae2ef21ba5bd2f39ace2e76560eef0a673242c17a9ac49f15ca85e18ddc38371f97be84bc3d72dcac7dfd6c11c31ca6c4d3ba76f521a542341da6f3 DIST HTML-FormatText-WithLinks-0.15.tar.gz 11915 SHA256 7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1 SHA512 cdec4ba94c3f9dfd4e9c8b03be0e24068b23b634499bce062e0b281b26ad3a0288c0d4cc35b4db62fd81ad5f0a0f9ce42a59478af10a81ca2f5901ab79cdf550 WHIRLPOOL 85a90fb039273c390e8f395f48404313891f305588d2cec87d6f5552326caa18ecdc7e201e78243147ab80359d3bf081b082abef55eb160d536bb07982317cec diff --git a/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.520.0.ebuild b/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.520.0.ebuild deleted file mode 100644 index 5e89eddbabce..000000000000 --- a/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.520.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=ABH -MODULE_VERSION=0.52 -inherit perl-module - -DESCRIPTION="PSGI handler for HTML::Mason" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND=" - dev-perl/CGI-PSGI - dev-perl/HTML-Mason -" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.310.0 - test? ( - dev-perl/Plack - ) -" - -SRC_TEST=do diff --git a/dev-perl/HTML-Mason-PSGIHandler/Manifest b/dev-perl/HTML-Mason-PSGIHandler/Manifest index 72284dc2b9b9..15449c7b7d8a 100644 --- a/dev-perl/HTML-Mason-PSGIHandler/Manifest +++ b/dev-perl/HTML-Mason-PSGIHandler/Manifest @@ -1,2 +1 @@ -DIST HTML-Mason-PSGIHandler-0.52.tar.gz 13167 SHA256 e48e4362f983871da804b497a7ac176d6bffb503ea958ae92c8fb768af967157 SHA512 92e24c9f7e66f995c76ab8fdc1e494006eb9c3680f9cd86012e96500e16f02c40c885d175ab1bc19d9f22f62cfa064c81ce5d075de3c6278c2a485b320c6db62 WHIRLPOOL 61b201ea5298aed063f41abd7abb002437cea5b70b7dd07839e0fe4dfef71189474b01ec46f0434c3f46c4f61f90af14495fee859aab6e3e6b977d8191b1cffe DIST HTML-Mason-PSGIHandler-0.53.tar.gz 14157 SHA256 eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b SHA512 d8fe27ff0b25e41b7e64e83c277d323f5207b66e7630e3f688d586c375c63b1837935934a67e630c54fe8219e7b44fe084875e1530d36044fac85884ea62da40 WHIRLPOOL a3ee8c29eaec8aa8775a894542f645c7f037d5032111f65980f8bfc001d1152fd51be9505aab63ff86d2b75c8502d6e55d0a0054af0ec5dd074df9623892c4b5 diff --git a/dev-perl/HTML-Packer/HTML-Packer-1.4.1.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.20.0.ebuild similarity index 65% rename from dev-perl/HTML-Packer/HTML-Packer-1.4.1.ebuild rename to dev-perl/HTML-Packer/HTML-Packer-2.20.0.ebuild index fe19780504e0..2a5f5006e465 100644 --- a/dev-perl/HTML-Packer/HTML-Packer-1.4.1.ebuild +++ b/dev-perl/HTML-Packer/HTML-Packer-2.20.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -MODULE_AUTHOR=NEVESENIN -MODULE_VERSION=1.004001 +EAPI=6 + +DIST_AUTHOR=LEEJO +DIST_VERSION=2.02 inherit perl-module DESCRIPTION='Another HTML code cleaner' @@ -16,8 +17,6 @@ RDEPEND=" >=dev-perl/Regexp-RegGrp-1.1.1_rc " DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.560.0 + >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) " - -SRC_TEST="do" diff --git a/dev-perl/HTML-Packer/Manifest b/dev-perl/HTML-Packer/Manifest index dfee251ac076..a5c0a35391fd 100644 --- a/dev-perl/HTML-Packer/Manifest +++ b/dev-perl/HTML-Packer/Manifest @@ -1,2 +1,2 @@ -DIST HTML-Packer-1.004001.tar.gz 32201 SHA256 52a13886576bd27c9ef7a98cdef95c5f043c6eb3e49bb3a28bbac1e911353445 SHA512 ca6fdc6746cd7aa28b1f17ea50b8f360841dda4f3754d21859d65f508f501a5eb51a02f4205c76d801b567d4d1f6f8e7709f82dc6b95d23be36b7839abb37a10 WHIRLPOOL e6625467ee2e094f4aa1b0c04b435effdcdd2437c967f013dc24dc7c3c5ea95fbf7a851b046555def9b9bea00b161bd5d5ab226690fe0353682c0ab06142326c DIST HTML-Packer-2.00.tar.gz 33994 SHA256 1dd3262be3ef04f40a124ad7e7d34ed44c2ea71c1a80c81b825cb7efdd2577f1 SHA512 7779363839bd8ae6c477afbe4e8dafd807a8e5f8eb274153d42cb8dc698d5109e48233f31e7952b963cdfd72d3209ca448e0200c100054185b0d84baa44c5bd6 WHIRLPOOL 819595720e7ae783ddefa3dbc857b44d214a554ec591ecf32fbf86f148075fc9ffeca7cf32c5b370bcf78126bda4590b3b7ec58b1790eb74965f51105373b33f +DIST HTML-Packer-2.02.tar.gz 34419 SHA256 daaed42f8c64147ecd0021a55701d9c8208bdf24ed1c772e4e15ce2c9ca64f68 SHA512 323f8eac40c77bd7056e4f922e5b9a1858ac16ae7b0d7d803fdc4f6a370e6c8b81f458b472bbe60c23d3b850bdf0e956a205549ad6ab8f8b1fe49da3a5aac33d WHIRLPOOL 347132a029a78d2ddf31133a7ff528089ea79bd935dbfab252f41283b25be622ef0acc6fd47f2e4968248fbbca445a414338c80435628709ef5ccce1ab642a4f diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild index 9514819a4b3b..35ac3db48b79 100644 --- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild +++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.250.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Lexically scoped subroutine wrappers" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild index c27bce93f9ce..325da0fd8aff 100644 --- a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild +++ b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="Tied Filehandles for Nonblocking IO with Object Callbacks" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86" IUSE="" RDEPEND=" diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild index 3093b7d86940..eec20537c696 100644 --- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild +++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION='A tiny replacement for Module::Build' SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild index d966493536de..12a15d9f7815 100644 --- a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild +++ b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format" LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="" diff --git a/dev-perl/PPI/PPI-1.220.ebuild b/dev-perl/PPI/PPI-1.220.ebuild index 061154abc239..8c337bc024a6 100644 --- a/dev-perl/PPI/PPI-1.220.ebuild +++ b/dev-perl/PPI/PPI-1.220.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Parse, Analyze and Manipulate Perl (without perl)" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild index 1eb1c1a2beb8..9740986fdf11 100644 --- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild +++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.33.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Represent a regular expression of some sort" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86" +KEYWORDS="alpha amd64 ~ppc ~ppc64 x86" IUSE="" RDEPEND=" diff --git a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild index 4b57953f573c..20c8f4da7d25 100644 --- a/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild +++ b/dev-perl/PPIx-Utilities/PPIx-Utilities-1.1.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Extensions to PPI" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=">=dev-perl/PPI-1.208 diff --git a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild index 36aaf0addea8..9f7aa5e49268 100644 --- a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild +++ b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="play with other peoples' lexical variables" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" DEPEND="virtual/perl-ExtUtils-MakeMaker" diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild index 455884174a0f..1521c68e1a9a 100644 --- a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild +++ b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Base class for dynamic Policies" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86" IUSE="" RDEPEND="dev-perl/Perl-Critic diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild index feaa96662141..23d908b8e0a9 100644 --- a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild +++ b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Critique Perl source code for best-practices" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="test" RDEPEND=">=dev-perl/Module-Pluggable-3.1 diff --git a/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild b/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild index 0be7c34e3ad2..1eaafa35f0f5 100644 --- a/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild +++ b/dev-perl/Pod-Spell/Pod-Spell-1.10.0-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A formatter for spellchecking Pod" SRC_URI+=" mirror://gentoo/podspell.1.gz https://dev.gentoo.org/~tove/files/podspell.1.gz" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" RDEPEND="virtual/perl-Pod-Escapes diff --git a/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild b/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild index c94297d26363..c34df46ea940 100644 --- a/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild +++ b/dev-perl/Readonly/Readonly-1.30.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Facility for creating read-only scalars, arrays, hashes" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="" SRC_TEST="do" diff --git a/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild b/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild index 796c27b51762..6754faf074e1 100644 --- a/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild +++ b/dev-perl/String-Format/String-Format-1.170.0-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="sprintf-like string formatting capabilities with arbitrary format d LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" SRC_TEST="do" diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild index 1cb9c5ff60c4..4ea65de22a92 100644 --- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild +++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.40.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Check for memory leaks and circular memory references" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="test" RDEPEND=">=dev-perl/Devel-Cycle-1.04 diff --git a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild index 2ad606730acb..994d99b3d67e 100644 --- a/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild +++ b/dev-perl/Test-Object/Test-Object-0.70.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Thoroughly testing objects via registered handlers" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" RDEPEND="virtual/perl-File-Spec diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild index db6243d1372f..734e9227fd4b 100644 --- a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild +++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="fork test" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild index e99fb6ad7a2d..177dc3fcc465 100644 --- a/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild +++ b/dev-perl/Test-SubCalls/Test-SubCalls-1.90.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Track the number of times subs are called" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" DEPEND=">=dev-perl/Hook-LexWrap-0.20 diff --git a/dev-perl/perl-mozldap/Manifest b/dev-perl/perl-mozldap/Manifest index 97c87884f411..5a0088d111a6 100644 --- a/dev-perl/perl-mozldap/Manifest +++ b/dev-perl/perl-mozldap/Manifest @@ -1 +1,2 @@ DIST perl-mozldap-1.5.2.tar.gz 109175 SHA256 fdfc02b0c0be704980e93f12aa5ed2c13c7bae5a50e68ba446c06a7adee9991b SHA512 b47c3ffdab96b42a69daf3c4deeddd42000be328c77b3a80cb417ceed4b20768390c532e890198270956065db714ff51f035c9ad40e973c376cddcaae67c4a04 WHIRLPOOL 2bca2853a6333f37d3ee745611ba4df23bae6b70147e79dc24537f7b8016afa74f526b6afd9625b5d955502cd250abd05064fcf147b68d9de0b5d9b69c85eca7 +DIST perl-mozldap-1.5.3.tar.gz 114128 SHA256 9d707be3a126dd6001205ef72e59e4b892dcda3b3a1e7d061f6f7fc0dba20a68 SHA512 41a6913222cde9be4dc85a6406b0a499954500a38e74e5367f150191f0ea186162b5cd66a2655240909a4d5cc9df820e349e37e73c8549f83d084d96f8f74375 WHIRLPOOL 8a9f1ab724330fdb1d3a1cd6c6966f86f67379fc1615d461f76b2ead3010c3dcc3c8a19f81031b8c8bf3f278ef83ac970c658acdbf788f46051e84611726de75 diff --git a/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild b/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild new file mode 100644 index 000000000000..959e0214a490 --- /dev/null +++ b/dev-perl/perl-mozldap/perl-mozldap-1.5.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit perl-module + +DESCRIPTION="Mozilla PerLDAP" +HOMEPAGE="http://www.mozilla.org/directory/perldap.html" +SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/${PV}/src/${P}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/nspr-4.0.1 + >=dev-libs/nss-3.11.6 + net-nds/openldap" + +DEPEND=" + ${RDEPEND} + sys-apps/sed" + +src_configure() { + export USE_OPENLDAP=1 + perl-module_src_configure +} diff --git a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild b/dev-perl/perltidy/perltidy-20130922.0.0.ebuild index fc48db1fc52d..c00486b8a60c 100644 --- a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild +++ b/dev-perl/perltidy/perltidy-20130922.0.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="" SRC_TEST="do" diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest index 62558fd83154..b8f400a00d84 100644 --- a/dev-python/colorlog/Manifest +++ b/dev-python/colorlog/Manifest @@ -1 +1,2 @@ DIST colorlog-2.6.0.tar.gz 7079 SHA256 0f03ae0128a1ac2e22ec6a6617efbd36ab00d4b2e1c49c497e11854cf24f1fe9 SHA512 be0fbdb617f2edede0d7076a7d9bb0f32578d8f8e688734cf2f29a3bad8e95a8cd2ee32abd680289602a8fb5fb3da728a134ac0f9eb7bcf645a3220c9e02dbf0 WHIRLPOOL 64565c351e6e36b3c20882b9c73a36a2d8aed5866b92d447bbe95dbbff30f15f3d9d68b6840916738d5eb943246f1ec5c9548505e6e2df2e09057c20c564da7c +DIST colorlog-2.6.1.tar.gz 7721 SHA256 34891e2f914903ecbbdba1666f0946e8ce141ebd888f0468d0484c1ffc345b36 SHA512 ca30eee4352d20e8aa5b1d3b38e03d0a14f7c8fd4370bb312857b1fb1909a704c87f81f3ee790defc33fc7688126e6f4776a561e2ca05a8c9fb20fae5f7430c7 WHIRLPOOL 67256d7a452e2b503f6e86fa6090692246703e3e4c774f7208b5e9f1be2aac2796eb013f96d12796d110f974e4806f624485f7efaa226e2ef0993be8d49f445d diff --git a/dev-python/colorlog/colorlog-2.6.0.ebuild b/dev-python/colorlog/colorlog-2.6.0.ebuild index 1e8ec03b27ae..4464f79993fe 100644 --- a/dev-python/colorlog/colorlog-2.6.0.ebuild +++ b/dev-python/colorlog/colorlog-2.6.0.ebuild @@ -24,10 +24,9 @@ DEPEND="${RDEPEND} DOCS=( README.rst ) -python_test() { - py.test colorlog || die -} +# https://github.com/borntyping/python-colorlog/issues/28 +RESTRICT=test -python_install_all() { - distutils-r1_python_install_all +python_test() { + py.test -v -v || die } diff --git a/dev-python/colorlog/colorlog-2.6.1.ebuild b/dev-python/colorlog/colorlog-2.6.1.ebuild new file mode 100644 index 000000000000..0969a0e093dc --- /dev/null +++ b/dev-python/colorlog/colorlog-2.6.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) + +inherit distutils-r1 + +DESCRIPTION="Log formatting with colors" +HOMEPAGE="https://pypi.python.org/pypi/colorlog https://github.com/borntyping/python-colorlog" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +DOCS=( README.md ) + +# https://github.com/borntyping/python-colorlog/issues/28 +RESTRICT=test + +python_test() { + py.test -v -v || die +} diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest index e69de29bb2d1..17081ac58771 100644 --- a/dev-python/cryptography-vectors/Manifest +++ b/dev-python/cryptography-vectors/Manifest @@ -0,0 +1,6 @@ +DIST cryptography_vectors-1.0.2.tar.gz 25005614 SHA256 b849aa26a596b4ad8193d5b06a9414dab798c1f05c661321e759d5ebd944a937 SHA512 c87a915d83b8b57c8028edc3cfbd8efbf1f51b36508db4ef489481479cfc14a296fd1d76c5e013c60cdcf5458824fb16496aeabe2bb80004cf721286800d4751 WHIRLPOOL 90542095b97bf257ef871cf8b1224f5a2060cf80c4c34e44fbfaacf163020d4108c8a36aed90062ab6bb4cd65bfbc2149992eee1efd987955f1a86df551b4418 +DIST cryptography_vectors-1.1.1.tar.gz 25028767 SHA256 7c2c682a2df72c436edb96a52b090073b4489dbb35c346724b23f2710318f19d SHA512 ca6126fa3ca27c6e77d620aede351d9ffefd61f068ec364d1679df9f018bbc891d9f7982d9adc2785117899b39760fda11540a058913cbab1738911a09661cd8 WHIRLPOOL e4ef88e801fddf55fad4210f1a294c6f64f23a60976ab0af207adedd98909c8d517b719e6630d90e99c8cfd61194d8c95a577f907491c8a55b701aa617191f00 +DIST cryptography_vectors-1.1.2.tar.gz 25028810 SHA256 a928dff1af28551ae89376d6789a6754af658f89613e7f9e0e491d643f4e1222 SHA512 0416f4c9b43d9a21a808316deaa5532853d04be441b9ab890174c3bbb92c89744b89c3b4ab751699f6c63b56a46b09d6144cdc79d22322669eeaf24f4ba517c5 WHIRLPOOL 08593c9ae6aa61b34c38457e74f2f6286f40a6ebc4c1967ab74f071a0f18cb3ef3a162bbb5de6626f679d70dd062bfc3bab84a4d6432036a6f742a8bc8d6067b +DIST cryptography_vectors-1.1.tar.gz 25026549 SHA256 a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c SHA512 e4d595f61bcf406a9b5422b1d6321ed18ef6c433b5557340b60d168b378a40cc7e068072a041b1190c6be00b83876b99e2bf441e154fc5a1b5ccfa51f485f731 WHIRLPOOL 5d0e82c2c07410c7e8848f6aaafbce274b4ac3ec65c7e6f73ea1e220d8433d8eae2151e0a9c28eb7d0245337f06fb7ca204a77a8febf0e60e019127a060af2ee +DIST cryptography_vectors-1.2.1.tar.gz 25032579 SHA256 00fb26bdda1a0fbf28e973da6425be948ffb1b38026abe5e185fda19ec87b4fb SHA512 6e08098ec0ca7a4b1d974eafbdff32bb0aa5c15aa887219b0c014be6b2795d4117087553539e7dcfbe51a12b5f6d317c9a8e44949707790212dfca303ba1d6d7 WHIRLPOOL 9d3217e28a45cfcd834c0d2e19184c32797b49d26691ee9a69a04d7a2c0f38268856bb359b1cebda406db622bdc50178117c594b1101d886ca0af76743032203 +DIST cryptography_vectors-1.2.2.tar.gz 25032540 SHA256 744ee9e0e20490640d083efa5ed9522fb3841dc3b867bee67c150cfbbf3be4fd SHA512 c22e156db42be89c64ae9b39eae532dfbc4a8e1e583663ef311607365d5ce75e0ccaaa30d13324099ecfe1803820ecd475f669bc44ef7635b8ce23ba28a2785f WHIRLPOOL d03f219e3c9734fc546a6f101a36d491e7d4c43c0db7383e995644ba53530cebbfb4f5729e5acaf6832a455ef823649aace65a1e9bb654b619f4e54e55ea9ef2 diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index 3f117e86f2cf..73bcde0eae74 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -3,3 +3,4 @@ DIST cryptography-1.1.1.tar.gz 348988 SHA256 2912923af7455fb2d2439a037242507c12c DIST cryptography-1.1.2.tar.gz 349022 SHA256 7f51459f84d670444275e615839f4542c93547a12e938a0a4906dafe5f7de153 SHA512 566e346a76cfd6b1c6afbf64d1fe496770b1ad5f471c42877ad6931a441ab77408815ae066ba3f0450766c86ae9dd10d7a5966321f93a979a4e1ab9e1201371b WHIRLPOOL 9a552e65047c45e19e313e0530031fa282aec51577bcc64f9346f37ac99663db052f7ccc1798532103edffa6e778f9585e937a862a475f6d7bd9140d06bbcf57 DIST cryptography-1.1.tar.gz 348676 SHA256 059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d SHA512 8d5b5ac7cc2dcf7271dcd85c65c42cd815b95ec8502864da1b7c32c4a5905ecc6ae45f54d11e7b539d9ddf10d8bd3de9f40233c0b3cbdd1132b2ffbd4ebb318f WHIRLPOOL 0f154e624a51ebbc342ea082fc00a66b21024c81f3265e7d0e22e089afc5e83dcfe2857113d911db3a8e253d6fe93413ff94b91a83e97fd9405c3f08becc8a03 DIST cryptography-1.2.1.tar.gz 372763 SHA256 a13217a03a47e743d26edff7299e4be7358c2fd12a223ac5d6de3229690b6ee5 SHA512 8ec01e23cfc4c6f9dd38a4a3238a670e68e0174e23d815a3babe37b3355cd453586ee271848f5d9d194f6b3b28483101558376e062ef7bb20cc4508261eb1ad7 WHIRLPOOL fa11a9e8ee9c675c0d8d282f420d072e4029e349df5c07202cfd93fcfb94834a0481e2f858f1426b0aba46bf173843ff40975a23d5b006583241f64442307638 +DIST cryptography-1.2.2.tar.gz 372894 SHA256 3f219cb9106d9b737ea9c332c4d15d70ac328f91b59fd9d79f78bdea8f826a67 SHA512 9c838e116b23bf22c5b01ecdd6f7fa0c4c92ce857516d500b983ae71bab002331cafcb404caa454362878ecbe4a818626c5f94636340bcad0518390671a36845 WHIRLPOOL 29c86d3d6f271f5a9a5da9afa39acc49c579e752e2c040e4b1014c0446a4604fa955ff2a6486ed1c0389fbe5ca54c3181af0bcef279a3fd4e8f4a37e3e09c190 diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest index 179151b3bca7..d9c5b3272e93 100644 --- a/dev-python/distlib/Manifest +++ b/dev-python/distlib/Manifest @@ -1 +1,2 @@ DIST distlib-0.2.1.zip 542424 SHA256 d91dc4a509ca50d1ba796ba1c4b23d5587f082d8a886856544546c88f4d9a685 SHA512 f6453585650db242ad4a176bbd468cc6069ee0941b6ea23f24fc32000778097d8a100de82eaad7b3d8d998dc153d25f537505c7eefcc6f98f37995cfc9d5be77 WHIRLPOOL 86c2eb318c9df8233847b5ded3370d77ed71fab22067f4fa039531d5a3df2ede463e1688d920401a0870e4359f18f8d765230c72e71be1458e5db14de153ad8d +DIST distlib-0.2.2.zip 544724 SHA256 ddd173fc2ce7491c5dc92ac69b3cf2702e9885677b1d5f1c877a36f4dd5b9b6c SHA512 399469376eebbedf288ebc04c0d551c75b3656d8aeb87bae02c7e2542e41018bd50ec28d76a99b293b10b941e0e7735841e5e13512acccc9fdb2af0044c970ee WHIRLPOOL fc9498233c31a33eb8c351c3af4ec75809c0484af302f8041cd7b3aeb28f90f4a9cbb9fab514bebda1ad127d4a1e89f8714ae771eb103277850aaa5cbb27be7f diff --git a/dev-python/distlib/distlib-0.2.2.ebuild b/dev-python/distlib/distlib-0.2.2.ebuild new file mode 100644 index 000000000000..81a6691f0877 --- /dev/null +++ b/dev-python/distlib/distlib-0.2.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="Distribution utilities" +HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-unbundle.patch +) + +python_prepare_all() { + rm -r \ + distlib/*.exe \ + distlib/_backport \ + tests/test_shutil.py* \ + tests/test_sysconfig.py* || die + + distutils-r1_python_prepare_all + + # Broken tests + # 1 fails due to it being sensitive to dictionary ordering + # inconsistency between code and test + sed \ + -e 's:test_dependency_finder:_&:g' \ + -i tests/*py || die + + # Gentoo still doesn't report correct ABI + sed \ + -e 's:test_abi:_&:g' \ + -i tests/*py || die +} + +python_test() { + sed \ + -e '/PIP_AVAILABLE/s:True:False:g' \ + -i tests/*py || die + SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test +} diff --git a/dev-python/distlib/files/distlib-0.2.2-unbundle.patch b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch new file mode 100644 index 000000000000..5ee912905602 --- /dev/null +++ b/dev-python/distlib/files/distlib-0.2.2-unbundle.patch @@ -0,0 +1,35 @@ +--- distlib-0.1.9/distlib/compat.py.orig 2014-06-06 09:58:21.317560756 +0200 ++++ distlib-0.1.9/distlib/compat.py 2014-06-06 09:58:29.955611427 +0200 +@@ -17,7 +17,7 @@ if sys.version_info[0] < 3: + from types import FileType as file_type + import __builtin__ as builtins + import ConfigParser as configparser +- from ._backport import shutil ++ import shutil + from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit + from urllib import (urlretrieve, quote as _quote, unquote, url2pathname, + pathname2url, ContentTooShortError, splittype) +@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover + try: + import sysconfig + except ImportError: # pragma: no cover +- from ._backport import sysconfig ++ import sysconfig + + try: + callable = callable +--- distlib-0.1.9/setup.py.orig 2014-06-06 10:19:13.971997156 +0200 ++++ distlib-0.1.9/setup.py 2014-06-06 10:19:20.012034150 +0200 +@@ -62,12 +62,7 @@ distutils.core.setup( + platforms='any', + packages=[ + 'distlib', +- 'distlib._backport', + ], +- package_data={ +- 'distlib._backport': ['sysconfig.cfg'], +- 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'], +- }, + cmdclass={ + 'test': TestCommand, + }, diff --git a/dev-python/django-classy-tags/Manifest b/dev-python/django-classy-tags/Manifest index 8fdd353e1c77..bc3728e84f35 100644 --- a/dev-python/django-classy-tags/Manifest +++ b/dev-python/django-classy-tags/Manifest @@ -1 +1,2 @@ DIST django-classy-tags-0.6.2.tar.gz 18079 SHA256 9b8d6056b2aadc2e9e4f28df8c41f2c9546a3ef63785eadc33231d4487cc6212 SHA512 d8bc16e0c7da84284eeb76b5098deaada001ee6f191a729170fda6cf22436bfa4f387acacb19a11c9dd08728dcfe1b5003fb4873c7763cc7749865a6e7b5ac64 WHIRLPOOL e3146334c8f2dd9704810e7e4d2b41294fe9ec8e9e8ff0ddb52c05771b58213ca193cab68ca299a8165c47097d6cfbea4ea8a4528d8c34fd6116ed5342ff4771 +DIST django-classy-tags-0.7.1.tar.gz 17294 SHA256 ebffaeb1ade7fa354fb4feda4c11255335107bb0862dce0893b12a95262c5d81 SHA512 b83e15cc0ccdccafd3b6676981214ec7b4431cbbcc4ca6640e986fffff7a484aad1a0c24b6da15ca9618b6c06f073353f89ff3f3fec4956a294d7aeb1377f3dd WHIRLPOOL db49b2e5e046e7fd91c03d9b7310adc4f550c648c01552d30c71b4fed789aa20ed8a91460fbf0bce7502dce954381fe1e4790a08ba11bda76d40209a76a713d7 diff --git a/dev-python/django-classy-tags/django-classy-tags-0.7.1.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.7.1.ebuild new file mode 100644 index 000000000000..4e2ab1e05a5c --- /dev/null +++ b/dev-python/django-classy-tags/django-classy-tags-0.7.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} ) + +inherit distutils-r1 + +DESCRIPTION="Class based template tags for Django" +HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.python.org/pypi/django-classy-tags" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" + +RDEPEND=">=dev-python/django-1.6" + +DEPEND=" + ${RDEPEND} + dev-python/setuptools" diff --git a/dev-python/django-cms/Manifest b/dev-python/django-cms/Manifest index 5647457c6a01..6f25f90eb8d4 100644 --- a/dev-python/django-cms/Manifest +++ b/dev-python/django-cms/Manifest @@ -1,2 +1,3 @@ DIST django-cms-3.1.2.tar.gz 4031123 SHA256 b59c89b6f7c3a802e74fe16159eb663df4b49fb676b6931d678fd5261a5fdb9b SHA512 ef8c2f25032f784b4f4a3d6b595577ee890fd249c54a71207eb6c2c7b3495164171db6f0e2f4aa49ed4b8e3ff5e682757ea2f396b69ff46d93419a35489fd213 WHIRLPOOL 85a22c9679b84fe04e4b29606328a50373a1d7aaa8174ee54e82d0cca08ef62ca8e3b946cf6ed0670f52253697046ecf65e2a8675ba9820286390b7af59dc143 DIST django-cms-3.1.3.tar.gz 4035531 SHA256 f0b2122e33dfb9f52247365855712616d61b5efecc87eb8fe5bd5eb1399f982c SHA512 261f1321d5f47ce6931b4bf89a1f4e1183a6353793537c840e61ea9200169889f4712b6eea77a5e15e58b065b48a8911e1f643af487eeb93519ec8ff1b46310d WHIRLPOOL cfeaf1e47730effdf2312687a0213bf7341512b8d2a6e4ccd1f2a54981b28b3242c36af0ea3e7ce4635451ca9ff4dd548025500e5f68d359ea34ade346bceec2 +DIST django-cms-3.2.0.tar.gz 4705643 SHA256 599056dc41b2c30e1702dadd6f053d37f43f3ea1262fc165f2e6b3531bbf299d SHA512 c8ce43d3c335516a29eba4dc20bb611135b6971ea40a623f67d6248d58195819005bb2d58406cbc3fdb414f2303dff527b2f3d5dfa8610c90cce461bacd9e2bb WHIRLPOOL e15efb59a6a9193bf080d8458ed6c05779db92dc6d0f516244a95dbbf818904a39ae9dfc252b583eb5566e7c5bfff6e425da02d126aa526d065d49083716476f diff --git a/dev-python/django-cms/django-cms-3.2.0.ebuild b/dev-python/django-cms/django-cms-3.2.0.ebuild new file mode 100644 index 000000000000..948b77cbf9bb --- /dev/null +++ b/dev-python/django-cms/django-cms-3.2.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} ) + +inherit distutils-r1 + +DESCRIPTION="A Django application for managing hierarchical pages of content" +HOMEPAGE="https://www.django-cms.org/" +SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video" +REQUIRED_USE="admin-style ckeditor" + +RDEPEND=" + >=dev-python/django-1.6.9 + admin-style? ( >=dev-python/djangocms-admin-style-1.0 ) + file? ( dev-python/djangocms-file ) + flash? ( dev-python/djangocms-flash ) + inherit? ( dev-python/djangocms-inherit ) + link? ( dev-python/djangocms-link ) + picture? ( dev-python/djangocms-picture ) + snippet? ( dev-python/djangocms-snippet ) + teaser? ( dev-python/djangocms-teaser ) + video? ( dev-python/djangocms-video ) + >=dev-python/django-classy-tags-0.7 + >=dev-python/django-formtools-1.0 + >=dev-python/django-sekizai-0.7 + ckeditor? ( >=dev-python/djangocms-text-ckeditor-2.1.1 ) + >=dev-python/django-treebeard-4.0 + dev-python/html5lib +" + +DEPEND=" + ${RDEPEND} + dev-python/setuptools +" diff --git a/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild index 1eb33d482ad3..4b045aaa5ea4 100644 --- a/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild +++ b/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) +PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5}} ) inherit distutils-r1 diff --git a/dev-python/django-treebeard/Manifest b/dev-python/django-treebeard/Manifest index 62dad84876e7..97604bac337c 100644 --- a/dev-python/django-treebeard/Manifest +++ b/dev-python/django-treebeard/Manifest @@ -1 +1,2 @@ DIST django-treebeard-3.0.tar.gz 93278 SHA256 ac9935d855359951f1a9c51904f55f2a1b1b41930ea472ded78cfd50c5cae982 SHA512 9c15dd75142a36cbd73d09c1f677f9875f67dc809178aeec79fab817a2ec60dc4afb0ca81ffa818be489d4bb1190299197e0f9b7d90e704428ca6c3fc6bf0a61 WHIRLPOOL b1e1fd9923b1495374cd4d3fef5b808926fc89f6d175dd18157aab778d5f13d2ed4b789c1fbcbbe9efea96a152a6943037f3093aafcadd1a14d977bcdd698c6c +DIST django-treebeard-4.0.tar.gz 92991 SHA256 af210cf46cf14ad53a7b3161dec3f015bafa45813b6ef3b87652ddb0799c8aae SHA512 0308e5998ce6b729ef1fca8841e44bbdc31f8bb013f63e285c386ec2a038c85c5b252617b85a2c22e24aa685f3790557052facb6f00e45b7ed630ec9f1c93dfe WHIRLPOOL 405650c557ef519b0b02b8bc7cc1a7a963fd669bcdfec53e21d5b4f6a5d3545eec96b9f0bf218d218a3fbb26f0e1e66ff7027a7f75dd0eaf3a92ce456d8af197 diff --git a/dev-python/django-treebeard/django-treebeard-4.0.ebuild b/dev-python/django-treebeard/django-treebeard-4.0.ebuild new file mode 100644 index 000000000000..16d7b5f944d5 --- /dev/null +++ b/dev-python/django-treebeard/django-treebeard-4.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_7,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Efficient tree implementations for Django 1.6+" +HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.python.org/pypi/django-treebeard" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-python/django-1.6 +" + +DEPEND=" + ${RDEPEND} + dev-python/setuptools +" diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index c27323b1fcfe..edfc2f0dfed5 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -4,5 +4,5 @@ DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695 DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c DIST Django-1.8.7.tar.gz 7276831 SHA256 17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523 SHA512 74b89efd4fd2d19542a30e0fa0648652aa85ea309804afadae1162b1cac3492e599beaf5ea868d67bcef5f016283952dcc869726cbf6f15141f0816a0377b041 WHIRLPOOL adae3d00ceab8bb3e526107068270d53de968b782d5e37a64f59ecaf75e8933d3895dc6de5c934ea180c8436a88acb4949f7f4f8bba56c13c92d08874596c784 DIST Django-1.8.8.tar.gz 7286780 SHA256 8255242fa0d9e0bf331259a6bdb81364933acbe8863291661558ffdb2fc9ed70 SHA512 d7775ffb05840a73a99bf67d234580e135bc3d1b4c033ab3bf557e9bee42001fd309da7a8cf13cb99cac34cef0c4ef954903b5c90d2b4b40d084cfcaf05ba701 WHIRLPOOL 5952df1be91fbd4a68268f11600822ed682e2c4a5b12192ff0af86cffa6cfa9dca0038397baccf11b165aa71b4ffad955d8233cfacaef9b4fb229635e014cd66 -DIST Django-1.9.1.tar.gz 7411671 SHA256 a29aac46a686cade6da87ce7e7287d5d53cddabc41d777c6230a583c36244a18 SHA512 8532247cfd47922b6b2ce1d292e989a12c5a3dfe15f610e85209ac55ebbc8b0fd45e9154dbc84da252ce31b5813a5f54399eb1015321dd67531d1f8d7d223cfe WHIRLPOOL 85f1f64bc75d6bf7a291beade5d35b2090e771cbc84a643d3eff2737edfdafefcea0dfa63b734cc038afcab20601be424c8b7091f4079587a107ebe2aeedeb66 -DIST Django-1.9.tar.gz 7392116 SHA256 05fe4b19a8778d4b48bbf1f4dfca3106881fea7982664553e7f7f861606f7c66 SHA512 255438e4ce89bc128506ef9137604cd38bc7cd5f69b687e9ec6c9332b7a89b55cc904209b630e42e0376cca944a26090da9b209ea2ecaaf0033ee5e8c9e0378d WHIRLPOOL d1ae1b62c7e3966dbef4191910970db3d83b5a6693528adb2966b00f0a599b7674689230e6d2875ea9fd44e0926ab0d98a303b45c61c1bb9a7e54555fd7a1cb7 +DIST Django-1.8.9.tar.gz 7288701 SHA256 fc012d8507201a628e877202bb7800799152285f69aa0d42a7c506a96fbbd2e3 SHA512 3423d11a6f97ca4518a7105fabfc872783d92f2ce4733739bc6dd7d53c97d7450c7343a8e77c2094ce6342b1647445d2ddef5deb2d3b35b5c0ba4679726f0a48 WHIRLPOOL 96cdd8cb557c8ae75d40516e2c88a4a63fb0f070e3614732786a4e7904f22404a1d189ae00b03527be9242c4b61646ce5093cb6535567ba0f23042a1b6e9a320 +DIST Django-1.9.2.tar.gz 7419200 SHA256 7a233322eeb35da5fd8315f9e5dd48f2171de43ca2cfb11b138607daa4bf8a2f SHA512 931fe067b366bf3868d1f66536b19f7dce4f3ea9e117e65175369ef2f625b925fedb6923aeb9bae94cb1887711951af30cac1c7992a984cdcbfd54fa0ef775e9 WHIRLPOOL b31053459222fcb46a731ab67879b581a8cba5421097037d263afebfd7a2b26a5026b99ec0d82bcd52ef6a09f272c16bae2445c7b41eeadc7270da4529b3c759 diff --git a/dev-python/django/django-1.9.ebuild b/dev-python/django/django-1.8.9.ebuild similarity index 92% rename from dev-python/django/django-1.9.ebuild rename to dev-python/django/django-1.8.9.ebuild index 78a373404de4..fe194bb2106a 100644 --- a/dev-python/django/django-1.9.ebuild +++ b/dev-python/django/django-1.8.9.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4,5} pypy ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) PYTHON_REQ_USE='sqlite?,threads(+)' WEBAPP_NO_AUTO_INSTALL="yes" @@ -21,10 +21,6 @@ SRC_URI=" " LICENSE="BSD" -# admin fonts: Roboto (media-fonts/roboto) -LICENSE+=" Apache-2.0" -# admin icons, jquery, xregexp.js -LICENSE+=" MIT" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc sqlite test" @@ -47,7 +43,7 @@ S="${WORKDIR}/${MY_P}" WEBAPP_MANUAL_SLOT="yes" PATCHES=( - "${FILESDIR}"/${P}-bashcomp.patch + "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch ) pkg_setup() { diff --git a/dev-python/django/django-1.9.1.ebuild b/dev-python/django/django-1.9.2.ebuild similarity index 100% rename from dev-python/django/django-1.9.1.ebuild rename to dev-python/django/django-1.9.2.ebuild diff --git a/dev-python/djangocms-admin-style/Manifest b/dev-python/djangocms-admin-style/Manifest index 26e87010f537..cfe0543d3fc8 100644 --- a/dev-python/djangocms-admin-style/Manifest +++ b/dev-python/djangocms-admin-style/Manifest @@ -1 +1,2 @@ DIST djangocms-admin-style-0.2.8.tar.gz 101230 SHA256 aa4c278c10eb94bf48b60a9baedbc1c5dcd9fcdcc5b783d0d534186b28a8cb11 SHA512 79ffeb927c94a1753cf57210879e9115925f4a30edc1c94c312e431fe8f5aa49faba83c0ed3a307748f8c0f050f81bdeecec87fb5e4cf95ee88d3cea20f5fe0d WHIRLPOOL 0730910a6ed09cbf3069f59c6228afd16ded044871f5bf2f5e4ace786f0e1eb7cfb94422835c845eb06f77c9c414f52c08ddd4e5c3d3dcede68d4703b5e4f2e9 +DIST djangocms-admin-style-1.1.0.tar.gz 1518444 SHA256 91ca1968de015ad8019289e4c199a4e946d1cddf648f1e3b8fbb10dcd1b40f7a SHA512 bca5b7175f765fdf49592914f72ea855ec87848c133224166610f7a4d37cd0c11cad22497c2db079b9eeea478d0b001d7d39f82a4867392d82744d79a9e2195b WHIRLPOOL 339899ddecf9878ee1f405a5c986f5444b1fa4a1044ca17deeb9510d77e63b22ac0fdd9e0d2db94728e8136563e53b0c09149b7a906c6259955193b10ff14875 diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-1.1.0.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-1.1.0.ebuild new file mode 100644 index 000000000000..4571953b85da --- /dev/null +++ b/dev-python/djangocms-admin-style/djangocms-admin-style-1.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} ) + +inherit distutils-r1 + +DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface." +HOMEPAGE="https://pypi.python.org/pypi/djangocms-admin-style" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" + +RDEPEND="" + +DEPEND=" + ${RDEPEND} + dev-python/setuptools +" diff --git a/dev-python/djangocms-text-ckeditor/Manifest b/dev-python/djangocms-text-ckeditor/Manifest index e79ba7286222..727992bd9312 100644 --- a/dev-python/djangocms-text-ckeditor/Manifest +++ b/dev-python/djangocms-text-ckeditor/Manifest @@ -1 +1,2 @@ DIST djangocms-text-ckeditor-2.6.0.tar.gz 1364155 SHA256 d0ef15a9058ba640cc7227348d1a32399539326bd6729eb5a792e876a07da51a SHA512 b246dcf706e2dcfccc5cdc6012adba30195824e69f761687a1b937f9e49c9efbae159c1d43611c9c51df2f575e91ce9a01eaf4d3229d502065dd9302b588482f WHIRLPOOL df644323d4c205ff107b0561c70b1935f160297fed2746d427bc315c9bc0f9b5acca00bb401bf0e6d1d9a90e533187348ccb0871aeedbc9b7ac0048d5f3048f9 +DIST djangocms-text-ckeditor-2.8.1.tar.gz 1378460 SHA256 96a88f620d3f908197fe3676220793abf9f4b0e2d919f79e3eb00d29e3ecac1d SHA512 70488f847f62cecf2d472567d4f45dbbea74dbe68d81da51dcfef22bc31ea8fbdb12b4097167520d35d47c61d924005aec4ab8a70107e1f57a03be370baf5067 WHIRLPOOL 58b24c26ac8016567f97c3a3e7ded16739d95c3adb665d493c63a1f6cbf97fab0623016db17e0e25340cb9ed4042074f3fc305ab13fba174f8b6f2d3c9e08d56 diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.8.1.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.8.1.ebuild new file mode 100644 index 000000000000..ac3417716015 --- /dev/null +++ b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-2.8.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} ) + +inherit distutils-r1 + +DESCRIPTION="Text Plugin for django CMS with CKEditor support" +HOMEPAGE="https://pypi.python.org/pypi/djangocms-text-ckeditor/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="" + +RDEPEND="" + +DEPEND=" + ${RDEPEND} + dev-python/setuptools +" diff --git a/dev-python/flipflop/Manifest b/dev-python/flipflop/Manifest new file mode 100644 index 000000000000..4dbd10194a5d --- /dev/null +++ b/dev-python/flipflop/Manifest @@ -0,0 +1 @@ +DIST flipflop-1.0.tar.gz 9991 SHA256 32a23ed7bdb53bab03271c4c92abceae1ee3a337dd7fd5a18334fd64930ebcfd SHA512 cff8e6e0ecfbf633aacbfe7612837cc85d5208b1dadc4b30a20cc4934549365a066df9ed66bab4e760b7fe73d7ce796de6a53fc01cec742d81fceb17e2529267 WHIRLPOOL d1de0967f0b86530cfb601db40d9578e087212c1d5496c647224d925079dfdc943851ae4be6e4633b94679f0911c75886e5706268d9a6f5aae1841b995ac05b2 diff --git a/dev-python/flipflop/flipflop-1.0.ebuild b/dev-python/flipflop/flipflop-1.0.ebuild new file mode 100644 index 000000000000..dde6380de551 --- /dev/null +++ b/dev-python/flipflop/flipflop-1.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python3_{4,5}) + +inherit distutils-r1 + +DESCRIPTION="A FastCGI/WSGI gateway" +HOMEPAGE="https://github.com/Kozea/flipflop" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" diff --git a/dev-python/flipflop/metadata.xml b/dev-python/flipflop/metadata.xml new file mode 100644 index 000000000000..266e3f19ca59 --- /dev/null +++ b/dev-python/flipflop/metadata.xml @@ -0,0 +1,7 @@ + + + + + python@gentoo.org + + diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest index 7c56ce176813..2de8876b3528 100644 --- a/dev-python/freezegun/Manifest +++ b/dev-python/freezegun/Manifest @@ -1 +1 @@ -DIST freezegun-0.3.5.tar.gz 43439 SHA256 ee59b2eedd4011eeaae8a95eec31aa977ec355df7f4eca1067f402cb79429e0a SHA512 2dfa6c8f06f58b241f4902bf3be838205ced0161a2b56b425eac20b3db1feb797254afabc0b1de5b6be2b79f003b03b7bedc1cc0d9dd7f666c443184a071ec88 WHIRLPOOL d3c7245b916d14d31b7f067741d3297df3c11b97ffde0b9b2ba51036d0cae6d5ab63cccdcfbc0cd1bd145ff23ac0159d948e0d6af42e4c41458e9842e2948bc2 +DIST freezegun-0.3.6.tar.gz 45838 SHA256 44cef08c4b34be212534aec8ab61eccdc75ba9e4d908f99d1fcc7f778b4cbaf8 SHA512 34fc6d21cefac321414cef7c2b9935d43acd8456e475fdbd6426cf3fcf0b4f3cacf2127e29840b72ad55ad7b22be6e6e954955ca345c792895d9726082450ae0 WHIRLPOOL b28a1e09fb3b8d380e5e54519a0754d655b1abfdb4dfa2d45451035b1cc6abdaaa9ec026a9543609c90a7a8b7fd192acb2cda276bb38c97a4ab56aabe3be4c3f diff --git a/dev-python/freezegun/freezegun-0.3.5.ebuild b/dev-python/freezegun/freezegun-0.3.6.ebuild similarity index 75% rename from dev-python/freezegun/freezegun-0.3.5.ebuild rename to dev-python/freezegun/freezegun-0.3.6.ebuild index adeb55e48c35..72f34b8e4df7 100644 --- a/dev-python/freezegun/freezegun-0.3.5.ebuild +++ b/dev-python/freezegun/freezegun-0.3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,7 +16,10 @@ SLOT="0" KEYWORDS="~amd64" IUSE="test" -DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] +RDEPEND="dev-python/python-dateutil + dev-python/six" +DEPEND="${RDEPEND} + test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] ) dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest index 6451464b21bd..ef8640e1575f 100644 --- a/dev-python/ipython/Manifest +++ b/dev-python/ipython/Manifest @@ -1,3 +1,4 @@ DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1 DIST ipython-4.0.1.tar.gz 6207566 SHA256 3bd3b78abc4f43b9ea7fa5353a2a9ba01af8ac4aec5d11e78fa5cbcec105432e SHA512 88419feca21c762a8553b4c11661e28b3305742fc89309abfd46b1213da210249b4781b754996835a2cc539569ae7cb816ed26bbaddbf15529eeb6479660265e WHIRLPOOL 58c17378fbcbac94e1585cce0cdd00996f7df20f5781a88e1e7d56b9fe2db81fe3282211dba31e8f54d2e50db869d2cce2670cfebc5c868455f481064e0089c6 DIST ipython-4.0.3.tar.gz 6207899 SHA256 3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0 SHA512 1e2deb597348757e69aaeadd0632cf984056e5f7278ee5bbbd7b4233581323b07f55685b1891c23dc0977d9f30f7dc734dcf2216bc8876424cdb0f7a9294fecf WHIRLPOOL 1beb60e6daf3cea4609318e87a07307843eeb1002847f8c3c5fbe8e114ab29cb052c810884b410f1e8414437b91c5335048106756e2d88a82a7e440e3ff8fc17 +DIST ipython-4.1.0.tar.gz 4935005 SHA256 c35e658c3a5b35fa0e196c143f46a78de8a89cf2b4a19aa00be502e39f334167 SHA512 d2d6f9e64871b0c8ff414af8ce12fffc362f69a992c7581fe7e374a35cb19f30ff6c38493439498c5bb6223792c10120b2e4ccc7c901ff09bcf75837bb87b841 WHIRLPOOL c391191132a89255bab4b61bc720670bee4138cc34a121728813fe7930ab4e9c203901b8c266c0cb1d7833432a2e886bd5bfefe7be76cd3770ca4ece0134b893 diff --git a/dev-python/ipython/ipython-4.1.0.ebuild b/dev-python/ipython/ipython-4.1.0.ebuild new file mode 100644 index 000000000000..3c9b5dae5478 --- /dev/null +++ b/dev-python/ipython/ipython-4.1.0.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE='readline,sqlite,threads(+)' + +inherit distutils-r1 eutils virtualx + +DESCRIPTION="Advanced interactive shell for Python" +HOMEPAGE="http://ipython.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets" + +REQUIRED_USE=" + test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets ) + doc? ( mongodb )" + +CDEPEND=" + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pickleshare[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/simplegeneric[${PYTHON_USEDEP}] + dev-python/traitlets[${PYTHON_USEDEP}] + matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) + mongodb? ( /dev/null || die + "${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1 + popd > /dev/null || die + } + VIRTUALX_COMMAND=run_tests virtualmake + [[ ${fail} ]] && die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install + + # Create ipythonX.Y symlinks. + # TODO: + # 1. do we want them for pypy? No. pypy has no numpy + # 2. handle it in the eclass instead (use _python_ln_rel). + # With pypy not an option the dosym becomes unconditional + dosym ../lib/python-exec/${EPYTHON}/ipython \ + /usr/bin/ipython${EPYTHON#python} +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/build/html/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "sympyprinting" dev-python/sympy + optfeature "cythonmagic" dev-python/cython + optfeature "%lprun magic command" dev-python/line_profiler + optfeature "%mprun magic command" dev-python/memory_profiler + if use nbconvert; then + if ! has_version app-text/pandoc ; then + einfo "Node.js will be used to convert notebooks to other formats" + einfo "like HTML. Support for that is still experimental. If you" + einfo "encounter any problems, please use app-text/pandoc instead." + fi + fi +} diff --git a/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch b/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch new file mode 100644 index 000000000000..fa20d325696b --- /dev/null +++ b/dev-python/keystonemiddleware/files/CVE-2015-7546_2.3.2.patch @@ -0,0 +1,596 @@ +From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001 +From: Brant Knudson +Date: Tue, 1 Dec 2015 16:08:00 -0600 +Subject: [PATCH] auth_token verify revocation by audit_id + +If the revocation list includes audit_ids, then when doing offline +validation also validate the token isn't revoked by audit_id. + +Backport notes: +- test_auth_token_middleware was refactored with commit 9cbd47b to + check responses differently, so the test changed to use the old + method. +- reno was not supported so the release note is removed. + +Closes-Bug: 1490804 +Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6 +(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8) +--- + examples/pki/cms/auth_token_scoped.json | 5 +- + examples/pki/cms/auth_token_scoped.pem | 148 ++++++++-------- + examples/pki/cms/auth_token_scoped.pkiz | 2 +- + examples/pki/cms/auth_v3_token_scoped.json | 3 + + examples/pki/cms/auth_v3_token_scoped.pem | 190 +++++++++++---------- + examples/pki/cms/auth_v3_token_scoped.pkiz | 2 +- + keystonemiddleware/auth_token/__init__.py | 12 ++ + keystonemiddleware/auth_token/_revocations.py | 22 +++ + .../unit/auth_token/test_auth_token_middleware.py | 24 +++ + .../tests/unit/auth_token/test_revocations.py | 47 ++++- + 10 files changed, 281 insertions(+), 174 deletions(-) + +diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json +index 698e01d..cf18fa1 100644 +--- a/examples/pki/cms/auth_token_scoped.json ++++ b/examples/pki/cms/auth_token_scoped.json +@@ -8,7 +8,10 @@ + "enabled": true, + "description": null, + "name": "tenant_name1" +- } ++ }, ++ "audit_ids": [ ++ "SLIXlXQUQZWUi9VJrqdXqA" ++ ] + }, + "serviceCatalog": [ + { +diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem +index 4a5b3a2..68f5049 100644 +--- a/examples/pki/cms/auth_token_scoped.pem ++++ b/examples/pki/cms/auth_token_scoped.pem +@@ -1,75 +1,77 @@ + -----BEGIN CMS----- +-MIINhwYJKoZIhvcNAQcCoIINeDCCDXQCAQExCTAHBgUrDgMCGjCCC5QGCSqGSIb3 +-DQEHAaCCC4UEgguBew0KICAgICJhY2Nlc3MiOiB7DQogICAgICAgICJ0b2tlbiI6 +-IHsNCiAgICAgICAgICAgICJleHBpcmVzIjogIjIwMzgtMDEtMThUMjE6MTQ6MDda +-IiwNCiAgICAgICAgICAgICJpZCI6ICJwbGFjZWhvbGRlciIsDQogICAgICAgICAg +-ICAidGVuYW50Ijogew0KICAgICAgICAgICAgICAgICJpZCI6ICJ0ZW5hbnRfaWQx +-IiwNCiAgICAgICAgICAgICAgICAiZW5hYmxlZCI6IHRydWUsDQogICAgICAgICAg +-ICAgICAgImRlc2NyaXB0aW9uIjogbnVsbCwNCiAgICAgICAgICAgICAgICAibmFt +-ZSI6ICJ0ZW5hbnRfbmFtZTEiDQogICAgICAgICAgICB9DQogICAgICAgIH0sDQog +-ICAgICAgICJzZXJ2aWNlQ2F0YWxvZyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAg +-ICAgICAgICAgICAiZW5kcG9pbnRzX2xpbmtzIjogW10sDQogICAgICAgICAgICAg +-ICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAg +-ICAgICAgICAgICAgICAgICAgImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6 +-ODc3Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAg +-ICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIsDQogICAg +-ICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4w +-LjAuMTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwN +-CiAgICAgICAgICAgICAgICAgICAgICAgICJwdWJsaWNVUkwiOiAiaHR0cDovLzEy +-Ny4wLjAuMTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdh +-Ig0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgXSwNCiAg +-ICAgICAgICAgICAgICAidHlwZSI6ICJ2b2x1bWUiLA0KICAgICAgICAgICAgICAg +-ICJuYW1lIjogInZvbHVtZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7 +-DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAg +-ICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsN +-CiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3 +-LjAuMC4xOjkyOTIvdjEiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lv +-biI6ICJyZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVy +-bmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAg +-ICAgICAgICAgICAgICAicHVibGljVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5 +-Mi92MSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0s +-DQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAg +-ICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAg +-ICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAg +-ICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAg +-IHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8v +-MTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2 +-NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lv +-bk9uZSIsDQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAi +-aHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBm +-Y2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInB1YmxpY1VS +-TCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVl +-OGE2MGZjZjg5YmI2NjE3YSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAg +-ICAgICAgICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiY29tcHV0ZSIs +-DQogICAgICAgICAgICAgICAgIm5hbWUiOiAibm92YSINCiAgICAgICAgICAgIH0s +-DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5r +-cyI6IFtdLA0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAg +-ICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVS +-TCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YyLjAiLA0KICAgICAgICAgICAg +-ICAgICAgICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiLA0KICAgICAgICAgICAg +-ICAgICAgICAgICAgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6MzUz +-NTcvdjIuMCIsDQogICAgICAgICAgICAgICAgICAgICAgICAicHVibGljVVJMIjog +-Imh0dHA6Ly8xMjcuMC4wLjE6NTAwMC92Mi4wIg0KICAgICAgICAgICAgICAgICAg +-ICB9DQogICAgICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICAgICAidHlwZSI6 +-ICJpZGVudGl0eSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAia2V5c3RvbmUi +-DQogICAgICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJ1c2VyIjogew0K +-ICAgICAgICAgICAgInVzZXJuYW1lIjogInVzZXJfbmFtZTEiLA0KICAgICAgICAg +-ICAgInJvbGVzX2xpbmtzIjogWw0KICAgICAgICAgICAgICAgICJyb2xlMSIsDQog +-ICAgICAgICAgICAgICAgInJvbGUyIg0KICAgICAgICAgICAgXSwNCiAgICAgICAg +-ICAgICJpZCI6ICJ1c2VyX2lkMSIsDQogICAgICAgICAgICAicm9sZXMiOiBbDQog +-ICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJy +-b2xlMSINCiAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgIHsNCiAg +-ICAgICAgICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICAg +-ICAgfQ0KICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJuYW1lIjogInVzZXJf +-bmFtZTEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHKMIIBxgIBATCBpDCBnjEK +-MAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlT +-dW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUx +-JTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMT +-C1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0GCSqGSIb3DQEBAQUABIIBAGFaC8Po +-svBez6wHfGxgqtX+Zk7kFH0xu/JA7fWp8L5e1k1q+wsSII/P6rATOXR8BSPwifat +-mKRan9kzerLeb3A5g07VphvHfVkDEVaeihi33bpt7140ELSKu/ogWQPtasjBM9Eb +-M9pS4N5NCtZ0erE5DgX//IRfrHFdZuhIbwlmei72692PV7Q70t/rbaH8ofIrH7Rz +-Z1Kuvj0+7tELgd52wy5YnU0e879OEj+2qUk30TvqRG9jdKxLSanmR/8dSA2eNNgO +-oHrtXc4EmpWFbP6yVxNwK3dQ6OvU4virV1YW5+De2ApLt+IeojaVPGnDPfsRvY5x +-t0eIwpDqkgvkRP8= ++MIIN5QYJKoZIhvcNAQcCoIIN1jCCDdICAQExDTALBglghkgBZQMEAgEwggvqBgkq ++hkiG9w0BBwGgggvbBIIL13sNCiAgICAiYWNjZXNzIjogew0KICAgICAgICAidG9r ++ZW4iOiB7DQogICAgICAgICAgICAiZXhwaXJlcyI6ICIyMDM4LTAxLTE4VDIxOjE0 ++OjA3WiIsDQogICAgICAgICAgICAiaWQiOiAicGxhY2Vob2xkZXIiLA0KICAgICAg ++ICAgICAgInRlbmFudCI6IHsNCiAgICAgICAgICAgICAgICAiaWQiOiAidGVuYW50 ++X2lkMSIsDQogICAgICAgICAgICAgICAgImVuYWJsZWQiOiB0cnVlLA0KICAgICAg ++ICAgICAgICAgICJkZXNjcmlwdGlvbiI6IG51bGwsDQogICAgICAgICAgICAgICAg ++Im5hbWUiOiAidGVuYW50X25hbWUxIg0KICAgICAgICAgICAgfSwNCiAgICAgICAg ++ICAgICJhdWRpdF9pZHMiOiBbDQogICAgICAgICAgICAgICAgIlNMSVhsWFFVUVpX ++VWk5VkpycWRYcUEiDQogICAgICAgICAgICBdDQogICAgICAgIH0sDQogICAgICAg ++ICJzZXJ2aWNlQ2F0YWxvZyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAg ++ICAgICAiZW5kcG9pbnRzX2xpbmtzIjogW10sDQogICAgICAgICAgICAgICAgImVu ++ZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAg ++ICAgICAgICAgICAgImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92 ++MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAg ++ICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIsDQogICAgICAgICAg ++ICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4 ++Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwNCiAgICAg ++ICAgICAgICAgICAgICAgICAgICJwdWJsaWNVUkwiOiAiaHR0cDovLzEyNy4wLjAu ++MTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIg0KICAg ++ICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgXSwNCiAgICAgICAg ++ICAgICAgICAidHlwZSI6ICJ2b2x1bWUiLA0KICAgICAgICAgICAgICAgICJuYW1l ++IjogInZvbHVtZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAg ++ICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAgICAgICAg ++ICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAg ++ICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3LjAuMC4x ++OjkyOTIvdjEiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJy ++ZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVybmFsVVJM ++IjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAgICAgICAg ++ICAgICAgICAicHVibGljVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIN ++CiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0sDQogICAg ++ICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAgICAgICJu ++YW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQog ++ICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAgICAg ++ICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAg ++ICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3LjAu ++MC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIs ++DQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIs ++DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDov ++LzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJi ++NjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInB1YmxpY1VSTCI6ICJo ++dHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZj ++Zjg5YmI2NjE3YSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAg ++ICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiY29tcHV0ZSIsDQogICAg ++ICAgICAgICAgICAgIm5hbWUiOiAibm92YSINCiAgICAgICAgICAgIH0sDQogICAg ++ICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtd ++LA0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAg ++ICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJo ++dHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YyLjAiLA0KICAgICAgICAgICAgICAgICAg ++ICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAg ++ICAgICAgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6MzUzNTcvdjIu ++MCIsDQogICAgICAgICAgICAgICAgICAgICAgICAicHVibGljVVJMIjogImh0dHA6 ++Ly8xMjcuMC4wLjE6NTAwMC92Mi4wIg0KICAgICAgICAgICAgICAgICAgICB9DQog ++ICAgICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICAgICAidHlwZSI6ICJpZGVu ++dGl0eSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAia2V5c3RvbmUiDQogICAg ++ICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJ1c2VyIjogew0KICAgICAg ++ICAgICAgInVzZXJuYW1lIjogInVzZXJfbmFtZTEiLA0KICAgICAgICAgICAgInJv ++bGVzX2xpbmtzIjogWw0KICAgICAgICAgICAgICAgICJyb2xlMSIsDQogICAgICAg ++ICAgICAgICAgInJvbGUyIg0KICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJp ++ZCI6ICJ1c2VyX2lkMSIsDQogICAgICAgICAgICAicm9sZXMiOiBbDQogICAgICAg ++ICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJyb2xlMSIN ++CiAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAg ++ICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICAgICAgfQ0K ++ICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJuYW1lIjogInVzZXJfbmFtZTEi ++DQogICAgICAgIH0NCiAgICB9DQp9DQoxggHOMIIBygIBATCBpDCBnjEKMAgGA1UE ++BRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5ueXZh ++bGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUxJTAjBgkq ++hkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMTC1NlbGYg ++U2lnbmVkAgERMAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQCgtkCXRzS8 ++s7WjZCsKDhMt6q5JQIm7x6EMKCBaOABQG9EOVIAyqfoJDdjDtz9rZEPO3UVTpPkg ++VjtA0QV97qT8bX55AcCkk7kBRDOKTtco5GOGwjMxL+GWbIwWiB7DKIP4RA6NLZtF ++WxUbLBY+OgBSiayuHqSx+Rd08QC9oHf25wRkTNp3VFPxtAleDmASzdAoIafoS+FB ++Po+9WuTaGdeya7S+ms4SSyXf9cdMKGv010R/aMINWUWaBrkB4wlespYLmKH/XzwS ++pENRIdbI9XHEOYTWKqul5tucA3p21IA24ND6acl9CXHr3KeqXpRwclSZ38Kg/23T ++92D+SowEjlGf + -----END CMS----- +diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz +index 34d7706..cbfc082 100644 +--- a/examples/pki/cms/auth_token_scoped.pkiz ++++ b/examples/pki/cms/auth_token_scoped.pkiz +@@ -1 +1 @@ +-PKIZ_eJylVst2ozgU3OsrZp_Tx4CNY5biaRFLGMx7ZyDGYMBObJ5fPwInpyedzkxmhhUIqVS36t4r_fhBH1HREPlDwrvx4wfACK1bM9CfziE6NjGBZiyd6dg1lyRxuZCgqXSSDddi6rzKKZa0cTxeaNLuRduhaA5kU1nDPR2MVkqaeo_PvX4MOFLEc5wZmfiIKvpehZeAc-XAt46RJlQoP6fe_JpFpXoD4Q4tkaRzEdexkedkGwlmocefYk24RJU1vE8OPOu293jXObUUGGb7tcXE8rkBm0HpSb9oNzmssX1ekCHmNvOg2wwBE-RhibkwCzjM4sEciOcsAjtow5KUhlxkQR5wANvJEWVtiiq9CLmiibKJUR96ySXi-G1U3lnR3ZnQ1-vA6z6wACON_8MCjDR-shDZoOwuAevubGlick7WVmtkqwbbaD5tIC06I0_nZAiaJFcaQHIrI2UwhKWeB4MzEBmzoX08klwsAy5YGJ6ekTzoCKdkB5e5UlDm2ReLUVxUhQ2I1u6NOjH-KKLSaiOuqJM1OURaUe_vVka-Txeu77a9uVZFmloHnJOBf2vbL3rxAOenfhTsvzoBvkL-CPy1uOCjuqfesNGo7mfByuIWeEkxAZZuHa7FZmQEYla40pfXuKfI6i057NqU1gOlyb4t5JukVL5McfBNscbkYqbkot7_1XrwT96PO8elW-09ob57_yb0SahH-wGNc6RUxCV_jNTvZKA5alTj3YojGuJAmFMyJcmJjRk8uIWhKRzWwjzMUz4oEUdyZR7cE61NPJ3qRb5VTL-N93fhgr_N9ZI0kS-yifa50fhcd4nK2wAmO1hW2Ei0fY060K400eNcPp5bzXsWfpXu4BsWDlQflvQCh7NF-2vKjy7svtt9fgcOPqN_t6k4LZZhA5Ic0QFd8HfjYouPtTcNPKug8V6S9elLAUctwCjg2-KGCjdlG62F4nktXmgGTpNQjlo8pDcsKzdsHx2cK0tsm0ssJ3twp013K9U6GSnTzkN3O9IwinD6tvrEc0Z7fxbY-3xVqME4iO-Zdgp9ksdl0SbaW1PReDbS2vHfJbzrwYzgNIzD3jM7VDH3Wnj72dI-l4fesYk0WhuZLoyxJz492rI7s7gUrnSTD_0SUE_pAue9pY3vPSqYXyi7A7X1MDVV-71CRzCcgRHlQwN5B6w-deKenp8Fzt4dm0DvGny1C41zsnQKoxAuoUzrxWcFHCCxp8c8jAMJ0PO_Tfdmm4aLTsohElPiitCxoe100gD1-3dgw8K1sXltJTOQXdNESqvLpq3sABahBllHETusO3O3jqqCoylcYAu1CpwmPyltsY01t3bmFr07XDvFhts78NUGknIrnn3C0Fqgdjotav96WzmJ6jF8Df1iSDTawhyxGYHiO1AdzfUKYMtslXTaSVbamx16XYlUcgkpYEgjUj5cbyAR09PL8ZRpQsuINHwVQLij9yBp74o5-3C9beMjRm4RGubu5K2F9HGJocPh_HJ7OM-zk36Nb-eHw2sxnGZ74rvrAqi2wSpx1jJyNWd7CHM1LftoqJiSh-nGUy32Js_OzhI1jmuXPJJmF9hh5aytDpquHbdgGGbIvIVPr71BcFdDy7fk2ZFJ92m33szIIMlu-IIEf-UzJFJOwolZRZ1hz-ONETD7_AwstzFmO7fpltxy63KH5wd0qXbBIt7HrOs-YWgF-_PT7CF9KnouPykraZg9YN1WOdW_7O0ckPm5UMNs268OL8QpD24qFNvu8eHFEjtI2uct79Qmn3P8cWWacap2kXw1ZCHP4Gzj16QE2-r1YrVQqwweOk_ybmMdDF83-GVNIJjuogqRf95L_wRcTpJ3 +\ No newline at end of file ++PKIZ_eJylVkuXojgY3edXzL5OnwLUKlnMgrdBwAJDgOx4KK-gVimC_PoJWFVdM93z6DNuNEFu7nfv98i3b-wjawZ0flPs7bj4BmwIV8s8MtdHAotr6khuqhzZ3nxQFFlcKpKr9SqSLDmneVHnMnFtTcq1Ls_DmZzXr6CoS0PsOFnujJxtHmUI9cXqXEaBU5HQGWB1zHc3k0uEC01K-ATZMxIWXRyaNL3BJwAVeLNVe24hqbeQNscq7DeVxm0qaRaU8AwV80QU9qJidomhVyQoronh0fT-jAMkWBTJwS03pfwMG9xGgXkmwbTm0gOmliKV8bSWyswYny-4UKC1vZ0AWhAFPB1pwoNHk0ZvM11sx733P9QsjCptaJcZ9DqFYCz4xOjFETgKcQ3i0NvHgTfFGtxMhDQaJXrhYazHmMenDSbr9KDXwUqXIeWnF1MB37KGVsR3CpAZ-jkR0pFywsRiLLwuEWibreyPvYIY_CmheIvuWhyzlddtyuXVRnAGrEpqbWXOhMtnzhBds0q7OpVXOk00kMasosEfHNXmCSoKp5KbSIjmm8AsnSrqHUErwUSpwYc4ENu7FiYlAou3Flty1-GUMH3Shomt_8gCjDT-Dwsw0phYrHCZGLTC2LQnJk3BZSvpybote7tKxwM6q9KeNmo6c0pRsLdLwTGgAEjFzmmcykE2Zw-YbgxNsA1SkSpfRA0UnEqbRVtTDLddPuYJWcnXmOVCyotn9v0GxnSE-iUbWWQr2rG4xxiFROj5JPAndiw_Ln_d3zPA0TXwq7Z916u-bRC8AiZY-X-cAH-H_An8L-KCT3URXNiTun8v2M_0AhO9QD-8U20_i6vJzqzyKsIALeVeqZ-AdyC2p9cgCWj7n7xXRnbz3hoiLqpIYwukjASbB_bgDk7gzyMUdaRxmo1Ky6hij1BWwLL7Lmg5CXcjQXZKhMVL0twtBiMlEo7Ue-zX3dQ44pXHperxag3azbmNLJjA6Dh3hpSzZlFvfUl18F8q7p_cAL8S78_CBZ_xHvjJHtYj69QQx8QZQqE_Jc3l3q14bmqiu1B-d8m5JqHMs470Q763yYwwQPbC2MK_AE5As7Hlexem3aQZ-AfRBlahvHNj4ZTz7ieObEdHwFdLfsGRT3DwHV3mo6Y_Rfy_VaHf2arEagWytSmCX8n7aUqx4cJmBLf7YbA0F7oLHTYDF_TDkSx0xhE2zcPp91jOrJlMU2pcU_EO8D6Fbqzb0D8zOLM-IZ4J-ugZ429Y3lnTejwYwAMemHBsOrn9u9JseOJPy77YOx1gf1bnnc1k4wfyHnN_Lul38AmEsdiHvGhHUB4qRZHS43h36EAeu11O5r1SSVDOHSxLPpKQ3yuDZN7XEZIoRrZ77hQ3UrHrQq0zVRdpW1uWDCDxvib3tunPcJscqMBygNoe7DRp-vNa6-hLypT3Z14RCedeQ9LLHfiMFO1CwYfy9tbvYPf1qlPLekHeSEiHzGDN1ZevI1B6B2Lpbh5sz-2Alk8nqVp3QSToG6g7J8IACYtI-8ndSHW_HqLJQHYlLc81aX3lauEoClh6VuT6CVmW_Xx4cUKMVpistrF-8znERbl2fHvMwv1Zg7ipXuENxJolYFGlM8EwxIGkw0pI51zZPri711NwFfOy9-h2eDMzXGe6HAtPSqjDtyZSZq0lXBUA-dVBNQ9FszxyDqe-1DG0sq2P0nb_-vCoLDptv3s43RpcnC1-vVPWh6J_uR7D1-xVklHsgVJt1t5DSq3mbKql9HradSuMTCoWQ_HywKdLk7-01l5nbWlbqI8WXjxrwgYhdFwe0MF9AUVO9lb9XD9JQ2Ku-TjaCYawm8_np5i1w2pmP9qSdKH5rttzT12SxPlSXOs3xXe0U6N6BnD2jNsSSlK1ffBnwirm-se3_a7NcLsk-e-_g-lCqznq98vtH9MPoOI= +\ No newline at end of file +diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json +index 082c1b1..9020745 100644 +--- a/examples/pki/cms/auth_v3_token_scoped.json ++++ b/examples/pki/cms/auth_v3_token_scoped.json +@@ -1,5 +1,8 @@ + { + "token": { ++ "audit_ids": [ ++ "SLIXlXQUQZWUi9VJrqdXqA" ++ ], + "methods": [ + "password" + ], +diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem +index e11cf03..e83e7a0 100644 +--- a/examples/pki/cms/auth_v3_token_scoped.pem ++++ b/examples/pki/cms/auth_v3_token_scoped.pem +@@ -1,98 +1,100 @@ + -----BEGIN CMS----- +-MIIR5gYJKoZIhvcNAQcCoIIR1zCCEdMCAQExCTAHBgUrDgMCGjCCD/MGCSqGSIb3 +-DQEHAaCCD+QEgg/gew0KICAgICJ0b2tlbiI6IHsNCiAgICAgICAgIm1ldGhvZHMi +-OiBbDQogICAgICAgICAgICAicGFzc3dvcmQiDQogICAgICAgIF0sDQogICAgICAg +-ICJyb2xlcyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAibmFt +-ZSI6ICJyb2xlMSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAg +-ICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICB9DQogICAg +-ICAgIF0sDQogICAgICAgICJleHBpcmVzX2F0IjogIjIwMzgtMDEtMThUMjE6MTQ6 +-MDdaIiwNCiAgICAgICAgInByb2plY3QiOiB7DQogICAgICAgICAgICAiaWQiOiAi +-dGVuYW50X2lkMSIsDQogICAgICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAg +-ICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFt +-ZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg +-ImVuYWJsZWQiOiB0cnVlLA0KICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogbnVs +-bCwNCiAgICAgICAgICAgICJuYW1lIjogInRlbmFudF9uYW1lMSINCiAgICAgICAg +-fSwNCiAgICAgICAgImNhdGFsb2ciOiBbDQogICAgICAgICAgICB7DQogICAgICAg +-ICAgICAgICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0K +-ICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJhZG1pbiIsDQog +-ICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6 +-ODc3Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAg +-ICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAg +-ICAgICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAg +-ICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJpbnRlcm5hbCIsDQogICAg +-ICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3 +-Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAg +-ICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAg +-ICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAg +-ICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAg +-ICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzYvdjEv +-NjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAg +-ICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAg +-ICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0 +-eXBlIjogInZvbHVtZSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAidm9sdW1l +-Ig0KICAgICAgICAgICAgfSwNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAg +-ICAiZW5kcG9pbnRzIjogWw0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAg +-ICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImFkbWluIiwNCiAgICAgICAg +-ICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3Yx +-IiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25l +-Ig0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7 +-DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFs +-IiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4w +-LjAuMTo5MjkyL3YxIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24i +-OiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAg +-ICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNl +-IjogInB1YmxpYyIsDQogICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0 +-dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAgICAgICAgICAgICAg +-ICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfQ0K +-ICAgICAgICAgICAgICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1h +-Z2UiLA0KICAgICAgICAgICAgICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAg +-ICAgIH0sDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50 ++MIISOAYJKoZIhvcNAQcCoIISKTCCEiUCAQExDTALBglghkgBZQMEAgEwghA9Bgkq ++hkiG9w0BBwGgghAuBIIQKnsNCiAgICAidG9rZW4iOiB7DQogICAgICAgICJhdWRp ++dF9pZHMiOiBbDQogICAgICAgICAgICAiU0xJWGxYUVVRWldVaTlWSnJxZFhxQSIN ++CiAgICAgICAgXSwNCiAgICAgICAgIm1ldGhvZHMiOiBbDQogICAgICAgICAgICAi ++cGFzc3dvcmQiDQogICAgICAgIF0sDQogICAgICAgICJyb2xlcyI6IFsNCiAgICAg ++ICAgICAgIHsNCiAgICAgICAgICAgICAgICAibmFtZSI6ICJyb2xlMSINCiAgICAg ++ICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgIm5hbWUi ++OiAicm9sZTIiDQogICAgICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJl ++eHBpcmVzX2F0IjogIjIwMzgtMDEtMThUMjE6MTQ6MDdaIiwNCiAgICAgICAgInBy ++b2plY3QiOiB7DQogICAgICAgICAgICAiaWQiOiAidGVuYW50X2lkMSIsDQogICAg ++ICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAgICAgICAgICJpZCI6ICJkb21h ++aW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFtZSI6ICJkb21haW5fbmFtZTEi ++DQogICAgICAgICAgICB9LA0KICAgICAgICAgICAgImVuYWJsZWQiOiB0cnVlLA0K ++ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogbnVsbCwNCiAgICAgICAgICAgICJu ++YW1lIjogInRlbmFudF9uYW1lMSINCiAgICAgICAgfSwNCiAgICAgICAgImNhdGFs ++b2ciOiBbDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50 + cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAg + ICAgICAgImludGVyZmFjZSI6ICJhZG1pbiIsDQogICAgICAgICAgICAgICAgICAg +-ICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3NC92MS4xLzY0YjZmM2Zi +-Y2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwNCiAgICAgICAgICAgICAgICAgICAg +-ICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9 +-LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAg +-ICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAg +-ICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJj +-YzUzNDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAg +-ICAgInJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0s +-DQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAg +-ICJpbnRlcmZhY2UiOiAicHVibGljIiwNCiAgICAgICAgICAgICAgICAgICAgICAg +-ICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUz +-NDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAg +-InJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAg +-ICAgICAgICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogImNvbXB1 +-dGUiLA0KICAgICAgICAgICAgICAgICJuYW1lIjogIm5vdmEiDQogICAgICAgICAg +-ICB9LA0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMi +-OiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAg +-ICAgICJpbnRlcmZhY2UiOiAiYWRtaW4iLA0KICAgICAgICAgICAgICAgICAgICAg +-ICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YzIiwNCiAgICAgICAg +-ICAgICAgICAgICAgICAgICJyZWdpb24iOiAiUmVnaW9uT25lIg0KICAgICAgICAg +-ICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAg +-ICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAg +-ICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTozNTM1Ny92 +-MyIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogIlJlZ2lvbk9u +-ZSINCiAgICAgICAgICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAg +-ew0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMi +-LA0KICAgICAgICAgICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAu +-MC4xOjUwMDAvdjMiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6 +-ICJSZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAg +-ICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogImlkZW50aXR5IiwNCiAg +-ICAgICAgICAgICAgICAibmFtZSI6ICJrZXlzdG9uZSINCiAgICAgICAgICAgIH0N +-CiAgICAgICAgXSwNCiAgICAgICAgInVzZXIiOiB7DQogICAgICAgICAgICAiZG9t +-YWluIjogew0KICAgICAgICAgICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAg +-ICAgICAgICAgICAgICAibmFtZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAg +-ICB9LA0KICAgICAgICAgICAgIm5hbWUiOiAidXNlcl9uYW1lMSIsDQogICAgICAg +-ICAgICAiaWQiOiAidXNlcl9pZDEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHK +-MIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgT +-AkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8G +-A1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFj +-ay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0GCSqGSIb3 +-DQEBAQUABIIBAMq7ffe3ft88hD0EXJfWqkoEGcnal6NmTuLAiCOeQjDxR5TEIx0x +-HanKHWAG7Ko/97KgKAAFwOq3hhnbbKbKq7Z3brUNPXNRwBd3RusUrsLQOWwwKAsF +-acD8a4XXx6oC8dTsuFivDtMNb1JvBRIWcZXznOtn/bkFcvVhOQ+Af93c9xPBUpMq +-1667DbVKWRJEsMrcf5r7wYRQBtAKZU3CAjbNDighdTJWwF7TIWZycnF3OHYmu5J2 +-wvcuB8ex+xRvf1lw1qnb3lC43A4M1KqhnHPpWUrpmAFnzAcYwc7ts2iCqD/UwVBP +-YcXU8kk8bY6leNJKR9xjHcIfW8SnREZVbXA= ++ICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2ZjNmYmNj ++NTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAg ++ICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfSwN ++CiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAg ++ImludGVyZmFjZSI6ICJpbnRlcm5hbCIsDQogICAgICAgICAgICAgICAgICAgICAg ++ICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2ZjNmYmNjNTM0 ++MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAgICAi ++cmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfSwNCiAg ++ICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgImlu ++dGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInVy ++bCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzYvdjEvNjRiNmYzZmJjYzUzNDM1ZThh ++NjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lv ++biI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAg ++ICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogInZvbHVtZSIsDQog ++ICAgICAgICAgICAgICAgIm5hbWUiOiAidm9sdW1lIg0KICAgICAgICAgICAgfSwN ++CiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAiZW5kcG9pbnRzIjogWw0K ++ICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAi ++aW50ZXJmYWNlIjogImFkbWluIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1 ++cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3YxIiwNCiAgICAgICAgICAgICAg ++ICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAg ++ICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAg ++ICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAg ++ICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3YxIiwNCiAg ++ICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAg ++ICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAg ++ICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogInB1YmxpYyIsDQogICAg ++ICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5 ++Mi92MSIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lv ++bk9uZSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0s ++DQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAg ++ICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAg ++ICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAg ++ICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6 ++ICJhZG1pbiIsDQogICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6 ++Ly8xMjcuMC4wLjE6ODc3NC92MS4xLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODli ++YjY2MTdhIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVn ++aW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAg ++ICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImlu ++dGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDov ++LzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJi ++NjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdp ++b25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0sDQogICAgICAgICAgICAgICAg ++ICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJpbnRlcmZhY2UiOiAicHVi ++bGljIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEy ++Ny4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJiNjYx ++N2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdpb25P ++bmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0K ++ICAgICAgICAgICAgICAgICJ0eXBlIjogImNvbXB1dGUiLA0KICAgICAgICAgICAg ++ICAgICJuYW1lIjogIm5vdmEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg ++ew0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAg ++ICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJpbnRlcmZhY2UiOiAi ++YWRtaW4iLA0KICAgICAgICAgICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8v ++MTI3LjAuMC4xOjM1MzU3L3YzIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJy ++ZWdpb24iOiAiUmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAg ++ICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50 ++ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1 ++cmwiOiAiaHR0cDovLzEyNy4wLjAuMTozNTM1Ny92MyIsDQogICAgICAgICAgICAg ++ICAgICAgICAgICAicmVnaW9uIjogIlJlZ2lvbk9uZSINCiAgICAgICAgICAgICAg ++ICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAg ++ICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAgICAgICAg ++ICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjUwMDAvdjMiLA0KICAg ++ICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiDQogICAg ++ICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0KICAgICAgICAg ++ICAgICAgICJ0eXBlIjogImlkZW50aXR5IiwNCiAgICAgICAgICAgICAgICAibmFt ++ZSI6ICJrZXlzdG9uZSINCiAgICAgICAgICAgIH0NCiAgICAgICAgXSwNCiAgICAg ++ICAgInVzZXIiOiB7DQogICAgICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAg ++ICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFt ++ZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg ++Im5hbWUiOiAidXNlcl9uYW1lMSIsDQogICAgICAgICAgICAiaWQiOiAidXNlcl9p ++ZDEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHOMIIBygIBATCBpDCBnjEKMAgG ++A1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5u ++eXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUxJTAj ++BgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMTC1Nl ++bGYgU2lnbmVkAgERMAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQBBvzoh ++0iSPMQhuRCAtTG3cPhyewvf554MPjbGQnu8mYmmfyxl7gMmWkTAmyckAsSv4mS6/ ++4SQj9WCn4T1lFkhUz7WWjCwt6fWWp3mzF8Nl/kMsJKDwlxDGbPzsyewXIUsw11sz ++q/Qxs7qGxQ1vYWnaWQ3hC3oZw7cOswKRJicdP439iVPvfqR9CDbK55sPP+ewZRgQ ++YJ3Uc/xDizxepudFJj9+VHKceA37/sVK0ataNe2uHLHwVBYPwOppMckP169QBw8x ++QYh9h+kcOAyZ5psiUzCpLKnlMiYDrVcTGxnTeiVHxKXxj/MERNhR1Y4lEr0ZHJ+p ++Y6p3FBP2VUCefaRh + -----END CMS----- +diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz +index d687c03..74f8f63 100644 +--- a/examples/pki/cms/auth_v3_token_scoped.pkiz ++++ b/examples/pki/cms/auth_v3_token_scoped.pkiz +@@ -1 +1 @@ +-PKIZ_eJy9V8lyo0gQvddXzN3RYUCgNoc-FItYTCGBEEvdWCwWscjWwvL1UyDJ3W577J6YiFGEDlUFmS_zvcxKvn0jP0FWNPMvEa3HxTeANE1X2kB_bLCWnWMTWrHYkD1JEkXRSkVoyZ3oQFVINy9SikSlEEWhTxVx_aystWgGJEtWYUg2u52cprH71OtUxBzLKNfmmnrIY1U_h5VbJOJljRX-GHjlSSualDx7AoFHl-NCq-xz5C32Ucmfxj201g6aqO_x-KKo7yKGzkKP24ae1Wk1NZ6VUbXIQaS4u9FAouo0XrfEEJdF3iZf5jBPFJcY4yifmfY6LR_P7TJmzD70BSr0-BMYX45q9xCJ42E5GdNqe7R-Shb8Hktyvh0N1_qZOBvGc292yMn5Ea-1OSBQ-ojpCGSdN0Th-68I4oo_YEfLt-4E-Yh9u4kY-2Kk19vANweQMHyPRT0xRJhjP2tDXy9jms-mpIlajyTEGg7sDEdmXUnrloVMLQs48_IpRwUIfDuLFL7-HRo5ZAgyekQzGfe4Xazw-6i2X8NIfP0ALgxkVKLCudE_dKiIT0hkW6OQ50spnpk5z6D1A2MqGoMLswoqszAdRKHBLZeKzACk4AIXKRdUGmMW8iy40kc8lXGFs4C55CPw7GPosROauHLrkYHROSDZLTFTnqMdf8K3RNZuH134bxLVbpf5wxk52swo4IiO5CGdmUNwTgr5DMzCzgmwAVd6EQybwZQQjZ0sMwuhCpiAXXp6bhZBZzLy5J2IicK-XgWeWV4QVOWJCKYnyTtMQrkhyicEPfaSfcRwq6jaTHog8qXjqp3CClWbArHUnI1B7s1-TByB6DSsOcSMMQs6YwiooMAVYnAeMIhGgzWY3oYNnKDFlVktpTIHQUGOnCS7yPSCBleL4kplm3j6IfTQu-TdkIJb8vxJrjYXK9c6ICpMxkIbC0d9o486UhankZ3RKPgngXyqD0fj0KQP7QD-DecfUQ6-5nzXE48j5_8fjRwiXkca_4QZ8FmMvzMTenSGmVckU-u7ViN3Tir507L9J1bAa9mKIy3sH6nvV_GBD2LMsELvo0vHuSaRvba4S7gOw70KDHwpmi_Qgc_gfYDuKjrSeMULQvAVxK8Qgv-SwBEh-Lfl-7tGwE0kAcMfY9Wl8AcXTMi4XDwjd2f1vsWDPy1hNPZLJyZFhd4UFbhVlVYtdtF4bb8vqPVnBQXGivqgoIg3RJs9SW7_8T1xRTDOB-37hJV_fleAn41j0yIJvovxNcRaoIOq2wf9W4mDEc7mjYDo6aZO1LK9qQ-TQSNRSurplT53wL5GQhlb2m20uc5Ev3Tf17Fm2nNuLc2acnCblYDPlLvLcAF_fZmOGbd_O9rcppfRu36dlWgebB1FhHHTpqmqwFQWkKbsyP8JWU0rwkByLWshtzKNrEMrWtNakVvd3QyygeBOAZDeyKKARIuSO7mAlpCargBjR3RNOqo4LiHNlsBfIwEq07MZ0p2ZUEalSZEEvwBky63UTpYNuc0M7JdDohD6HLlEInodKMk8qUM78H7K2oURMQSi-mLJqMisNMgbJGiTJ9ghY8O4B5wLTuglJ-xZIiTOhDZYPLasBLOmlaxABz9HXFkQLEimVRnmJ3OlLmcvbKSdqMYrmzCrm95WXJ12CpbiH4Ln1O5ZzC2aZ6DndyU-zU7DXS1QL_Ndjdd-JsAIqbs9v3To5N5fB9zLshOf-uql6beRHX3H4Xy_hxWW6AqsHh-d7_NktVXtxxXTR2yhoe3cWAcs_bxqnxTBqRUha-onmROWuZpIXC05Em0v1vaB1bI50P2ZKjyrfXi33B4XFO47K4lXsKyFx7vW2Id3ZyKK9OUQMH7ztHPNY-vcQ38ZZliW5ORlDQYlpPYnVmg1NNNgWvIzt33g7oXy0LVwkMU8rNSu3g6ORWFa9GAxHL1NWqSxkdqqeL4HK0GEBs73RVma-_uGClnlMehWZR49Gdvvq8UiiqvZ1jZ0-OMHmD4xZFP6-bnxN6RCLsw= +\ No newline at end of file ++PKIZ_eJy9V0tzozoT3etX3H1qKoBNEhbfgpexMJKNjXloZyDmJWwnNs9f_wnsSWYyuXUzc6uuq7yQQN2n-_RpNd--sZ-iGxD_paLNsPgGEISmIwfm4khgWkdYtiP1yPZWjqqqTqHKtt5qjmwpCU3SIlGIjXQ50ZskiddKUryAtMgMqeEUpTEStqkqEM5Xh3MWG9Ir8abZMlMeYcnT2EhrMkfDOoQHJY0meBJOzAJAyp2hanah0NKogw9wdmEHxDT0tuxlOYtK6UwcPdtvmuS5M6vA4ynMjwk8mHVobDsAD3xsqXJG_LTZ-SaNeCmNVWZIhR3S0NRy5NZy9KmrwXaZ69wylydeBgenDTP-AoiHucEis16EAp_u3mDTYvRUruvQm51CKp2IpmeDs7CcXchmcMJCuB4S9-PmDSosXQbVPBPPHoxx0cGlw8HduJZZfobnIucLtABoM8L5IbY1ZcaqeCaNe7fnBfFxHpW0iQ1ahxnzboh8aLQSGCwHwowLvLYmb0l0KzJXaoaMe08srZjnjpSz_AY_JQZ_AuE1IXxUNiO83XzNRdqxtnq9w920sXK5Qs5xivtIsCZBa_UBF-SkRAJhjhEPUG_32NtOAydoSInLpUazIGePnDiFWTPQRYlwg83oJl58CgVxFZbbMV-AZf8UsrijkqSBcOV-gE78IS_NmPXYN89XRlIunssPVvfUojyqkDptgJXrD0uN1VUmCWjzJGADCiTHZVDiHDuIQ71Ll4YuIIPkJE_EoIQCzvVJcE1uB66Qpreqcw87T6ocQaTwwCp0fv6Opgw8fGNJ4YOyPQXdNXfgT5P3PXfgj5Lnjvrhnn2FgissUodzdyjPD0X1fd-ULFX5tD7A3xXIF-tDBCgvuiHGr3D-GeXgdzgfKXegiEbK_yMaxX8KEXxGzTUEegm8mI4Hf2hxRGjTsMRvCFkIYhEZ0pCcfjjoTT6BXc6K0KPVFYXbhWPLM4_xfN2AZfZUIwdORsjqlPW9ZIJ7u45zvfqKNsBHcfxuUt8KibWx82cQ_wkh-F35fkQIfpf3j7SDT-TLjfLN9Rrn64xh60lp5kG_7bGGeOKkKc6VMhCC6dIzM4DzoMXC9cL4nrTb1XUtmkKqBjX6w31xWIuRca2HQJAu0dzlwC8SLsU6Lt_uQnZHrJtQYIm-XawfBQVGa976MlxpXxETGkJxIsYCGt8HP8GmP8O-NpFf-sUNAStvFZ7BF5oG84h43DEJd79SCbZ_IOEfHYJPPPJIkxtGZf-JhDcfmyv4IOGCqZPb-Wvxo4x3gitGEzYrvEufjwS3A_9muBjOgF-Hi3evsY9pRH-aE07kKrTR-23AGOhiteC7BYO-33m3xtKZjqPTIJyla9ed7VzePS1dsogOs8KbzxRIeWnvGCqQoymb-eYLNvspCBoF-z8j-9iocqC5tj3TG51H9rlR7XFt6I3pbnvdQnJhyPxWB6qCVJvTWz2XbSXBriJHjupiPixFMWY9goW2QYo8vqymyHQmCg0pZhMNfkVrvQFaM1q29Ca1iE97NmBW7BBFKjLUzYuxgeFEs3VTXgfeOxOuHA6GDpgDgyWrlDrS61ukwNGT3CJrK7hnkinOzosrNq2pMvOmNoEZQAJlb6spMlSQzBngBy-KbG9lNuoqsl45jyd9AeeC-HheWe3ZcDV83l82hJcKyxTugoXTmR29W7ggfMi9NIj3U057PbLunu_O-6Pf76PznSIHxJRq4e7OOIWL7KTwPgcP9f2rd7_dRKUwebBCDmgngUi2KFhknc5gFhThttK4Je6NbWFO4GIz0T3rsfJW4mql2yo1yqqtlZnzjLO21O874K2f7p-3F08ISRVMDf_iXbz5PD_K8sTuT0er8oTnKn5NWsdHyHVR99DQbfas-vv01XjSVsATVN47Wg1furyTLmYXI0p8ob7Xl6tjv6sXjplX6K40Nz4WV013XF_UIgmX3fSurGfTwwJ0j4vLEa_um-eE7-4VWqYvq8eX-zbZTFYPl2htaOZRdlYzh4P_A-M3io619--V_wMk2UFA +\ No newline at end of file +diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py +index a8afeb2..be268da 100644 +--- a/keystonemiddleware/auth_token/__init__.py ++++ b/keystonemiddleware/auth_token/__init__.py +@@ -883,6 +883,18 @@ class AuthProtocol(_BaseAuthProtocol): + 'fallback to online validation.')) + else: + data = jsonutils.loads(verified) ++ ++ audit_ids = None ++ if 'access' in data: ++ # It's a v2 token. ++ audit_ids = data['access']['token'].get('audit_ids') ++ else: ++ # It's a v3 token ++ audit_ids = data['token'].get('audit_ids') ++ ++ if audit_ids: ++ self._revocations.check_by_audit_id(audit_ids) ++ + return data + + def _validate_token(self, auth_ref): +diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py +index 8cc449a..a68356a 100644 +--- a/keystonemiddleware/auth_token/_revocations.py ++++ b/keystonemiddleware/auth_token/_revocations.py +@@ -104,3 +104,25 @@ class Revocations(object): + if self._any_revoked(token_ids): + self._log.debug('Token is marked as having been revoked') + raise exc.InvalidToken(_('Token has been revoked')) ++ ++ def check_by_audit_id(self, audit_ids): ++ """Check whether the audit_id appears in the revocation list. ++ ++ :raises keystonemiddleware.auth_token._exceptions.InvalidToken: ++ if the audit ID(s) appear in the revocation list. ++ ++ """ ++ revoked_tokens = self._list.get('revoked', None) ++ if not revoked_tokens: ++ # There's no revoked tokens, so nothing to do. ++ return ++ ++ # The audit_id may not be present in the revocation events because ++ # earlier versions of the identity server didn't provide them. ++ revoked_ids = set( ++ x['audit_id'] for x in revoked_tokens if 'audit_id' in x) ++ for audit_id in audit_ids: ++ if audit_id in revoked_ids: ++ self._log.debug( ++ 'Token is marked as having been revoked by audit id') ++ raise exc.InvalidToken(_('Token has been revoked')) +diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py +index 3fdd4a9..e729735 100644 +--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py ++++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py +@@ -896,6 +896,30 @@ class CommonAuthTokenMiddlewareTest(object): + def test_revoked_hashed_pkiz_token(self): + self._test_revoked_hashed_token('signed_token_scoped_pkiz') + ++ def test_revoked_pki_token_by_audit_id(self): ++ # When the audit ID is in the revocation list, the token is invalid. ++ self.set_middleware() ++ token = self.token_dict['signed_token_scoped'] ++ ++ # Put the token audit ID in the revocation list, ++ # the entry will have a false token ID so the token ID doesn't match. ++ fake_token_id = uuid.uuid4().hex ++ # The audit_id value is in examples/pki/cms/auth_*_token_scoped.json. ++ audit_id = 'SLIXlXQUQZWUi9VJrqdXqA' ++ revocation_list_data = { ++ 'revoked': [ ++ { ++ 'id': fake_token_id, ++ 'audit_id': audit_id ++ }, ++ ] ++ } ++ self.middleware._revocations._list = jsonutils.dumps( ++ revocation_list_data) ++ ++ resp = self.call_middleware(headers={'X-Auth-Token': token}) ++ self.assertEqual(401, resp.status_int) ++ + def get_revocation_list_json(self, token_ids=None, mode=None): + if token_ids is None: + key = 'revoked_token_hash' + (('_' + mode) if mode else '') +diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py +index cef65b8..258e195 100644 +--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py ++++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py +@@ -27,22 +27,24 @@ from keystonemiddleware.tests.unit import utils + + class RevocationsTests(utils.BaseTestCase): + +- def _check_with_list(self, revoked_list, token_ids): ++ def _setup_revocations(self, revoked_list): + directory_name = '/tmp/%s' % uuid.uuid4().hex + signing_directory = _signing_dir.SigningDirectory(directory_name) + self.addCleanup(shutil.rmtree, directory_name) + + identity_server = mock.Mock() + +- verify_result_obj = { +- 'revoked': list({'id': r} for r in revoked_list) +- } ++ verify_result_obj = {'revoked': revoked_list} + cms_verify = mock.Mock(return_value=json.dumps(verify_result_obj)) + + revocations = _revocations.Revocations( + timeout=datetime.timedelta(1), signing_directory=signing_directory, + identity_server=identity_server, cms_verify=cms_verify) ++ return revocations + ++ def _check_with_list(self, revoked_list, token_ids): ++ revoked_list = list({'id': r} for r in revoked_list) ++ revocations = self._setup_revocations(revoked_list) + revocations.check(token_ids) + + def test_check_empty_list(self): +@@ -63,3 +65,40 @@ class RevocationsTests(utils.BaseTestCase): + token_ids = [token_id] + self.assertRaises(exc.InvalidToken, + self._check_with_list, revoked_tokens, token_ids) ++ ++ def test_check_by_audit_id_revoked(self): ++ # When the audit ID is in the revocation list, InvalidToken is raised. ++ audit_id = uuid.uuid4().hex ++ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': audit_id}] ++ revocations = self._setup_revocations(revoked_list) ++ self.assertRaises(exc.InvalidToken, ++ revocations.check_by_audit_id, [audit_id]) ++ ++ def test_check_by_audit_id_chain_revoked(self): ++ # When the token's audit chain ID is in the revocation list, ++ # InvalidToken is raised. ++ revoked_audit_id = uuid.uuid4().hex ++ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': revoked_audit_id}] ++ revocations = self._setup_revocations(revoked_list) ++ ++ token_audit_ids = [uuid.uuid4().hex, revoked_audit_id] ++ self.assertRaises(exc.InvalidToken, ++ revocations.check_by_audit_id, token_audit_ids) ++ ++ def test_check_by_audit_id_not_revoked(self): ++ # When the audit ID is not in the revocation list no exception. ++ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': uuid.uuid4().hex}] ++ revocations = self._setup_revocations(revoked_list) ++ ++ audit_id = uuid.uuid4().hex ++ revocations.check_by_audit_id([audit_id]) ++ ++ def test_check_by_audit_id_no_audit_ids(self): ++ # Older identity servers don't send audit_ids in the revocation list. ++ # When this happens, check_by_audit_id still works, just doesn't ++ # verify anything. ++ revoked_list = [{'id': uuid.uuid4().hex}] ++ revocations = self._setup_revocations(revoked_list) ++ ++ audit_id = uuid.uuid4().hex ++ revocations.check_by_audit_id([audit_id]) +-- +1.9.1 + diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild similarity index 96% rename from dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild rename to dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild index cad25cd5edab..c56c57bf18d4 100644 --- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.1.ebuild +++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -58,6 +58,7 @@ RDEPEND=" >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]" PATCHES=( + "${FILESDIR}/CVE-2015-7546_2.3.2.patch" ) python_prepare_all() { diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild similarity index 97% rename from dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild rename to dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild index 6a2c3c714260..ef7504473ec8 100644 --- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2.ebuild +++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -63,6 +63,7 @@ RDEPEND=" >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]" PATCHES=( + "${FILESDIR}/CVE-2015-7546_2.3.2.patch" ) python_prepare_all() { diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest index 338a2aceb0aa..143007ca67ef 100644 --- a/dev-python/libvirt-python/Manifest +++ b/dev-python/libvirt-python/Manifest @@ -1,2 +1,3 @@ DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e DIST libvirt-python-1.3.0.tar.gz 171195 SHA256 097d41bc52c300e50c5b04836e078bae5653fe222db92a9a10839f3e6b3afc7c SHA512 b207aa9aef63e7d1a8377b2f8a0fa8dc05893bd744672c2b41f4dafa2516cbddd2868f37b0caf72b125fccbbf56542fcf1b94b452c406757f30d8f02d6ee26b4 WHIRLPOOL 1bde1fd130e0760bfa8f62c2f85e4ded991fc0eadcaf10b38bbbcf754eaa7b3a0ccb72f304f65457115419e4d3d904d07172e33bd68d581a29e4fb8d0703b45a +DIST libvirt-python-1.3.1.tar.gz 171221 SHA256 7143b922a9bd66a5e199b13316fa4266cbffc23db01c99bce37216a1eb9118f7 SHA512 f980d6aec1c83422d01c8ff02915357f4903f8c2a8ea9538da35e7313f6d491ebb4646e642097269a6be2996da879e7594c5e166cf2cc0bd96745eace7ce7567 WHIRLPOOL 3fe0ecba5f618eab1059c5e4ac4ef8789ed6684f36aee336f2e366198805560706c41d67ddceb328a0ad66867145a103aa15665b646b7bc5a5b058b02755ce11 diff --git a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild new file mode 100644 index 000000000000..cc59d1ba63b0 --- /dev/null +++ b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +AUTOTOOLIZE=yes + +MY_P="${P/_rc/-rc}" + +inherit eutils distutils-r1 + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://libvirt.org/libvirt-python.git" + SRC_URI="" + KEYWORDS="" + RDEPEND="app-emulation/libvirt:=[-python(-)]" +else + SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + RDEPEND="app-emulation/libvirt:0/${PV}" +fi +S="${WORKDIR}/${P%_rc*}" + +DESCRIPTION="libvirt Python bindings" +HOMEPAGE="http://www.libvirt.org" +LICENSE="LGPL-2" +SLOT="0" +IUSE="test" + +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-python/lxml[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] )" + +# testsuite is currently not included in upstream tarball +RESTRICT="test" + +python_test() { + esetup.py test +} diff --git a/dev-python/mimeparse/Manifest b/dev-python/mimeparse/Manifest index 70a660056337..451d25f7971c 100644 --- a/dev-python/mimeparse/Manifest +++ b/dev-python/mimeparse/Manifest @@ -1 +1,2 @@ DIST python-mimeparse-0.1.4.tar.gz 5228 SHA256 3c69a21e37e77f754e6fc09ebda70acd92c90d8a58f29a41cc0248351378ddc3 SHA512 c8eeb298773a0eb36512b1d9a46dfc85423c0dab10b85ed94284bf1bf8dba8c34aeccefd8b6a187434789d5a160ab5d4af81659dd1808ea02078cc2b168e10b3 WHIRLPOOL f83328743b16ae46263e05055d6400617b7858e11837ce892919e26a36348650122b78ee366125a1793b20fa71c641b3606bf834d2936f98dab65b89b740385b +DIST python-mimeparse-1.5.tar.gz 5827 SHA256 9518ff1576d60e99f310116711beda6974f18caa3deb01c73d25bab409408878 SHA512 799b40c0128f22949869bc55f618b46f022bf937cd59be21343dab3d3d977cc24d84744dcbd23da4efb135e940a1373f064ec6e56e8bd4188fa54a3107d2718f WHIRLPOOL b9c9748c24ff931c2c3a2ae4da088818f9a7018be6450783c3ac0ff533e7292b23a5e94cff976b3209003a481240a5a4af65c7d6b81753b80e200b0fc5a0c03d diff --git a/dev-python/mimeparse/mimeparse-1.5.ebuild b/dev-python/mimeparse/mimeparse-1.5.ebuild new file mode 100644 index 000000000000..0d1ed5a0049b --- /dev/null +++ b/dev-python/mimeparse/mimeparse-1.5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +MY_PN="python-${PN}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Basic functions for handling mime-types in python" +HOMEPAGE=" + https://code.google.com/p/mimeparse + https://github.com/dbtsai/python-mimeparse" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +RDEPEND="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + "${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}" +} + +python_install() { + distutils-r1_python_install + + if [[ ${EPYTHON} == pypy ]]; then + local pyver=2.7 + elif [[ ${EPYTHON} == pypy3 ]]; then + local pyver=3.2 + else + local pyver=${EPYTHON#python} + fi + python_export PYTHON_SITEDIR + + # Previous versions were just called 'mimeparse' + ln -sf python_mimeparse-${PV}-py${pyver}.egg-info \ + "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die +} diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest index 1dd881b5d1be..cbfebe2afe2b 100644 --- a/dev-python/networkx/Manifest +++ b/dev-python/networkx/Manifest @@ -1,2 +1,3 @@ DIST networkx-1.10.tar.gz 1189291 SHA256 ced4095ab83b7451cec1172183eff419ed32e21397ea4e1971d92a5808ed6fb8 SHA512 fc0a0b929991baef63c30382c2045d551b217140393a4264b18a5f1be198d325eee9f57e02dda38a7ad9f99771c5b78f82c673a88b04df122b9d91852db09efd WHIRLPOOL 8a9666142a1978e72b9eeb791de5c2033d0d29cd2db846f2583c41876d6a5c864c295316bb3d1c2858ccda0f4ca5081108ed9c07176eb8146c8c772fa77c8a60 +DIST networkx-1.11.tar.gz 1315737 SHA256 0d0e70e10dfb47601cbb3425a00e03e2a2e97477be6f80638fef91d54dd1e4b8 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253 WHIRLPOOL 64f68a750efef2f356525f4f2e1d8046327b223a4a55b3388fef1f7b68dac3796fbd05e7d997052ab644213ccea25a0584a2f4bbd660bc32b4c9aff9a92926c6 DIST networkx-1.9.1.tar.gz 1035784 SHA256 6380eb38d0b5770d7e50813c8a48ff7c373b2187b4220339c1adce803df01c59 SHA512 8c18bd07530b26731da4db40dc9d82c81b78b086a2b15a45daa65ab55ec92a4ba836f911add062f698c3f319e5e85b5a26a6a52f760f5cf32e3d2a73c46cd93d WHIRLPOOL 01db9c8560140a52a890851871249c9d509883f7aa877487c16cdcc42973ae74b9c1815371d99247f72766e1f26e0a1afc0965af65583c4a9b59b75c2369fe2a diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild index 9770aae4be5f..b6b73f9cfe83 100644 --- a/dev-python/networkx/networkx-1.10-r1.ebuild +++ b/dev-python/networkx/networkx-1.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + COMMON_DEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}]" @@ -42,6 +44,10 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] )" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_prepare_all() { # Avoid d'loading of file objects.inv from 2 sites of python docs sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die diff --git a/dev-python/networkx/networkx-1.10.ebuild b/dev-python/networkx/networkx-1.10.ebuild index 95ff6a288d1d..23f681f8150d 100644 --- a/dev-python/networkx/networkx-1.10.ebuild +++ b/dev-python/networkx/networkx-1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,7 +17,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples test" -COMMON_DEPEND="dev-python/matplotlib[${PYTHON_USEDEP}] +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +COMMON_DEPEND=" + dev-python/matplotlib[${PYTHON_USEDEP}] sci-libs/scipy[${PYTHON_USEDEP}]" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -41,6 +44,10 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] )" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_prepare_all() { # Avoid d'loading of file objects.inv from 2 sites of python docs sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild new file mode 100644 index 000000000000..0c221742b523 --- /dev/null +++ b/dev-python/networkx/networkx-1.11.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Python tools to manipulate graphs and complex networks" +HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="doc examples test" + +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +COMMON_DEPEND=" + dev-python/matplotlib[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7) + $(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) + ) + test? ( + ${COMMON_DEPEND} + dev-python/nose[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' python2_7) + )" +RDEPEND=" + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + examples? ( + ${COMMON_DEPEND} + dev-python/pygraphviz[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + )" + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + +python_prepare_all() { + # Avoid d'loading of file objects.inv from 2 sites of python docs + sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + # https://github.com/networkx/networkx/issues/1263 + if use doc; then + sed \ + -e "s:^\t\./:\t${PYTHON} :g" \ + -i doc/Makefile || die + emake -C doc html + fi +} + +python_test() { + nosetests -vv || die +} + +python_install_all() { + # Oh my. + rm -r "${ED}"usr/share/doc/${P} || die + + use doc && local HTML_DOCS=( doc/build/html/. ) + use examples && local EXAMPLES=( examples/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest index 1afef6aee3ee..3f45f5adc5f6 100644 --- a/dev-python/nose/Manifest +++ b/dev-python/nose/Manifest @@ -1,3 +1 @@ -DIST nose-1.3.4.tar.gz 277488 SHA256 76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03 SHA512 19499ab08018229ea5195cdac739d6c7c247c5aa5b2c91b801cbd99bad12584ed84c5cfaaa6fa8b4893a46324571a2f8a1988a1381f4ddd58390e597bd7bdc24 WHIRLPOOL 10c3938913e0bfcbb20a7822feadd751c2c1db76d97bf0a5ecbe83be81934a5a23aad4d37a77c68d6da5ac80bdb274f56e2ee3206fb97f96832271d479ca7302 -DIST nose-1.3.6.tar.gz 276273 SHA256 f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758 SHA512 d0cede08dc33a8ac0af0f18063e57f31b615f06e911edb5ca264575174d8f4adb4338448968c403811d9dcc60f38ade3164662d6c7b69b499f56f0984bb6283c WHIRLPOOL d7360c24aad388c736ce08578eb7ca529873a8603dc0b8e4c79d7756a6d5f6429561b3b8beffc2930301a48767ded06fb3127c27c07432cb25a0549556cb74fe DIST nose-1.3.7.tar.gz 280488 SHA256 f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62 WHIRLPOOL 68684b12e18d41b1f49ba3e832adf8a03b3b84ce530f0bde34f8c40c84f38046aac2777090472fefe87ba7abe3fdffa4cdcad74e3b717fcb9dfe932a0657b965 diff --git a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch b/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch deleted file mode 100644 index 5ce5a1db8801..000000000000 --- a/dev-python/nose/files/nose-0.11.0-disable_intersphinx.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- doc/conf.py.orig 2009-05-07 03:12:35.000000000 +0200 -+++ doc/conf.py 2009-05-13 10:13:12.588540888 +0200 -@@ -31,7 +31,7 @@ - - # Add any Sphinx extension module names here, as strings. They can be extensions - # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. --extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', -+extensions = ['sphinx.ext.autodoc', - 'nose.sphinx.pluginopts', 'manbuilder'] - - # Add any paths that contain templates here, relative to this directory. -@@ -231,4 +231,4 @@ - - - # Example configuration for intersphinx: refer to the Python standard library. --intersphinx_mapping = {'http://docs.python.org/dev': None} -+#intersphinx_mapping = {'http://docs.python.org/dev': None} diff --git a/dev-python/nose/files/nose-1.2.1-skiptest.patch b/dev-python/nose/files/nose-1.2.1-skiptest.patch deleted file mode 100644 index b8f7a57f4da8..000000000000 --- a/dev-python/nose/files/nose-1.2.1-skiptest.patch +++ /dev/null @@ -1,23 +0,0 @@ -Tests are set to compulsory fail, cannot be set to expectedFailure -diff -ur nose-1.2.1.orig/functional_tests/test_program.py nose-1.2.1/functional_tests/test_program.py ---- functional_tests/test_program.py 2011-12-14 22:01:38.000000000 +0800 -+++ functional_tests/test_program.py 2013-03-02 14:50:28.628004408 +0800 -@@ -1,5 +1,8 @@ --import os --import unittest -+import os, sys -+if sys.version_info[:2] == (2, 7) or hasattr(sys, 'pypy_version_info'): -+ import unittest -+else: -+ import unittest2 as unittest - from cStringIO import StringIO - from nose import SkipTest - from nose.core import TestProgram -@@ -91,6 +91,7 @@ - assert not res.errors - assert not res.failures - -+ @unittest.skip("tests set to exit with compulsory fail, error") - def test_run_support_twist(self): - """Collect and run tests in functional/support/twist - diff --git a/dev-python/nose/files/nose-1.3.1-doctest.patch b/dev-python/nose/files/nose-1.3.1-doctest.patch deleted file mode 100644 index 37d0dcced96c..000000000000 --- a/dev-python/nose/files/nose-1.3.1-doctest.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/nose-devs/nose/commit/5bcedc9a0601b4f70e2cba6c14c3046fb326bfaa.diff -diff --git a/unit_tests/test_config_defaults.rst b/unit_tests/test_config_defaults.rst -index 944d370..034f58e 100644 ---- a/unit_tests/test_config_defaults.rst -+++ b/unit_tests/test_config_defaults.rst -@@ -89,9 +89,9 @@ Invalid config files - - (file-like object) - -- >>> options, args = parse([], StringIO("spam")) -+ >>> options, args = parse([], StringIO("spam")) # doctest: +ELLIPSIS - error: Error reading config file '': File contains no section headers. -- file: , line: 1 -+ file: ......, line: 1 - 'spam' - - (filename) -@@ -99,7 +99,7 @@ Invalid config files - >>> options, args = parse([], os.path.join(support, "invalid.cfg")) - ... # doctest: +ELLIPSIS - error: Error reading config file '...invalid.cfg': File contains no section headers. -- file: ...invalid.cfg, line: 1 -+ file: ...invalid.cfg..., line: 1 - 'spam\n' - - (filenames, length == 1) -@@ -107,7 +107,7 @@ Invalid config files - >>> options, args = parse([], [os.path.join(support, "invalid.cfg")]) - ... # doctest: +ELLIPSIS - error: Error reading config file '...invalid.cfg': File contains no section headers. -- file: ...invalid.cfg, line: 1 -+ file: ...invalid.cfg..., line: 1 - 'spam\n' - - (filenames, length > 1) -@@ -120,7 +120,7 @@ file is bad - ... os.path.join(support, "b.cfg")]) - ... # doctest: +ELLIPSIS - error: Error reading config file '...invalid.cfg': File contains no section headers. -- file: ...invalid.cfg, line: 1 -+ file: ...invalid.cfg..., line: 1 - 'spam\n' - - - diff --git a/dev-python/nose/files/nose-1.3.1-pypy-test.patch b/dev-python/nose/files/nose-1.3.1-pypy-test.patch deleted file mode 100644 index 41ad4687c8a7..000000000000 --- a/dev-python/nose/files/nose-1.3.1-pypy-test.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff - -diff --git a/nose/util.py b/nose/util.py -index dcb5fef..e612696 100644 ---- a/nose/util.py -+++ b/nose/util.py -@@ -447,11 +447,10 @@ def try_run(obj, names): - if func is not None: - if type(obj) == types.ModuleType: - # py.test compatibility -- try: -- args, varargs, varkw, defaults = inspect.getargspec(func) -- if hasattr(func, '__call__') and ismethod(func.__call__): -- args.pop(0) -- except TypeError: -+ if isinstance(func, types.FunctionType): -+ args, varargs, varkw, defaults = \ -+ inspect.getargspec(func) -+ else: - # Not a function. If it's callable, call it anyway - if hasattr(func, '__call__'): - func = func.__call__ -diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py -index 2bd837c..cd9ba6e 100644 ---- a/unit_tests/test_utils.py -+++ b/unit_tests/test_utils.py -@@ -1,4 +1,5 @@ - import os -+import sys - import unittest - import nose - from nose import case -@@ -168,7 +169,7 @@ def __call__(self): - class Bar_m: - def __call__(self, mod): - pass -- -+ - foo = imp.new_module('foo') - foo.bar = bar - foo.bar_m = bar_m - diff --git a/dev-python/nose/files/nose-1.3.1-python3.4.patch b/dev-python/nose/files/nose-1.3.1-python3.4.patch deleted file mode 100644 index 2269f755c3f0..000000000000 --- a/dev-python/nose/files/nose-1.3.1-python3.4.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001 -From: John Szakmeister -Date: Sat, 15 Mar 2014 06:15:42 -0400 -Subject: [PATCH] Fix #783: try_run is broken with Python 3.4 - -It turns out that we expected inspect.getargspec() to only work on -functions (versus classes that are callable). Python 3.4 has changed -this behavior and now happily returns the arg spec. Let's try to detect -this situation by checking the __call__() method to if it's actually the -method of a class. If so, pop the 'self' argument off of args--similar -to what's done in the exceptional case below. ---- - CHANGELOG | 1 + - nose/util.py | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/nose/util.py b/nose/util.py -index 7995700..dcb5fef 100644 ---- a/nose/util.py -+++ b/nose/util.py -@@ -8,7 +8,7 @@ - import sys - import types - import unittest --from nose.pyversion import ClassType, TypeType, isgenerator -+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod - - - log = logging.getLogger('nose') -@@ -449,6 +449,8 @@ def try_run(obj, names): - # py.test compatibility - try: - args, varargs, varkw, defaults = inspect.getargspec(func) -+ if hasattr(func, '__call__') and ismethod(func.__call__): -+ args.pop(0) - except TypeError: - # Not a function. If it's callable, call it anyway - if hasattr(func, '__call__'): --- -1.8.5.5 - diff --git a/dev-python/nose/files/nose-1.3.1-version.patch b/dev-python/nose/files/nose-1.3.1-version.patch deleted file mode 100644 index 8f6edb5be2ef..000000000000 --- a/dev-python/nose/files/nose-1.3.1-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/nose-devs/nose/commit/43c35e49106916f51f676455888fe7a39d030113.diff -diff --git a/nose/pyversion.py b/nose/pyversion.py -index fba5ada..8b56614 100644 ---- a/nose/pyversion.py -+++ b/nose/pyversion.py -@@ -89,7 +89,8 @@ def __init__(self, cls, func): - self.__dict__ = func.__dict__.copy() - self._func = func - self.__self__ = UnboundSelf(cls) -- self.im_class = cls -+ if sys.version_info < (3, 0): -+ self.im_class = cls - - def address(self): - cls = self.__self__.cls - diff --git a/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch new file mode 100644 index 000000000000..8d2f2f05dc29 --- /dev/null +++ b/dev-python/nose/files/nose-1.3.7-python-3.5-backport.patch @@ -0,0 +1,54 @@ +From 8e7ad3d50012688ca029d126cbc88251831fea88 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Mon, 1 Feb 2016 00:05:30 +0300 +Subject: [PATCH 1/2] Set __qualname__ equal to __name__ on derived classes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To make output on Python ≥ 3.5 the same as on previous Python versions. + +This fixes #928. +--- + functional_tests/test_load_tests_from_test_case.py | 1 + + nose/util.py | 1 + + unit_tests/test_xunit.py | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py +index 42f8563..13d0c8a 100644 +--- a/functional_tests/test_load_tests_from_test_case.py ++++ b/functional_tests/test_load_tests_from_test_case.py +@@ -29,6 +29,7 @@ def setUp(self): + pass + def tearDown(self): + pass ++ Derived.__qualname__ = Derived.__name__ + # must use nose loader here because the default loader in 2.3 + # won't load tests from base classes + l = loader.TestLoader() +diff --git a/nose/util.py b/nose/util.py +index bfe1658..80ab1d4 100644 +--- a/nose/util.py ++++ b/nose/util.py +@@ -643,6 +643,7 @@ class C(cls): + pass + C.__module__ = module + C.__name__ = cls.__name__ ++ C.__qualname__ = cls.__name__ + return C + + +diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py +index 944d285..261436b 100644 +--- a/unit_tests/test_xunit.py ++++ b/unit_tests/test_xunit.py +@@ -16,6 +16,7 @@ def mktest(): + class TC(unittest.TestCase): + def runTest(self): + pass ++ TC.__qualname__ = TC.__name__ + test = TC() + return test + + diff --git a/dev-python/nose/nose-1.3.4.ebuild b/dev-python/nose/nose-1.3.4.ebuild deleted file mode 100644 index 6d77007c1557..000000000000 --- a/dev-python/nose/nose-1.3.4.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" -HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples test" - -RDEPEND="dev-python/coverage[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) - test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" - -python_prepare_all() { - # Tests need to be converted, and they don't respect BUILD_DIR. - use test && DISTUTILS_IN_SOURCE_BUILD=1 - - # Disable tests requiring network connection. - sed \ - -e "s/test_resolve/_&/g" \ - -e "s/test_raises_bad_return/_&/g" \ - -e "s/test_raises_twisted_error/_&/g" \ - -i unit_tests/test_twisted.py || die "sed failed" - # Disable versioning of nosetests script to avoid collision with - # versioning performed by the eclass. - sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ - -i setup.py || die "sed2 failed" - - # Prevent un-needed d'loading during doc build - sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - local add_targets=() - - if use test; then - add_targets+=( egg_info ) - python_is_python3 && add_targets+=( build_tests ) - fi - - distutils-r1_python_compile ${add_targets[@]} -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install --install-data "${EPREFIX}/usr/share" -} - -python_install_all() { - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all - - if use doc; then - dohtml -r -A txt doc/.build/html/. - fi -} diff --git a/dev-python/nose/nose-1.3.6.ebuild b/dev-python/nose/nose-1.3.6.ebuild deleted file mode 100644 index fe1725e007fe..000000000000 --- a/dev-python/nose/nose-1.3.6.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" -HOMEPAGE=" - https://pypi.python.org/pypi/nose - http://readthedocs.org/docs/nose/ - https://bitbucket.org/jpellerin/nose" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples test" - -RDEPEND=" - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) - test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" - -python_prepare_all() { - # Tests need to be converted, and they don't respect BUILD_DIR. - use test && DISTUTILS_IN_SOURCE_BUILD=1 - - # Disable tests requiring network connection. - sed \ - -e "s/test_resolve/_&/g" \ - -e "s/test_raises_bad_return/_&/g" \ - -e "s/test_raises_twisted_error/_&/g" \ - -i unit_tests/test_twisted.py || die "sed failed" - # Disable versioning of nosetests script to avoid collision with - # versioning performed by the eclass. - sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ - -i setup.py || die "sed2 failed" - - # Prevent un-needed d'loading during doc build - sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - local add_targets=() - - if use test; then - add_targets+=( egg_info ) - python_is_python3 && add_targets+=( build_tests ) - fi - - distutils-r1_python_compile ${add_targets[@]} -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install --install-data "${EPREFIX}/usr/share" -} - -python_install_all() { - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all - - if use doc; then - dohtml -r -A txt doc/.build/html/. - fi -} diff --git a/dev-python/nose/nose-1.3.7.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild similarity index 88% rename from dev-python/nose/nose-1.3.7.ebuild rename to dev-python/nose/nose-1.3.7-r1.ebuild index 26a7859c683e..4ef52e3ab072 100644 --- a/dev-python/nose/nose-1.3.7.ebuild +++ b/dev-python/nose/nose-1.3.7-r1.ebuild @@ -18,13 +18,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" REQUIRED_USE=" - doc? ( - || ( $(python_gen_useflags 'python2*') ) - )" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" RDEPEND=" dev-python/coverage[${PYTHON_USEDEP}] @@ -33,6 +31,8 @@ DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" +PATCHES=( "${FILESDIR}"/${P}-python-3.5-backport.patch ) + pkg_setup() { use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) } @@ -70,10 +70,7 @@ python_compile() { } python_compile_all() { - if use doc; then - python_setup 'python2*' - emake -C doc html - fi + use doc && emake -C doc html } python_test() { @@ -88,5 +85,4 @@ python_install_all() { use examples && local EXAMPLES=( examples/. ) use doc && HTML_DOCS=( doc/.build/html/. ) distutils-r1_python_install_all - } diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild index fa4b126cf843..67dd10344de9 100644 --- a/dev-python/nose/nose-9999.ebuild +++ b/dev-python/nose/nose-9999.ebuild @@ -2,46 +2,46 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -#if LIVE -EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git - https://github.com/nose-devs/${PN}.git" -inherit git-2 -#endif - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 eutils + +inherit distutils-r1 git-r3 DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring" -HOMEPAGE="https://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://github.com/nose-devs/nose" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +HOMEPAGE=" + https://pypi.python.org/pypi/nose + http://readthedocs.org/docs/nose/ + https://github.com/nose-devs/nose" +SRC_URI="" +EGIT_REPO_URI=" + git://github.com/nose-devs/${PN}.git + https://github.com/nose-devs/${PN}.git" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" IUSE="doc examples test" -RDEPEND="dev-python/coverage[${PYTHON_USEDEP}] +REQUIRED_USE=" + doc? ( || ( $(python_gen_useflags 'python2*') ) )" + +RDEPEND=" + dev-python/coverage[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-0.6 ) - test? ( dev-python/twisted-core )" + doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] ) + test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )" -#if LIVE -SRC_URI= -KEYWORDS= -#endif - -DOCS=( AUTHORS ) +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} python_prepare_all() { # Tests need to be converted, and they don't respect BUILD_DIR. use test && DISTUTILS_IN_SOURCE_BUILD=1 - # Disable sphinx.ext.intersphinx, requires network - epatch "${FILESDIR}/${PN}-0.11.0-disable_intersphinx.patch" # Disable tests requiring network connection. sed \ -e "s/test_resolve/_&/g" \ @@ -53,6 +53,9 @@ python_prepare_all() { sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \ -i setup.py || die "sed2 failed" + # Prevent un-needed d'loading during doc build + sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die + distutils-r1_python_prepare_all } @@ -61,7 +64,7 @@ python_compile() { if use test; then add_targets+=( egg_info ) - [[ ${EPYTHON} == python3* ]] && add_targets+=( build_tests ) + python_is_python3 && add_targets+=( build_tests ) fi distutils-r1_python_compile ${add_targets[@]} @@ -72,7 +75,7 @@ python_compile_all() { } python_test() { - "${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}" + "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}" } python_install() { @@ -80,10 +83,7 @@ python_install() { } python_install_all() { - local EXAMPLES=( examples/. ) + use examples && local EXAMPLES=( examples/. ) + use doc && HTML_DOCS=( doc/.build/html/. ) distutils-r1_python_install_all - - if use doc; then - dohtml -r -A txt doc/.build/html/. - fi } diff --git a/dev-python/pip/pip-8.0.2-r1.ebuild b/dev-python/pip/pip-8.0.2-r1.ebuild index f594034a97bf..d3773071f904 100644 --- a/dev-python/pip/pip-8.0.2-r1.ebuild +++ b/dev-python/pip/pip-8.0.2-r1.ebuild @@ -32,6 +32,7 @@ VENDOR_DEPEND=" >=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}] virtual/python-ipaddress[${PYTHON_USEDEP}] " +# https://github.com/pypa/pip/issues/3057 RDEPEND="${VENDOR_DEPEND} >=dev-python/setuptools-19.2[${PYTHON_USEDEP}] + + + + python@gentoo.org + Python + + + pluggy + + holger@merlinux.eu + Holger Krekel + + + diff --git a/dev-python/pluggy/pluggy-0.3.1.ebuild b/dev-python/pluggy/pluggy-0.3.1.ebuild new file mode 100644 index 000000000000..cb12139c23fc --- /dev/null +++ b/dev-python/pluggy/pluggy-0.3.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="plugin and hook calling mechanisms for python" +HOMEPAGE=" http://pypi.python.org/pypi/pluggy" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + )" + +python_test() { + py.test -v -v || die +} diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild index 108f080436ea..545cd1d65fdf 100644 --- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild +++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="doc examples" RDEPEND=" diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest index 68ed083e556f..561ccdacd6f6 100644 --- a/dev-python/pyrsistent/Manifest +++ b/dev-python/pyrsistent/Manifest @@ -1 +1,2 @@ DIST pyrsistent-0.11.10.tar.gz 62646 SHA256 db0469748e74f72b6142aa60bf9a5a15b4a080f47d9ed2fb7c6c083756264149 SHA512 cc0caf78b596e2cd9a5960be354a7ecae50a6f324295e1d882100e85208145735d5154a8b17eb297b99d48a6b1edb36cf8bdae781efef046f097f53af00f732b WHIRLPOOL d0ac9088c0afaec1672eb8b4e29c8b3f85f7bb064f360d54a21f0d70daa4ea9d37ab8f947bbba41a0695fc8a5e2f6e73c263748791952c3b32eb7134d2c8d74b +DIST pyrsistent-0.11.11.tar.gz 84016 SHA256 1ce499386a567c512eda3a180f14214e1a698d227e46ea2ef2566ba49e3e5d8f SHA512 7edced0fbe57ad57aaff7d04dec79ed317d938e8e7369ff0d77dea9b1b097de74c794e19cbcdbb0144800ff7f6f491069a7726168b349f584d85bf3b27901695 WHIRLPOOL 4f7f3d630d6f5646732bc082387f8fa048d429e1ba762c0ed43e98d6a15077771faf734ef027e26057134898bd060479526df687463d9201684f4fabef9f5302 diff --git a/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild new file mode 100644 index 000000000000..e84a53c8d1a4 --- /dev/null +++ b/dev-python/pyrsistent/pyrsistent-0.11.11.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Persistent/Functional/Immutable data structures" +HOMEPAGE="http://github.com/tobgu/pyrsistent/ http://pypi.python.org/pypi/pyrsistent" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +# https://github.com/tobgu/pyrsistent/issues/ +# fails +RESTRICT="test" + +python_test() { + export PYTHONPATH="${S}:${PYTHONPATH}" + py.test -v -v -x || die ${PYTHONPATH} +} diff --git a/dev-python/pysrt/metadata.xml b/dev-python/pysrt/metadata.xml index 6518363b6800..9950bf88affa 100644 --- a/dev-python/pysrt/metadata.xml +++ b/dev-python/pysrt/metadata.xml @@ -1,15 +1,17 @@ - - nikoli@gmx.us - - - proxy-maint@gentoo.org - Proxy Maintainers - - - pysrt - byroot/pysrt - + + sautier.louis@gmail.com + Louis Sautier + Proxied maintainer; set to assignee in all bugs + + + proxy-maint@gentoo.org + Proxy Maintainers + + + pysrt + byroot/pysrt + diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild index db90218b1c7f..effad92e2cb9 100644 --- a/dev-python/pysrt/pysrt-1.0.1.ebuild +++ b/dev-python/pysrt/pysrt-1.0.1.ebuild @@ -1,32 +1,31 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit distutils-r1 DESCRIPTION="Python library used to edit or create SubRip files" HOMEPAGE="https://github.com/byroot/pysrt https://pypi.python.org/pypi/pysrt" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +# pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42 +SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} +RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]" +DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[coverage(+),${PYTHON_USEDEP}] + ${RDEPEND} + ) " -# https://github.com/byroot/pysrt/issues/42 -RESTRICT="test" - python_test() { nosetests --with-coverage --cover-package=pysrt \ || die "Tests failed under ${EPYTHON}" diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild index 374a8c7f8ddc..52db6b6d427d 100644 --- a/dev-python/pysrt/pysrt-9999.ebuild +++ b/dev-python/pysrt/pysrt-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit distutils-r1 git-r3 @@ -16,12 +16,13 @@ SLOT="0" KEYWORDS="" IUSE="test" -RDEPEND=" - dev-python/chardet[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} +RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]" +DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[coverage(+),${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[coverage(+),${PYTHON_USEDEP}] + ${RDEPEND} + ) " python_test() { diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest index 6ea734d5dd12..eb6f00825c70 100644 --- a/dev-python/pytest-cov/Manifest +++ b/dev-python/pytest-cov/Manifest @@ -2,3 +2,4 @@ DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cb DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8 DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857 DIST pytest-cov-2.2.0.tar.gz 29965 SHA256 2231d43f07760d6904dadceabca53ab16ef95ba58fff393861b64c0cab96c9d1 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420 WHIRLPOOL 9feff5557af5f4101e9ae508febf3479472781544b54345d5f53f0f19df5f40eb5af4ada2b44037f590445761ee9d3bffe14d729c465f880951d714eeb6ae491 +DIST pytest-cov-2.2.1.tar.gz 33154 SHA256 a8b22e53e7f3b971454c35df99dffe21f4749f539491e935c55d3ff7e1b284fa SHA512 8f20cf1c42b4415c7decf8407582e64045c599aedf1970160d02e35e723f56fa095af26ee4390eabf2d32e209898b0a3dae8b7212ac81ecda64d6dbc7c83f790 WHIRLPOOL 92386bd1ff532e0c98f1dc01b3583315a626a030fb4f38e39eb4f8755e83f3901873fdcd406f9c8bc6393040fa198cc416dae5e176e88084ed6fb16264d3c056 diff --git a/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild new file mode 100644 index 000000000000..400333e78b54 --- /dev/null +++ b/dev-python/pytest-cov/pytest-cov-2.2.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="py.test plugin for coverage reporting" +HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-python/py-1.4.22[${PYTHON_USEDEP}] + >=dev-python/pytest-2.6.0[${PYTHON_USEDEP}] + >=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/process-tests[${PYTHON_USEDEP}] + || ( + >=dev-python/pytest-2.8.0[${PYTHON_USEDEP}] + dev-python/pytest-cache[${PYTHON_USEDEP}] + ) + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/pytest-capturelog[${PYTHON_USEDEP}] + )" + +# https://github.com/pytest-dev/pytest-cov/issues/99 +RESTRICT=test + +python_test() { + PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \ + PYTEST_PLUGINS=${PN/-/_} \ + py.test -v -v -x || die +} diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest index 2a22275319ee..c7adb6c94a22 100644 --- a/dev-python/pytest-xdist/Manifest +++ b/dev-python/pytest-xdist/Manifest @@ -1 +1,2 @@ DIST pytest-xdist-1.13.1.tar.gz 110007 SHA256 4382d7a944c1e2b1dc17fee3fd3575495fb10236a3b6e95cc6955db04984bc3c SHA512 3bb295c0afbcb0f238bdd41dfd1a395f0ba16b8151643aecc25aae13ac7c58d36d26ff4bab197673a9679d1f3436acd05b5ff50107b3128e647de892a6d04e3f WHIRLPOOL 643b23c755eb43c7b6965e588b58547c9ef63d3c225cddb97868c659ab3234bc6bc204575bc48c7f18a498cb0e595b8550928ba92ec5945a936e959f773504b3 +DIST pytest-xdist-1.14.zip 106585 SHA256 4a5e1199122fa29e3017d8d189f59ccc5d82e841474ba2a1eec0e89606153623 SHA512 4cafae77736da6880e8dd42aaa91f68bbc959ff7dabcd231018b144b54f96ccf1b11abb09474e260876bbdf731053005fdbd348ac87461f303d8f8f7af643e36 WHIRLPOOL 7d1f57a6d5cbf08661254f3f47d72c3cfbe931f14985c4b24abb627bd10fdc3f2fa21d05085766c0ed425e74713f991b53bdde957bd64ea4f64a206c2f4feffc diff --git a/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild new file mode 100644 index 000000000000..388850b51ee6 --- /dev/null +++ b/dev-python/pytest-xdist/pytest-xdist-1.14.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Distributed testing and loop-on-failing modes" +HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist2" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=dev-python/execnet-1.1[${PYTHON_USEDEP}] + >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] + >=dev-python/py-1.4.22[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + " + +python_test() { + find -name __pycache__ -exec rm -r '{}' + || die + py.test -vv -x || die +} diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest new file mode 100644 index 000000000000..5b8a5c1d0062 --- /dev/null +++ b/dev-python/python-gammu/Manifest @@ -0,0 +1 @@ +DIST python-gammu-2.5.tar.gz 133090 SHA256 871e3450a26397d555c92926382edf0e6a58431fe53613563f5a313ad752ff88 SHA512 e61bb340546cf3f98c20ff5d4ef25ca05676b4dea91e02aeee2856f091ac12fbf07a597637f9562432e298bf9678ff4445d24d8cdf96274b735aa9754b364e58 WHIRLPOOL f2ec5af883de298d71f220eb319c9df8d496328db461ba9e501e4d4d7ce150bbf19f5a07a7560804e46b21e1d848244e932f9b8eb15a60b6cf5d9a86892e45bd diff --git a/dev-python/python-gammu/metadata.xml b/dev-python/python-gammu/metadata.xml new file mode 100644 index 000000000000..d72e9d88d534 --- /dev/null +++ b/dev-python/python-gammu/metadata.xml @@ -0,0 +1,20 @@ + + + + + Python bindings for Gammu + + + python-gammu + gammu/python-gammu + + + awilfox.gentoo@foxkit.us + Andrew Wilcox + Proxy (user) maintainer, bugs to be assigned to him + + + proxy-maint@gentoo.org + Proxy Maintainers + + diff --git a/dev-python/python-gammu/python-gammu-2.5.ebuild b/dev-python/python-gammu/python-gammu-2.5.ebuild new file mode 100644 index 000000000000..a2c12798d619 --- /dev/null +++ b/dev-python/python-gammu/python-gammu-2.5.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit distutils-r1 + +DESCRIPTION="Python bindings for Gammu" +HOMEPAGE="http://wammu.eu/python-gammu/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples test" + +RDEPEND=">=app-mobilephone/gammu-1.34.0" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( + $(python_gen_impl_dep sqlite) + app-mobilephone/gammu[dbi] + )" + +DOCS=( AUTHORS NEWS.rst README.rst ) + +python_test() { + esetup.py test +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild index 1991b75d7dd2..092997513029 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.13.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbr SRC_URI="https://github.com/andialbrecht/sqlparse/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" LICENSE="BSD-2" IUSE="doc examples test" diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest index dc08500f4369..4245b2e53361 100644 --- a/dev-python/responses/Manifest +++ b/dev-python/responses/Manifest @@ -1,2 +1 @@ -DIST responses-0.4.0.tar.gz 11032 SHA256 de01ff1d9fc3a00b7e440152994d320fc8c8dcee48de287a9c31725d50bfef68 SHA512 341e3a571971e940ce164f320d25df8e6fc8b5377670da89c20b6b8a72394aba8a298c00ce466fd84440b4019e15c463c5919b94661d327251f467b2590e27f7 WHIRLPOOL 5c8db7970b0992405a40704862498f4cbe051bcc4458474766215b172dd9d0f878eef7a7c6ff9188ae02e23b83e145afb12407e5ced82bb393e3300c9148833f -DIST responses-0.5.0.tar.gz 11608 SHA256 8030adfab21fef85cb2a66c8cf6a2dcdd2d7002a7e5cb3a9537ba1a1ef6ce938 SHA512 d4044e20da21401cd2a586da3e3cf4519436707c062ed5e342f5c312db49b53937e56e1888172400d2dca2284c3fe0fd1e3e7d30ce16522e44303c32b0ee866d WHIRLPOOL 9034e78fdbfeff0bd20b48c883d51b047e7ed4373b5ab8477938a1fa72404f6bc758444d582da55db83f94bd2ef3484ab1e5b3753086a93d2afda34b9cb89df3 +DIST responses-0.5.1.tar.gz 11697 SHA256 6d4c96cadbd2528ac4a9451ccf1bfe33c83fd6a8281bfd89656bdbaa0a8cceff SHA512 bd3dcd0cb97d46519371fbda11b42f2dae6c12e2492e6872f29cab31d5cc3942388d0d1d1d400ddd07bf810951edb75ee20f144b24750a3103a0d0d9ba2f78eb WHIRLPOOL fa5304b87e17fbe74ce532a4795132f0b311c9bd8ef5fd5c5d870ea1770afe4b8f69d9780bccf171dcf46f944f8cea12befc479b176274e1df472c672a7bce1f diff --git a/dev-python/responses/responses-0.5.0.ebuild b/dev-python/responses/responses-0.5.0.ebuild deleted file mode 100644 index 2bf61beca4ae..000000000000 --- a/dev-python/responses/responses-0.5.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=(python{2_7,3_4}) - -inherit distutils-r1 - -DESCRIPTION="A utility for mocking out the Python Requests library" -HOMEPAGE="https://github.com/getsentry/responses" -SRC_URI="https://github.com/getsentry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}] - dev-python/cookies[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" - -DEPEND="test? ( ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}]" - -python_test() { - py.test || die -} diff --git a/dev-python/responses/responses-0.4.0.ebuild b/dev-python/responses/responses-0.5.1.ebuild similarity index 94% rename from dev-python/responses/responses-0.4.0.ebuild rename to dev-python/responses/responses-0.5.1.ebuild index 2bf61beca4ae..8653f2637d29 100644 --- a/dev-python/responses/responses-0.4.0.ebuild +++ b/dev-python/responses/responses-0.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest index 8f2eacdbadeb..b5e94025c29e 100644 --- a/dev-python/rpy/Manifest +++ b/dev-python/rpy/Manifest @@ -5,3 +5,4 @@ DIST rpy2-2.7.4.tar.gz 177030 SHA256 478f40c6775cc04188818d0410cd8340d900bd782ab DIST rpy2-2.7.5.tar.gz 177407 SHA256 0d88f7fff21fbef523c8678ed8f850a36052edca4ce702c62f234fdcb52de441 SHA512 132618c42688302145f3df17b2153a40e57a9e3ada0b98c97091349794fcf79c03738dadcde5f3553bb915f6bec5a91812484e7886ce9d61033daab0ad5e62d8 WHIRLPOOL e8f8104add0b2e3ba1f5b0423c39e10c912252b9ba5f47b1fd572f3b3533a224fc689dc247a1c78c7ad2899983e5f494c5477c40f704fbbcb268d75d956275c7 DIST rpy2-2.7.6.tar.gz 177562 SHA256 ea35a2f37fd36e8af069731bf1421fbb2d3f8550bcb55fde3bebf0bcb1b00a5a SHA512 03c1f62aa367049815504ecea8bb3ff82dee779167ab59eea148e8d631e50151d4ce1805327ddf3b06821a767aab162c613a32d73e814a832d79158b455aab9c WHIRLPOOL 2df3db91e8a8132dbf25703fbb60aa7f17eb63faa56101c5e1697e9a37a21b7545629382643ac5d9420a9953c4d41ef2dc196dd50547d4d1119ec08fb5e0262e DIST rpy2-2.7.7.tar.gz 178098 SHA256 bf17d49c83f856a9ca537a7746c5e5edced23c3a181b89b61cb959a5db90339f SHA512 66bb901150d256a2373aa52a4d05bd5cb93acf58e3f21cd55bf5d0f8f204953898b6dc5ebffa26e06b9ab76982a1cc31f0011b8520a059b071033f54e0b8836b WHIRLPOOL 1621345954c54b7250a93ec8fb1ca1ce110d6d9e4391ca023436eef1a70c69b4cdee0a8b01982706e4b6daba5f0fc74770b0ac4517642fb6c4d4ed148ef4eb97 +DIST rpy2-2.7.8.tar.gz 178334 SHA256 4f51bcdddea01a63e624f4b38de4f6b10a2466d82fd7e890791a07b06e51781d SHA512 adbc83c8003963219038b541e0b5d1736eb515fda77e277462e87cd1dfdc39b225bb73a659f62dc7fb1d7678a415047153fa4861328dc0ecf8ba450b3748150e WHIRLPOOL 4c1ffcbd88875223d80f1b078dbf1d8c59b85765b8b106a577d00f0d219560dbba6f5d2b7b66ac59434791781c0b1665c5bbee19f402fa4e1a0fdaa6b4db3852 diff --git a/dev-python/rpy/rpy-2.7.8.ebuild b/dev-python/rpy/rpy-2.7.8.ebuild new file mode 100644 index 000000000000..6c31dd1bfe17 --- /dev/null +++ b/dev-python/rpy/rpy-2.7.8.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) +PYTHON_REQ_USE="sqlite" + +inherit distutils-r1 flag-o-matic + +MYSLOT=2 +MY_PN=${PN}${MYSLOT} +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the R Programming Language" +HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-lang/R-3.1 + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pandas-0.13.1[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + virtual/python-singledispatch[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" +PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" + +# ggplot2 is an optional test dep but not in portage +S="${WORKDIR}/${MY_P}" + +# Tarball absent of doc files in doc folder +# https://bitbucket.org/rpy2/rpy2/issues/229 + +python_compile() { + if ! python_is_python3; then + local CFLAGS=${CFLAGS} + append-cflags -fno-strict-aliasing + fi + distutils-r1_python_compile +} + +python_test() { + cd "${BUILD_DIR}"/lib || die + ${PYTHON} -m 'rpy2.tests' || die +} diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 3c92f0d9c5c6..7622db787a93 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -9,4 +9,6 @@ DIST setuptools-19.1.1.tar.gz 640997 SHA256 32ebb08b72aee11fefa6907ddf5db5a81e0e DIST setuptools-19.2.tar.gz 641777 SHA256 f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a SHA512 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126 WHIRLPOOL ee861dc97a48ec7a07eadc3ceb42077b396a14c1448f0c3d8c6edf2266f4da241bb0e9f31922bc687b6e943802b95b440aea9f2e5d60b8d338c8392102353100 DIST setuptools-19.4.tar.gz 641797 SHA256 214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf SHA512 463a2b00193b972e684569dce1527b34d7be9a9d0f866fd8a0c2c1a475558c539148841ca117b0a9c5507d8344dfd5ca515bc6beee59b44c6e8bf05771bc448a WHIRLPOOL 37bdb6592e63c8594051ddfa1df4295dc3417e29b338f66a44270619bf30c6e87b12a7086a8f337f3497bd036cbacc10ab2f179c2768af685b6ee5d93a747897 DIST setuptools-19.6.1.tar.gz 637780 SHA256 d7fd89a4bbd89ea51aaf18100b50411cc881866f3456f11a8732f1c957f3d7da SHA512 542c41aafdeca3e7658650dfb1c2f5209eb89ae17586cddf1a57316b987507c1263648c93d4177d8d1f775c0ce60c0849b9f4639e395b364ddfe4d92f019be0c WHIRLPOOL 597ed23c4fed9e61f3e8dadfe405fc0cb6be8ccc34c38b3933f69da08452ac53c2ce9e743555544209dd7e55a57fd327bcd7060eb6d0367f869288945dda1a96 +DIST setuptools-19.6.2.tar.gz 641373 SHA256 69261eefdb21057cfbe92ba8032b923d6363d6682967d42cf46388090d0f1a15 SHA512 c00ef832fd4d1514e440c36d90691e48aa179b14d24021dd7a0149dbb0ae8efb801327025a7e1911a29cef63eec7c5cbadfa78c832beb316b8a4391b4ff053fe WHIRLPOOL 3cbc2a1c29050a86a323a0271f4e17adda0df2f99620e54fdaf9038ca9f4e1bb0801fdd309be274c655aaf6fb7c6c77b4babb5cd721c09d9e6904235077b3736 DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405 +DIST setuptools-19.7.tar.gz 641634 SHA256 9e0783f3e6b736530a84980dce99fb0f01dafcd31b3f600cde2aa446f6f77cc0 SHA512 fe74b10eb1afef5d78cc5cd4d6dbd53ed16f975c693c138181dfb1661276255d214037eb036186d0cdc9dd31d636f9f1067d67bf591542e8ef933afca267ee4c WHIRLPOOL e1ee325d3de9a6b0dfd49fc68129271faeaccf5ffb77a750f553986fc47b75a5003c17a3f00d76be15eb3808d04e7060f5ccddb9ca9c804fbb68ad54c01453f4 diff --git a/dev-python/setuptools/setuptools-19.6.2.ebuild b/dev-python/setuptools/setuptools-19.6.2.ebuild new file mode 100644 index 000000000000..300425331f6d --- /dev/null +++ b/dev-python/setuptools/setuptools-19.6.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=" + >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-python/setuptools/setuptools-19.7.ebuild b/dev-python/setuptools/setuptools-19.7.ebuild new file mode 100644 index 000000000000..300425331f6d --- /dev/null +++ b/dev-python/setuptools/setuptools-19.7.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND=" + >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest index 2110d77f73c3..35beaa90a510 100644 --- a/dev-python/tox/Manifest +++ b/dev-python/tox/Manifest @@ -2,3 +2,4 @@ DIST tox-1.8.0.tar.gz 89667 SHA256 4583b8340279d8cf080082550f7a5f14ba838bed3b217 DIST tox-1.8.1.tar.gz 90120 SHA256 44ca1e038cb57fe40ac0dff8b67b258efe05517bf9b4b4b07035f8be830aac01 SHA512 eb669c62e1943462513d66760e6275458e448552ec18a79776bceddeb686deea62280913dfe3d338809b8622dbc3fff24321f68ec6263e447ddf5099a36047bc WHIRLPOOL 240f8ab6df2bce1febb828058b2ba204ba5d48de17ccfa457e66392a9c3c49444439b5cda69e34c94e464f4bab91634104b0f935e5ac465528a2d9cfb7c14d80 DIST tox-1.9.0.tar.gz 92574 SHA256 817ad1eaeb6b46e68b322d9ff41244be3c15315833df5762216ffe3629a21219 SHA512 71e36b7524662bc751e7260e8a589d73c1a6070e17ca5b51fb8831ad5ea54cff5404b37fb7ff8db9d62a98f496a24b3fb41d93cde9ff723b91ed931760274384 WHIRLPOOL fa4fb9f72261498c56e6489e96aab19e6d1f7418b1b487378230f62851911279afe32c9cef672c05643de1bbac5bc069437cfc53e65aeaff118e1418b91d3e96 DIST tox-1.9.2.tar.gz 93029 SHA256 3125a15da7381f59f835a25bd259a84acb7a69858c81e386c50027bd842bb91b SHA512 a6521300825ac8b11576a224748aedefb183890bd7e3586c0c7340761e00778d20cff9cb4140ec452e62de5c2d6fc0c014b17bd45a43e45ac6a83e2394ef72b4 WHIRLPOOL 659ac6878fc845f3979d69b7d5a4d9bbd16716bb43dd5a41ac5f603d5172bef475f1da98eb806da0b16df62dd86ea03e978045bab62ccdec563261a34fbdc1a8 +DIST tox-2.3.1.tar.gz 106447 SHA256 bf7fcc140863820700d3ccd65b33820ba747b61c5fe4e2b91bb8c64cb21a47ee SHA512 0a3565dd015a0455041769ba979aefe3395d571d7aa0bd26a199cdfda420c273bff0232475a33f9e9c4679355f68ca61f2486abd6c94673d569790ab415211d3 WHIRLPOOL d37d3f939e5b0ff6d8b9ed06976a7cf6c4ce90d640bee5cd668f87755bd2be8047b0c260a48b3d8e74dfc0aefe8d6962453c573b37f4ba2f6be9820d2fd78819 diff --git a/dev-python/tox/tox-2.3.1.ebuild b/dev-python/tox/tox-2.3.1.ebuild new file mode 100644 index 000000000000..c75ae1fcc164 --- /dev/null +++ b/dev-python/tox/tox-2.3.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy ) + +inherit distutils-r1 + +DESCRIPTION="virtualenv-based automation of test activities" +HOMEPAGE="http://tox.testrun.org https://pypi.python.org/pypi/tox" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc ~ppc64" +IUSE="doc test" + +RDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}] + dev-python/pluggy[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/py-1.4.17[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )" + +python_prepare_all() { + # Take out failing tests known to pass when run manually + # # Run from ebuild interferes in subtle & mysterious ways, inducing these erroroneous fails + sed \ + -e 's:test_package_install_fails:_&:' \ + -e 's:test_different_config_cwd:_&:' \ + -e 's:test_develop:_&:' \ + -e 's:test_usedevelop:_&:' \ + -e 's:test_usedevelop_mixed:_&:' \ + -e 's:test__test_usedevelop:_&:' \ + -e 's:test_env_VIRTUALENV_PYTHON:_&:' \ + -i tests/test_z_cmdline.py || die + + if use doc; then + local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) + local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" + local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" + local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" + sed \ + -e "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" \ + -i doc/conf.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + py.test -v -v tests || die "Testsuite failed under ${EPYTHON}" +} + +python_install_all() { + use doc && HTML_DOCS=( "${S}"/doc/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index 40a811ebc28f..74ac82f93ae5 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -1,3 +1,4 @@ DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161 DIST virtualenv-14.0.1.tar.gz 1794063 SHA256 66778f6d27b3864644b923fdbac69d012281821c0c90d2e928a319e9eeef2830 SHA512 594fd00d99808dcc6da573b5b60ffe397bda229517351410aed4342935afcf0ce8d660ef8209fd8a19dd7d880c1afdb7caeb12c638dce80d01b623caa4b5c0fc WHIRLPOOL 1ce84d2d78953897f4fdeea9268849c21da7ca1e25b05b17efa7262a9557c1b89739f81566d7a3f96292837fbd998cce3052954c6acfe3ac1071d0179d57c6b6 DIST virtualenv-14.0.3.tar.gz 1794400 SHA256 9b67a5b78f8d8bac1f5221d19b912023574aaa2376d1b2ce4cc3ade9fe04b43e SHA512 b6de36e0aa009c5841589ebfc35f56f4ee46cfbe3f1f48bb79fdec04558bc6655e8a7b97fbb98077f0992fc17f7293539af36865c3b1e965f00e820a33ba93f8 WHIRLPOOL 5670100c1656105cb0e3244bf8634d96a2b63fb2063f5c14199ca8dee09f0923386f5825966ff2f4b2edf59ff14b63f8122459b8d666f76a83fa732acce85639 +DIST virtualenv-14.0.5.tar.gz 1794654 SHA256 14b6148911f82d38bd3c7adcd1a16d54a1eca4d27d92ba11d06acf67f7566c71 SHA512 52ea2dcfc1b830aaf3c651f87b4e74dbba9b6ee1a93e641fbbb2ca10484044aece8aead9a12184115aa7f533233c790b65ffd40405f60e4dcef1d15a4786075b WHIRLPOOL f23cf8f9c6fc21c130e0dcb5f71f9430ac4dd167b73db9676ce37bbed7fcece1e61a09b0882737fb1e855b1910e2037f32bd59ba38445a3be6a2dfacddeb4af8 diff --git a/dev-python/virtualenv/virtualenv-14.0.5.ebuild b/dev-python/virtualenv/virtualenv-14.0.5.ebuild new file mode 100644 index 000000000000..077b94d4c720 --- /dev/null +++ b/dev-python/virtualenv/virtualenv-14.0.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Virtual Python Environment builder" +HOMEPAGE=" + http://www.virtualenv.org/ + https://pypi.python.org/pypi/virtualenv + https://github.com/pypa/virtualenv/ +" +SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="doc test" + +RDEPEND="" +DEPEND="${RDEPEND} + >=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +DOCS=( docs/index.rst docs/changes.rst ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch + "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch +) + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + py.test -v -v || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest index 80825cad1edd..ea6ba33464c7 100644 --- a/dev-python/virtualenvwrapper/Manifest +++ b/dev-python/virtualenvwrapper/Manifest @@ -2,3 +2,4 @@ DIST virtualenvwrapper-4.3.1.tar.gz 86086 SHA256 e6228aea4e76ba6a628455313eff4a6 DIST virtualenvwrapper-4.3.2.tar.gz 86495 SHA256 ee545ade2e6bc5433284388afde6ec6417a4d819ba7b0d65d0ce8c4d3fcc11fd SHA512 91d93739be1b378c15ea57a325f891762d6b4afcff84b7f4a4401d0090afeef45991ae3339fc6c99a793963f17bef4457715482a1e8f62186dcaf440120093b3 WHIRLPOOL 9889d6c9ab171ace506962df7e294e688749202f94a723b91bfce8ebc751d614ad3ebfe2b58669b5a585ef248de03d727302d5609ea93c54dddcc3a33a82665e DIST virtualenvwrapper-4.5.1.tar.gz 89268 SHA256 ac0b09ce7409ec9d5b8ec90d073641b86bbafc3161f844347b89cc25b2e3a3d9 SHA512 de925da1cf0ec8d25a55c2cc430ea0a2840eaf5e53f0395d925c13c12601db394aeb0b14a15b16b47f4673214ce726df1572e87a28f96d6a6ccc13b3fe43b966 WHIRLPOOL 6773359ae6a9608b7b0fc76db9f9640a66d78d72e7fb0e7f377eb1e8daece862cfc48685050832b79c0153a207517cead7b2ecef716d95f4e7137da802f59620 DIST virtualenvwrapper-4.6.0.tar.gz 89516 SHA256 f3c73c3a5436f4d040505e5fb45401abdc4be267a80fa071878cfaa685e685e1 SHA512 a7f64a7ae3aad6038b12c3bfca976772fa6a36c3420194f88b87fdd5eb80b036d331ef35b60c8ffaa4b152eaefeddf161283c9f79cf7dbbc8a5f806bdeed51a2 WHIRLPOOL 7eb764171f2ec40e02e9b383f23c1d4d22c12c15d5df65e6022251b5b96ab9fe09273f62d073e10eb54b6998ad92b3c2127504a6d03672ab90184973c853fd24 +DIST virtualenvwrapper-4.7.1.tar.gz 89930 SHA256 3bf73ede42a689adeedc8ac85662cb539665d3d029459bc8d3e6835ecd81ffde SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd WHIRLPOOL c56cab31ec89b8dd5bfeb7949f72b2d5c5e6f40543bc7fa960b03edcc9d3c2ec095335eecf0b40adcc0fd1c92efc1e760748db772a3da0c44591ed7de5248880 diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.1.ebuild index c31d36f3f489..05a6fb17417b 100644 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.1.ebuild +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit distutils-r1 -DESCRIPTION="virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv tool" +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.2.ebuild index b2b20ee9a164..a1d82eac0bb7 100644 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.2.ebuild +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit distutils-r1 -DESCRIPTION="virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv tool" +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.5.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.5.1.ebuild index b2b20ee9a164..a1d82eac0bb7 100644 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.5.1.ebuild +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit distutils-r1 -DESCRIPTION="virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv tool" +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.6.0.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.6.0.ebuild index b2b20ee9a164..a1d82eac0bb7 100644 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.6.0.ebuild +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit distutils-r1 -DESCRIPTION="virtualenvwrapper is a set of extensions to Ian Bicking's virtualenv tool" +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper https://pypi.python.org/pypi/virtualenvwrapper" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild new file mode 100644 index 000000000000..a0cc30d34d43 --- /dev/null +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4}} ) + +inherit distutils-r1 + +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" +HOMEPAGE=" + http://www.doughellmann.com/projects/virtualenvwrapper + https://pypi.python.org/pypi/virtualenvwrapper" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +# testsuite doesn't work out of the box. Demand of a virtualenv outstrips setup by the eclass +RESTRICT=test + +RDEPEND=" + dev-python/virtualenv[${PYTHON_USEDEP}] + >=dev-python/stevedore-0.15-r1[${PYTHON_USEDEP}] + dev-python/virtualenv-clone[${PYTHON_USEDEP}]" +DEPEND="${DEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/pbr[${PYTHON_USEDEP}]" + +# Keep just in case +src_prepare() { + sed -e 's:-o shwordsplit::' -i tests/run_tests || die +} + +python_test() { + bash ./tests/run_tests || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest index 53cdb8d3be7b..7fe7f25960e5 100644 --- a/dev-python/webob/Manifest +++ b/dev-python/webob/Manifest @@ -2,3 +2,4 @@ DIST WebOb-1.4.1.tar.gz 671495 SHA256 12f8b98390befc47336d2c0e5bad9cc48609d808ea DIST WebOb-1.4.tar.gz 633302 SHA256 0819838204e2a6823e42bf2227898fdf3f306f7619bf328e25855a0d1ca20399 SHA512 0cf1a21b7d863c355e445f0e9f898ffb1c4c39099532a86d830c1be5d84efc0c6f3e8151a283cfd1cb5bebcb1fe78a2b6b269cbc130863679a017565a2539a37 WHIRLPOOL abfc696b7f50a74edd3d84099365f802f5be0eddf56a1c128f6e026c30bdeddc1b58c6bb45d4281ee4fb3d7937888d8065b01f93a363c82cd9cd1834eb2378da DIST WebOb-1.5.0.tar.gz 186394 SHA256 8e90cca008c0189fe64d06281d50d9510c1dde4147bdf4bc81b666020ce31350 SHA512 4d5a4f58eb3f96d4b563c0a8d8387f30ad323d11c3a913ba69504685e7baa870f232d55e6d8b403e3f6b2153c3c7f37a694618bf0e85d04115c240c5fa2b93b6 WHIRLPOOL f3f6975f84bc64fe941fd3d3c5cd065cfea8e59b2f0481e31c7bf5145934d038420ccb93df918e5e729607ee75bb77d3a8142c4ff4ac60b2be14212061a1fa3a DIST WebOb-1.5.1.tar.gz 202821 SHA256 d8a9a153577f74b275dfd441ee2de4910eb2c1228d94186285684327e3877009 SHA512 aba45ff622a572a3bda7cf33ce5988745b3831aea2ed7f0502688055f96c16cf5de828039439218611034ad49dea4e4a9c2ec43b8dbc97be61b7abc33a15589c WHIRLPOOL 814e11b257f82a48f9ed8ff1e1ecb37ab0648c7f67446aa57094da671f0265fadd7b04e9e69ed1ecbfbbc1925804ef7f563f8079b82bea04d8a06853482960b7 +DIST WebOb-1.6.0a0.tar.gz 203676 SHA256 fe6bc77ace5ec879152ac47b9c4b357b7c788264adbff1fe6bf8a0824272af91 SHA512 0cf15757e237c66f6b92fd5fbb61ce9b02a0ac56708d7d8eeb99cb2e042b6203a60fd0a5894c129c1830930c7d5faeb2374fe785ee7b889a29e473fa37c97b22 WHIRLPOOL 2daf1ae4a561ac4031e05b936a7db960711473c44ebfddee509a4c7ebd9c5acde6098ac8c745006b39d5394d3bba7b124e80723638f9fc70e1de2734550b007b diff --git a/dev-python/webob/webob-1.6.0_alpha0.ebuild b/dev-python/webob/webob-1.6.0_alpha0.ebuild new file mode 100644 index 000000000000..d6810961dc81 --- /dev/null +++ b/dev-python/webob/webob-1.6.0_alpha0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) + +inherit distutils-r1 versionator + +MY_PN=WebOb +MY_P=${MY_PN}-${PV//_alpha/a} + +DESCRIPTION="WSGI request and response object" +HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="doc test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] )" +RDEPEND="" + +S=${WORKDIR}/${MY_P} + +python_compile_all() { + if use doc; then + "${PYTHON}" setup.py build_sphinx || die + fi +} + +python_test() { + nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest index e5fa61b2c61a..fb49484a5a1c 100644 --- a/dev-ruby/capybara/Manifest +++ b/dev-ruby/capybara/Manifest @@ -1,3 +1,4 @@ DIST capybara-1.1.4.gem 72192 SHA256 33073d7e4920a3e74c61ec46d1afe655eb0f3361187113c5e146df498e4611ed SHA512 102738031281d0fabd645fa6d941cf0a9ddd56f90d53d7cc1c8a7b03a37b6af8f4cddd178e6fc07d6751a539a5039cf20502eabdd49e8001793601bb312b47a3 WHIRLPOOL 81eff318acfdc0806c9f8d4e212068edd57694d44db1e29bbefaa7a4db162f3a2354374d6ab97ad7c2372ff9e6f6bb864ed483050facad5c298c2223a39c63cc DIST capybara-2.5.0.gem 240640 SHA256 755c32b0ba828b2671ca63605cce4e4c3b494b16e91bf4f99e445975488ebc61 SHA512 30431cc78c16a26f850ef1a1d60af4c9934ce89ffa3ed9c305af903640a66dc78e831614c22ed7725bf23d70e5de6b50b6c1d23cc3e33c815e73a2f1117dc13c WHIRLPOOL cb1dded65c7a789a46df0a86fbaf1f3104a4ece86133b8003c8c6ac18b8d6ed4d86f50310fe7d5a4d523393258c9bbf636c088d00f2a9d8f751390ed08d02bca DIST capybara-2.6.0.gem 220160 SHA256 a34de24ef02b2cd42367f580a8b005e3793fb0a6a53a71d7d8c267ec1a1472fc SHA512 d7b2006565bb3118f5c16d2bf50aa833f56bd862b00b3dc483d09e1f1474f5882b3121d69ae0699c90f950589b8d673f384e20b93f1eee663dbfd76801ce2993 WHIRLPOOL d9da6ec338df9d2eda4019df877f66d68329a8027f00331f5f2fab6f9ffd051c0ada0843dcf27d93843f818619367a220092dfea47708a4c2e1dfc8b51690c2a +DIST capybara-2.6.2.gem 220160 SHA256 dc03b0065090b6f7a41fc242d15f06ea5bc97337620fa8fbd2a541ce8b3ac752 SHA512 a50de9bf3e09270a8ad4739326ecb938901e098caa7610cb5daa3df7d79753dcbe77beca60237d3a0536e0e6518af517dc6d96e9fea37d19ceb89a6f6905969d WHIRLPOOL 509b8963f5ea7808f4ebf1c24a34bcfa8b27374f900d63a2c07a44367e48e2208e30477f92e058d2b8724ce063c8f03b76046303a98d9325ce03d5405400b40f diff --git a/dev-ruby/capybara/capybara-2.6.2.ebuild b/dev-ruby/capybara/capybara-2.6.2.ebuild new file mode 100644 index 000000000000..29d850aca7ec --- /dev/null +++ b/dev-ruby/capybara/capybara-2.6.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_EXTRADOC="History.md README.md" + +# Rake tasks are not distributed in the gem. +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_TASK_TEST="" + +inherit virtualx ruby-fakegem + +DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications" +HOMEPAGE="https://github.com/jnicklas/capybara" +LICENSE="MIT" + +KEYWORDS="~amd64 ~x86" +SLOT="2" +IUSE="test" + +DEPEND="${DEPEND} test? ( www-client/firefox )" + +ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 )" + +ruby_add_rdepend " + dev-ruby/addressable + >=dev-ruby/mime-types-1.16:* + >=dev-ruby/nokogiri-1.3.3 + >=dev-ruby/rack-1.0.0:* + >=dev-ruby/rack-test-0.5.4 + >=dev-ruby/xpath-2.0.0:2" + +all_ruby_prepare() { + sed -i -e '/bundler/d' -e '/pry/d' spec/spec_helper.rb || die + + # Avoid window-manager specific tests (sizes are specific for fluxbox) + sed -i -e '/#maximize/,/^ end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die +} + +each_ruby_test() { + VIRTUALX_COMMAND=${RUBY} + virtualmake -Ilib -S rspec-3 spec || die "Tests failed." +} diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest index dd14fe15dfdb..19918bc02ada 100644 --- a/dev-ruby/ffaker/Manifest +++ b/dev-ruby/ffaker/Manifest @@ -1,3 +1 @@ -DIST ffaker-1.32.1.gem 227840 SHA256 8b0c364a4cc0c64191b552b259ba3b311c864fd062a582eba87d3e67b35b5c9c SHA512 ce37f2e36b73a4d9509407c047c2801d8490ddee8d4357d658cccb3e671da6360d5f662f30d740d48f234e8d5309d3f521e634d7fdf1778481ea4637d856be77 WHIRLPOOL c0c996600b7566f22dacce92fe927e579a72b6a965068aa6b1cdddbf7e4333988e35cdc903d7ab0bdbeb57e233236c86687f7b0ae183b12098aeb1035bf78025 -DIST ffaker-2.0.0.gem 228352 SHA256 c0566e3d2daa66ff2e39002dc9a480aa512f283828cf0dc3f25a1dc4f55ad6a5 SHA512 032b01f5aff4198f4415c6a623667f0a0e687ab56375bf143c6ea1b925f6e34ed007cae0e346e54d92d29750b6b7833344fbbaefa3fcef84e4783ab6ed8636b0 WHIRLPOOL bdb94017c9c507833018fa52ab96fac658e367a2ed5e9dc4fd116a369a8e564d80b60a625968b8fdc6acfc2b0c32fcd4005a22dddc8d165c88ff8862b9531532 DIST ffaker-2.1.0.gem 275456 SHA256 ee758a8c495df5d3544bac295bff9a2158fcd70cbc67fb3de648ecf10ff0c9e8 SHA512 d847c0376eb0b23d5fe7a29b1bff154a98cca81c17971178360407bea361c25ec54fc5517e555713ebb50f9410a75ceca10c8c6e9998ff6482aed7969596df4b WHIRLPOOL af2162ea6ddde17a40363c24da849184a57c6052454813bda988a8ee4398f8d42785a5c3771e6cb4fce95d6bbb403189fd403bee29ce641160e394ca75e1442c diff --git a/dev-ruby/ffaker/ffaker-1.32.1.ebuild b/dev-ruby/ffaker/ffaker-1.32.1.ebuild deleted file mode 100644 index eb937831d964..000000000000 --- a/dev-ruby/ffaker/ffaker-1.32.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" -RUBY_FAKEGEM_RECIPE_DOC="yard" - -inherit ruby-fakegem - -DESCRIPTION="Faster Faker, generates dummy data" -HOMEPAGE="https://github.com/emmanueloga/ffaker" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )" diff --git a/dev-ruby/ffaker/ffaker-2.0.0.ebuild b/dev-ruby/ffaker/ffaker-2.0.0.ebuild deleted file mode 100644 index eb937831d964..000000000000 --- a/dev-ruby/ffaker/ffaker-2.0.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" -RUBY_FAKEGEM_RECIPE_DOC="yard" - -inherit ruby-fakegem - -DESCRIPTION="Faster Faker, generates dummy data" -HOMEPAGE="https://github.com/emmanueloga/ffaker" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )" diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest index 7335cc7930cb..7b6f420f4dda 100644 --- a/dev-ruby/minitest/Manifest +++ b/dev-ruby/minitest/Manifest @@ -1,7 +1,5 @@ DIST minitest-4.7.5.gem 57856 SHA256 3e0ac720a6d0787b4c822514739319493e187400e993fba96397bd64d58ae60e SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851 WHIRLPOOL 49bbc557d62053b58208e6aef13dba085f393dbecd731b2915a0b885393ba2b4f1a612b46a018442d2f4fcfda9dfbe3025ae72d2946106a589623748fa4b382d DIST minitest-5.3.3.gem 67072 SHA256 b17c560235e6ab96ed243d7a821e4370af1316ad7a845188d22c56d7d71302d4 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509 WHIRLPOOL 66c72352b2cdeeeec494be4b2b0aac49153bce9d37c0dbcc9bb0eec4f4759d3f61fd12bbbda0a2a7f26bb75741033a4208da02f1f1a892ff3819bb597218d45f DIST minitest-5.5.1.gem 68608 SHA256 d63b3136cc48295a1e80b6a3fb3638c3024e632ce53107ad3cc3f3fa32b012c1 SHA512 20763183a6170758705a9110c5e963e6baa210fb449335e529cefa5325f3fa8abdb30cb3e47eec051c4cc72b8f581e6e729748f5c0e28dedfad8f80e21cbc1ae WHIRLPOOL b0f88bc0151fea3eda5cc68c1eacaac3cfaa9001e4cd40ae9de88e3aa434e99653bbac94b0f6dac3cb7f2204460da04439aaed340f3b897a105ecd3e992418e0 -DIST minitest-5.8.0.gem 71680 SHA256 875de2784b97b710da76c682e725095ca6c5142093a07474114e52cd6dea0953 SHA512 07ce4cff755ed1ec15f3f927793cca11468a714ae5ab2848ea97ce9b0d9c533dfdc2867df6f66609c7658ded4b1bd4012594356c0f253d1d977c707d4d54f5ee WHIRLPOOL 7ebd286097c5ca98729fc74e53618d4b83106d7ec440b0cffffb0d9d3856c514f6dab7b5671fd2ddf64f13576f82621cba8f49d52cab14fa0c252f0738ae4204 -DIST minitest-5.8.1.gem 71680 SHA256 c8d2763ef0f3c86464b83ed60876772a1e7ff669c562bb63064679cf51109103 SHA512 ca2e950521403a1f1e97c386d71097e6ad014bfe34d9799f2070db75b3d72c676daefda0e8a6bbf9f0bd43a640b7a873195278388845b04d3fc46b9e12c8f7ae WHIRLPOOL f96defb6ea36dc8f3a25c60d13389f6ac0169cd35f566e12b03a8157f376c9f0f0929d1361be2fcb324b99dcbaa7101a57ff156f3aafe25ea5ec255564b05194 -DIST minitest-5.8.2.gem 71680 SHA256 2f72bd7eaa8990730aa190c8f49f28956165f4da400d6169cafb55ef77dc2db2 SHA512 a7f4295e05eda6367a500b88a92fdbb0e6228e10ed1ec62c9b3346fdf4fe91f762ab98ea4ce6a2ceaedc09149200a43d4f90fcb317a4d6cbd72d3c8ca0a0f6a8 WHIRLPOOL b76e92bff898f41aea66d8f55d5e80da0055572c7605a09745870289396e6ade7d1864a1916dc41322039c4873acc2704235adb82a1101737890b53242edb060 DIST minitest-5.8.3.gem 71680 SHA256 681b1dffa5af3167889fa23b2bf8860ff516b0fed560f8fb6af8b88c7eafcc4d SHA512 08ed4d7942b89c67cfc2aa7dc3ef8d41262327a23ceee7f4f562f1782a8a09558f8c66bbf5b717a5f6efc7ebf1d84730529269e87ebe3c1943df7b483aa657b3 WHIRLPOOL f629f1b7d6465584edeb2a6b74b176524b5263dd710e33c9152ed3c80fcfb1bf7f13a716d9cae465bd973f34c95f7daad87ea9fd9dbca755ad5e30b1a2a9701e +DIST minitest-5.8.4.gem 72192 SHA256 2ad73ec73ef54719efba24961a36ad3a65c0bff9cb5d9fda4ddaba2a38b8d416 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906 WHIRLPOOL 02d23b3c96811ab163247bda437e0de163afc8029494c326018a43edab203d9789afbaafdea0794e7e4fc496e338c79859c5e0935634e011b17382627b467237 diff --git a/dev-ruby/minitest/minitest-5.8.0.ebuild b/dev-ruby/minitest/minitest-5.8.0.ebuild deleted file mode 100644 index 1e82b818731b..000000000000 --- a/dev-ruby/minitest/minitest-5.8.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc" - -inherit ruby-fakegem - -DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit" -HOMEPAGE="https://github.com/seattlerb/minitest" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -each_ruby_test() { - ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed" -} diff --git a/dev-ruby/minitest/minitest-5.8.1.ebuild b/dev-ruby/minitest/minitest-5.8.1.ebuild deleted file mode 100644 index 1e82b818731b..000000000000 --- a/dev-ruby/minitest/minitest-5.8.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" - -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc" - -inherit ruby-fakegem - -DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit" -HOMEPAGE="https://github.com/seattlerb/minitest" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -each_ruby_test() { - ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed" -} diff --git a/dev-ruby/minitest/minitest-5.8.2.ebuild b/dev-ruby/minitest/minitest-5.8.4.ebuild similarity index 90% rename from dev-ruby/minitest/minitest-5.8.2.ebuild rename to dev-ruby/minitest/minitest-5.8.4.ebuild index 1e82b818731b..4723351641fb 100644 --- a/dev-ruby/minitest/minitest-5.8.2.ebuild +++ b/dev-ruby/minitest/minitest-5.8.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_RECIPE_DOC="rdoc" diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest index e1d7b0cac216..fcfb7699eb6b 100644 --- a/dev-ruby/nio4r/Manifest +++ b/dev-ruby/nio4r/Manifest @@ -1,2 +1,3 @@ DIST nio4r-1.1.1.gem 91648 SHA256 5d86fd9f8872982fd4fa623bdaafe45efe21353b64fd09632e486f1b4d40959e SHA512 3163fd7efe05200ff88d284e932244f9a8f2e3b0145c6e732cdf8cd253ca334e1ade5b7d9c61a2d69ce193fa86501f1756ab3602181754426c7a268996537ff6 WHIRLPOOL 29501589d7eac09717c898dfdf80107653e68dcf5e84a9f96d1609c377d371447f17c8119313de99e4a9b3d0d984dbf44ab8ce3cdf3358ce99667266aabbd8a9 DIST nio4r-1.2.0.gem 93696 SHA256 3427522115c07a9326c5859ca3cb261d0d7075f4289e27dd3982806902de6cbc SHA512 6d51195658f32873ce7698ccf30b1b8852d1e5cd4fdaba46533dbb56a3a999df0d22badf7504193d5f8458b362f147f3a9768b5d981b2c696246e1f21c6f1579 WHIRLPOOL ce492b96af9ae27e90f501a900097ba75209a2afc3d7e18737ce3c01b3238fec7647a89fb453c19ecc83416791d2b81efd2004f4d7f8265f63d48957f9d190be +DIST nio4r-1.2.1.gem 94208 SHA256 0a5a93676c7c116c51f00366800a7c039d67393dadb4b873059375d7cfa9b6a9 SHA512 3136863955bd6f4d489955bae9baf2fb527447c0e71dade1a05402f3e7c8570bf1dd9b8335d70d7303ec4df0a236b13e4ede74ce9154be00a108afcd7c6b7f40 WHIRLPOOL acb063c6a5e9cb4df6096ecd5bebc9e5d1b2968d35899f05b7110b0037bb37862942e01c44fcbd2731bcb492f9e7fd9acd70a23aee375dae93406688ac7ff593 diff --git a/dev-ruby/nio4r/nio4r-1.2.1.ebuild b/dev-ruby/nio4r/nio4r-1.2.1.ebuild new file mode 100644 index 000000000000..171f9b7e6def --- /dev/null +++ b/dev-ruby/nio4r/nio4r-1.2.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="A high performance selector API for monitoring IO objects" +HOMEPAGE="https://github.com/celluloid/nio4r" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +# Note that nio4r bundles a patched copy of libev, and without these +# patches the tests fail: https://github.com/celluloid/nio4r/issues/15 + +all_ruby_prepare() { + sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' spec/spec_helper.rb || die + sed -e '/extension/ s:^:#:' -i Rakefile || die +} + +each_ruby_configure() { + ${RUBY} -Cext/${PN} extconf.rb || die +} + +each_ruby_compile() { + emake V=1 -Cext/${PN} + cp ext/${PN}/*$(get_modname) lib/ || die +} diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest index c59d1f512150..f90c50994712 100644 --- a/dev-ruby/rack-cache/Manifest +++ b/dev-ruby/rack-cache/Manifest @@ -1,2 +1,3 @@ DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916 DIST rack-cache-1.5.1.tar.gz 258817 SHA256 77afa21e3d2c97224795b740d4a67b23e2fbb15515b774b897993343265545f5 SHA512 e7d2804d2e4f48f8333ee9689251f760290eb15c692a55dd1bfdcfcbecc677afbf6db949c8ca9bc79e7248c58ca5f6f89bc13ab912c34f33e119befcdde902f8 WHIRLPOOL e3808050537411af5f210b7201da8f3b2b4d499a20e9a161ef29c88edba80348919629b23b929d9361982c4c328dcdae25eba3c616cbbab0ef626da6bfa0d590 +DIST rack-cache-1.6.0.tar.gz 259383 SHA256 6c365f1a80a21701dd86b24bf5aa832fb3c70bd0ab1ede594ddc4a15e2376291 SHA512 d15e0eb55213e4ba7c528417c7f460606f4ac24222a0aa913859b8801e8b608600818c230a7677ccec99b1040a62a7067c1911ac109ae14d58c4ff140e502070 WHIRLPOOL 05f37a92b8affd318092218c871b1b3b7b7fe6f55088eb617af783fb178b6552dc5c19461ed2104053832fb9d84bddd0b0f34d250127167044961c7d10c810cb diff --git a/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild new file mode 100644 index 000000000000..120d56e416d7 --- /dev/null +++ b/dev-ruby/rack-cache/rack-cache-1.6.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +# no documentation is generable, it needs hanna, which is broken +RUBY_FAKEGEM_RECIPE_DOC="none" + +RUBY_FAKEGEM_TASK_TEST="none" + +RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*" + +inherit versionator ruby-fakegem + +DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info" +HOMEPAGE="https://github.com/rtomayko/rack-cache" +SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="1.2" +KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_rdepend "dev-ruby/rack:*" + +ruby_add_bdepend "test? ( + dev-ruby/maxitest + >=dev-ruby/minitest-5.7.0:5 + >=dev-ruby/mocha-0.13.0 )" + +all_ruby_prepare() { + sed -i -e '/bundler/ s:^:#:' \ + -e "2i require 'timeout'" \ + test/test_helper.rb || die +} + +each_ruby_test() { + ${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die +} diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest index a8c93e5fd691..074f7c238d5c 100644 --- a/dev-ruby/ruby_parser/Manifest +++ b/dev-ruby/ruby_parser/Manifest @@ -1,2 +1,3 @@ DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f +DIST ruby_parser-3.7.3.gem 311296 SHA256 fdcbe21874bfe584ab329bccbc1fc0c2bde9d3c7d0b076b10de18e645117f1ae SHA512 eeb468111152a80fa047dfebbfb29ea94e4b76fc2c88e49f9094a0bdfd0c4d61bd2831a10a2556d4363e6a46093a8209a3599ce16b8f63b88a29b2d850556c16 WHIRLPOOL 5c6ab80d4a18f8b1533941436ef0ab812069159bac76fac087fbcff583d2f3126f118357a25f84027bf361e4471fdf909af8ce4165728afa2732ed1a91275f54 diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild new file mode 100644 index 000000000000..7fa23ed3a310 --- /dev/null +++ b/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_TASK_DOC="docs" +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" + +inherit ruby-fakegem + +DESCRIPTION="A ruby parser written in pure ruby" +HOMEPAGE="https://github.com/seattlerb/ruby_parser" + +LICENSE="MIT" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.1:4 + !=dev-ruby/hoe-2.9.1 )" +ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" + +DEPEND+=" test? ( dev-util/unifdef )" + +all_ruby_prepare() { + # Remove reference to perforce method that is not in a released + # version of hoe-seattlerb. + #sed -i -e '/perforce/d' Rakefile || die + sed -i -e '/license/d' Rakefile || die + sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die +} diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml index 4b45643bc78b..ddf5da98f687 100644 --- a/dev-ruby/totoridipjp/metadata.xml +++ b/dev-ruby/totoridipjp/metadata.xml @@ -9,6 +9,6 @@ Gentoo Ruby Project - delayer-deferred + totoridipjp diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild index b7ef079b14a7..fad356c4679e 100644 --- a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild +++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild @@ -1,14 +1,20 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" +RUBY_FAKEGEM_RECIPE_TEST="none" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="README.md" +RUBY_FAKEGEM_BINWRAP="" + inherit ruby-fakegem + DESCRIPTION="A ruby binding to use totori.dip.jp Web API" HOMEPAGE="https://rubygems.org/gems/totoridipjp" @@ -16,7 +22,3 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" - -all_ruby_prepare() { - rm -fvr bin/ || die -} diff --git a/dev-tex/circuit_macros/Manifest b/dev-tex/circuit_macros/Manifest index f0eddb079b8c..2066da989380 100644 --- a/dev-tex/circuit_macros/Manifest +++ b/dev-tex/circuit_macros/Manifest @@ -1 +1,2 @@ +DIST circuit_macros-8.3.1.tar.gz 2021702 SHA256 3ea3a258c4222b981c541924a2f006079b6240a6500a7e5a76985be1ad4eb085 SHA512 b7f5ee756169b15b80d8645501462281150a9981e7b80eec7b453829b61610b352a349e2f0086f70421ef7eb38f1ac205e3eecc318fc14ee67eb90e94414d219 WHIRLPOOL 6d2f22bac6b7f695261db6878faaeb1fa08ae5924c5d9ce15362d2c7f5f2e60c372302c581f234c21dc7b183206b46aa85e71b877a53720b3b2ca6882a996206 DIST circuit_macros-8.3.tar.gz 1897642 SHA256 c3b547a79204acb71cc32f59261963116afb6afd2614bb135bf1b5edf64b077c SHA512 d9407c54e5b87f5bd1cf43f92f4b65a2e59221f8a62d687918230f0ab6ffa47757436c1914e76872b7ac22b6547ab6c0efa54a0f05647ff435a4f2452a1c6029 WHIRLPOOL 7b50ed8cac220cfd1c071102ff54a1074ce2f737e7a61202b446202a613da2a9d94b19611174a9e979a8b09aa4f60246580b802efb6ba821307d8849f7306ad8 diff --git a/dev-tex/circuit_macros/circuit_macros-8.3.1.ebuild b/dev-tex/circuit_macros/circuit_macros-8.3.1.ebuild new file mode 100644 index 000000000000..fffc6e16a34b --- /dev/null +++ b/dev-tex/circuit_macros/circuit_macros-8.3.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit texlive-common + +DESCRIPTION="M4 Macros for Electric circuit diagrams in TeX or LaTeX" +HOMEPAGE="https://ece.uwaterloo.ca/~aplevich/Circuit_macros/" +SRC_URI="https://ece.uwaterloo.ca/~aplevich/Circuit_macros/Circuit_macros.tar.gz -> circuit_macros-${PV}.tar.gz" + +LICENSE="LPPL-1.3c" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples +script" + +DEPEND="" +RDEPEND="|| ( app-text/texlive[graphics] app-text/texlive[pstricks] ) + media-gfx/dpic + sys-devel/m4 + script? ( app-text/texlive[graphics] + dev-texlive/texlive-latexextra )" + +S="${WORKDIR}/Circuit_macros${PV}" + +src_install() { + insinto /usr/share/${PN} + doins *.m4 + insinto /usr/share/texmf-site/tex/latex/${PN} + doins boxdims.sty + dodoc README CHANGES Makefile doc/CMman.pdf + rm -f doc/CMman.pdf + use doc && dodoc -r doc + use examples && dodoc -r examples + use script && dobin "${FILESDIR}/cm2pdf" + docompress -x \ + /usr/share/doc/${PF}/Makefile \ + /usr/share/doc/${PF}/doc \ + /usr/share/doc/${PF}/examples +} + +pkg_postinst() { + etexmf-update + use script && einfo "cm2pdf was installed to automatically create PDFs. Run cm2pdf --help for usage help." +} + +pkg_postrm() { + etexmf-update +} diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild index 6b44cef9c335..ba827da1d0ef 100644 --- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild +++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest index f3b95071ba41..6523ee87acc7 100644 --- a/dev-util/jenkins-bin/Manifest +++ b/dev-util/jenkins-bin/Manifest @@ -1,3 +1,4 @@ DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6 -DIST jenkins-bin-1.644.war 63665223 SHA256 f4fe9c1faa682cbfa8dc6e7f3e64d78897dcb7332e8f513f12a3b845e3922eb0 SHA512 8a94569372048587af6cf763cd4aa2566413a9fca9adb868f874ccb4258b4c68548210d1f11d2f051785233355300649a3f376a3b338b742b2ef62e05f92b58e WHIRLPOOL 7a9e97469be7372048595825ed4679911d7ef1e044fa21855ef41559e5d4e8ecd42340c4d303e49a4f0212f1cc7055a0b933986ddc112b5a2768afbaba2a8b92 +DIST jenkins-bin-1.642.1.war 63664516 SHA256 ce036e227fe1fed15e3da9be8d29e859bdcda7118895fd269d1c9ac35925de66 SHA512 1fa79b6029078d8a8c0996b63dc7c411f9a56037257dbb3080e07559cb949af819f6245846b5c586ba7c9a61d5a25137d3c2d9c91a7a63fe2b4f3358d7c439c2 WHIRLPOOL 2b54f22895f7de1ced34bd99a03d37b4f06211e6dd5bdd56ac49eff2b010797f82f4d67f2a2b051feb2eba08f5eb87ca7223c46a75c690588361eb11aa007d62 DIST jenkins-bin-1.645.war 63350272 SHA256 9ea1b6bc4fcdd930cdbfa3a3e97b4d923f68f7542b6978d090efbd4c38d69951 SHA512 684b6e86db19afc8fe92b2eb1d174623fbac74e446f28d2c62fb08db15549bf1fc15a86290b8e14bd1af64074fa08882125306eaea7e94ae88bdb589255167de WHIRLPOOL e2c24eef01c252f14d960f8edba2da55caa256b1128b2cd5093b9dee92ec6fc36802bca67ebdc22c939bf0a46a54b01cac4d87cb45c64a1ed70d7fade73b8eaf +DIST jenkins-bin-1.646.war 63352963 SHA256 2b892d363e1ce88e4d3a37e7d5c17c0be5bce902b3b98e6e0ebfe0d2d509f2d4 SHA512 b67f0dc90b8f58fed51490e850a4cf281e20501fefe42c4293d7721f8b658c210463f62d1acd72d8d5bc172616e6435f1633c52ccda35f8f16886581abea70c3 WHIRLPOOL 2be58f37ebd1e2928d403524b27adac788918a58c5261ef564051c2efc57372e2e89366321aa6f6e39906ebe70eb29b49910a65c318efaa90d1b4ca94d666d6d diff --git a/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild new file mode 100644 index 000000000000..88dc7f8565d4 --- /dev/null +++ b/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit user systemd + +DESCRIPTION="Extensible continuous integration server" +HOMEPAGE="http://jenkins-ci.org/" +LICENSE="MIT" +SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war" +RESTRICT="mirror" +SLOT="lts" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="media-fonts/dejavu + media-libs/freetype + !dev-util/jenkins-bin:0 + >=virtual/jre-1.7.0" + +S=${WORKDIR} + +JENKINS_DIR=/var/lib/jenkins + +pkg_setup() { + enewgroup jenkins + enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins +} + +src_install() { + keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home + + insinto /opt/jenkins + newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/} + + newinitd "${FILESDIR}"/${PN}.init2 jenkins + newconfd "${FILESDIR}"/${PN}.confd jenkins + + systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service + + fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup +} diff --git a/dev-util/jenkins-bin/jenkins-bin-1.644.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.646.ebuild similarity index 100% rename from dev-util/jenkins-bin/jenkins-bin-1.644.ebuild rename to dev-util/jenkins-bin/jenkins-bin-1.646.ebuild diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest index 36e3e70b1d35..846c429d6d6f 100644 --- a/dev-vcs/git-tools/Manifest +++ b/dev-vcs/git-tools/Manifest @@ -1 +1,2 @@ DIST git-tools-2015_p20151225.tar.gz 12635 SHA256 ab98a8ac35d47d521c43e8b6f543e55757bb2ec4a3cbdeddf25348c5b0cdb36a SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0 WHIRLPOOL 6f2810d8e81bbdcb8f99a4e9e3032e11a160df969e8c11a9f8ed8e053eaaf98f895c90eed726e91bcdc2a59493950375015c4922e758256a54874e2667e21a25 +DIST git-tools-2015_p20160201.tar.gz 12702 SHA256 56622b47edcfd2149e8d23b4d840a9c808160520f9c02f5b1842976a87362cbe SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995 WHIRLPOOL 00c3a8fd887d37ce516dc07ca1594cfe6dba19cf74d7eb1c608b6b44a89869bcd6c66832b15eb8c86b58805003f4cf2b7c9298cc0a95c0f6648534c1ace6cc79 diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild new file mode 100644 index 000000000000..8acca2133ccc --- /dev/null +++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{1..5} ) +inherit python-r1 + +DESCRIPTION="Assorted git-related scripts" +HOMEPAGE="https://github.com/MestreLion/git-tools/" +MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6" +SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND=" + >=dev-vcs/git-2.5 + >=app-shells/bash-4.0" + +MY_P=${PN}-${MY_PV} +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch +} + +src_compile() { + :; +} + +src_install() { + SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-repos git-rebase-theirs git-strip-merge" + SCRIPTS_PYTHON="git-restore-mtime" + dobin $SCRIPTS_BASH + dobin $SCRIPTS_PYTHON + for p in $SCRIPTS_PYTHON ; do + python_replicate_script "${ED}"/usr/bin/$p + done + # Make it possible to use the tools as 'git $TOOLNAME' + for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do + dosym /usr/bin/$i /usr/libexec/git-core/$i + done + dodoc README.md +} diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild index b23a33b1a281..e3fa8872217a 100644 --- a/dev-vcs/gitg/gitg-3.18.0.ebuild +++ b/dev-vcs/gitg/gitg-3.18.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_3,3_4} ) +PYTHON_COMPAT=( python{3_3,3_4,3_5} ) inherit gnome2 python-r1 vala diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index a1081e6c7b77..6668bd9ddb2b 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -2,5 +2,5 @@ DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6 DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4 -DIST mercurial-3.6.2.tar.gz 4518349 SHA256 09c567049c3e30f791db0cf5937346c7ff3568deadf4eb1d4e2f7c80001cb3d6 SHA512 2ad780174a30c39a1482d597466523a133b8c62a3a0eb9ac3b183082e279fc624998a9ffa520abafe5f7afc7d9f4600f443ad4dfa1003bd7fdc6b713040091ed WHIRLPOOL cb3270be37b36ad5cfd5f1aac002006b5206daf22504af2143c359bab0d3db19fc7820a03ed819fa80c73610d485f5f85d405b4ad89d0744f79da049afd8866b DIST mercurial-3.6.3.tar.gz 4521749 SHA256 402731f27256beb9a575a6991ca3d7059976197c905337f4f5729fd940329fa8 SHA512 e5b39e5456a35e19f2ac02838946305023de957590c5aa2828f7c37e9b5f6f2e6376526d0845ebd1ca198860425d11e208b3c36e12e189e0b02871e9c91aad9a WHIRLPOOL 36f0f6caa43ce2c65c7c2bdfb3fa3935cec1e47c25fae6a6a3c7b00165d1aff9b71c73dd10faad2e2ba096d55cc633366170135d95452c162936fef93571dbf1 +DIST mercurial-3.7.tar.gz 4630279 SHA256 888e1522f92bf97053baae7333346586b5fc34c81de14af21c0fbb009c30b933 SHA512 ecb95555471274105a309940b4c0a82aba308deea4662a79e4e2ca9caf8965a5b01a9684d5adf3ecd767a7da71b61fc2322f3f7e1a9e95894cc8320836e7b3d2 WHIRLPOOL f872459194f02424e177e82b0d5814803aa60b9f77c7a6f370fad4d9374ae04f1a267f30a3563163c6f447629e73192ba4f4355c6c659133d38c265742d1b8d8 diff --git a/dev-vcs/mercurial/mercurial-3.6.2.ebuild b/dev-vcs/mercurial/mercurial-3.7.ebuild similarity index 98% rename from dev-vcs/mercurial/mercurial-3.6.2.ebuild rename to dev-vcs/mercurial/mercurial-3.7.ebuild index 1f57c1ef8c43..18f93f985ef2 100644 --- a/dev-vcs/mercurial/mercurial-3.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-3.7.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild index ccaeca2f2fbb..fbd6ad2107fd 100644 --- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild +++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 PYTHON_COMPAT=( python2_7 ) diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass deleted file mode 100644 index 625ea24692fb..000000000000 --- a/eclass/bash-completion.eclass +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# @DEAD - -# DEPRECATED -# This eclass has been superseded by bash-completion-r1 eclass. -# Please modify your ebuilds to use that one instead. - -# @ECLASS: bash-completion.eclass -# @MAINTAINER: -# shell-tools@gentoo.org. -# @AUTHOR: -# Original author: Aaron Walker -# @BLURB: An Interface for installing contributed bash-completion scripts -# @DESCRIPTION: -# Simple eclass that provides an interface for installing -# contributed (ie not included in bash-completion proper) -# bash-completion scripts. -# -# Note: this eclass has been deprecated in favor of bash-completion-r1. Please -# use that one instead. - -# @ECLASS-VARIABLE: BASHCOMPLETION_NAME -# @DESCRIPTION: -# Install the completion script with this name (see also dobashcompletion) - -# @ECLASS-VARIABLE: BASHCOMPFILES -# @DESCRIPTION: -# Space delimited list of files to install if dobashcompletion is called without -# arguments. - -inherit eutils - -eqawarn "bash-completion.eclass is last rited and will be removed on 2015-11-24." -eqawarn "Please update your ebuilds to use bash-completion-r1 instead." - -EXPORT_FUNCTIONS pkg_postinst - -IUSE="bash-completion" - -# Allow eclass to be inherited by eselect without a circular dependency -if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then - RDEPEND="bash-completion? ( app-admin/eselect )" -fi -PDEPEND="bash-completion? ( app-shells/bash-completion )" - -# @FUNCTION: dobashcompletion -# @USAGE: [file] [new_file] -# @DESCRIPTION: -# The first argument is the location of the bash-completion script to install, -# and is required if BASHCOMPFILES is not set. The second argument is the name -# the script will be installed as. If BASHCOMPLETION_NAME is set, it overrides -# the second argument. If no second argument is given and BASHCOMPLETION_NAME -# is not set, it will default to ${PN}. -dobashcompletion() { - local f - - eqawarn "bash-completion.eclass has been deprecated." - eqawarn "Please update your ebuilds to use bash-completion-r1 instead." - - if [[ -z ${1} && -z ${BASHCOMPFILES} ]]; then - die "Usage: dobashcompletion [file] [new file]" - fi - - if use bash-completion; then - insinto /usr/share/bash-completion - if [[ -n ${1} ]]; then - [[ -z ${BASHCOMPLETION_NAME} ]] && BASHCOMPLETION_NAME="${2:-${PN}}" - newins "${1}" "${BASHCOMPLETION_NAME}" || die "Failed to install ${1}" - else - set -- ${BASHCOMPFILES} - for f in "$@"; do - if [[ -e ${f} ]]; then - doins "${f}" || die "Failed to install ${f}" - fi - done - fi - fi -} - -# @FUNCTION: bash-completion_pkg_postinst -# @DESCRIPTION: -# The bash-completion pkg_postinst function, which is exported -bash-completion_pkg_postinst() { - local f - - if use bash-completion ; then - elog "The following bash-completion scripts have been installed:" - if [[ -n ${BASHCOMPLETION_NAME} ]]; then - elog " ${BASHCOMPLETION_NAME}" - else - set -- ${BASHCOMPFILES} - for f in "$@"; do - elog " $(basename ${f})" - done - fi - elog - elog "To enable command-line completion on a per-user basis run:" - elog " eselect bashcomp enable