summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/eselect/eselect-1.4.5.ebuild4
-rw-r--r--app-admin/puppetdb/Manifest1
-rw-r--r--app-admin/puppetdb/puppetdb-3.2.4.ebuild91
-rw-r--r--app-arch/pax/files/pax-3.4-sysmacros.patch12
-rw-r--r--app-arch/pax/pax-3.4.12.16-r1.ebuild3
-rw-r--r--app-arch/pax/pax-3.4.12.16.ebuild3
-rw-r--r--app-backup/attic/attic-0.16.ebuild8
-rw-r--r--app-backup/attic/attic-9999.ebuild8
-rw-r--r--app-benchmarks/phoronix-test-suite/Manifest1
-rw-r--r--app-benchmarks/phoronix-test-suite/phoronix-test-suite-6.2.1.ebuild109
-rw-r--r--app-benchmarks/siege/Manifest1
-rw-r--r--app-benchmarks/siege/siege-3.1.4.ebuild50
-rw-r--r--app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild2
-rw-r--r--app-doc/doxygen/Manifest1
-rw-r--r--app-doc/doxygen/doxygen-1.8.10-r1.ebuild4
-rw-r--r--app-doc/doxygen/doxygen-1.8.11.ebuild186
-rw-r--r--app-doc/doxygen/doxygen-9999.ebuild24
-rw-r--r--app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch32
-rw-r--r--app-editors/xmlcopyeditor/Manifest3
-rw-r--r--app-editors/xmlcopyeditor/metadata.xml12
-rw-r--r--app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild57
-rw-r--r--app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild58
-rw-r--r--app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild44
-rw-r--r--app-emulation/libvirt-glib/Manifest1
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild53
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild4
-rw-r--r--app-emulation/qemu/qemu-2.5.0-r1.ebuild7
-rw-r--r--app-emulation/rkt/rkt-1.0.0.ebuild1
-rw-r--r--app-emulation/rkt/rkt-9999.ebuild1
-rw-r--r--app-emulation/virt-manager/Manifest3
-rw-r--r--app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch15
-rw-r--r--app-emulation/virt-manager/virt-manager-1.1.0-r2.ebuild95
-rw-r--r--app-emulation/virt-manager/virt-manager-1.2.1.ebuild93
-rw-r--r--app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild105
-rw-r--r--app-emulation/virt-manager/virt-manager-1.3.2.ebuild4
-rw-r--r--app-emulation/virt-viewer/Manifest2
-rw-r--r--app-emulation/virt-viewer/virt-viewer-2.0.ebuild49
-rw-r--r--app-emulation/virt-viewer/virt-viewer-3.0.ebuild49
-rw-r--r--app-emulation/virt-viewer/virt-viewer-3.1.ebuild2
-rw-r--r--app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild2
-rw-r--r--app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild2
-rw-r--r--app-misc/scrub/scrub-2.6.1.ebuild2
-rw-r--r--app-shells/zsh-completions/Manifest2
-rw-r--r--app-shells/zsh-completions/zsh-completions-0.16.0.ebuild (renamed from app-shells/zsh-completions/zsh-completions-0.14.0.ebuild)0
-rw-r--r--app-text/pdf2djvu/Manifest3
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild53
-rw-r--r--app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild (renamed from app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild)2
-rw-r--r--app-text/wgetpaste/wgetpaste-2.25-r3.ebuild4
-rw-r--r--app-text/xhtml1/xhtml1-20020801-r4.ebuild2
-rw-r--r--dev-cpp/eigen/eigen-3.2.7.ebuild2
-rw-r--r--dev-cpp/eigen/eigen-3.2.8-r2.ebuild2
-rw-r--r--dev-db/pgbouncer/Manifest1
-rw-r--r--dev-db/pgbouncer/pgbouncer-1.7.2.ebuild83
-rw-r--r--dev-db/postgis/Manifest1
-rw-r--r--dev-db/postgis/postgis-2.2.1.ebuild143
-rw-r--r--dev-db/postgresql/postgresql-9.5.1.ebuild2
-rw-r--r--dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild4
-rw-r--r--dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild4
-rw-r--r--dev-go/go-md2man/go-md2man-1.0.3.ebuild4
-rw-r--r--dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild4
-rw-r--r--dev-lang/erlang/erlang-18.2.1.ebuild2
-rw-r--r--dev-lang/go/Manifest1
-rw-r--r--dev-lang/go/go-1.6-r2.ebuild5
-rw-r--r--dev-lang/nwcc/Manifest1
-rw-r--r--dev-lang/nwcc/nwcc-0.8.3.ebuild25
-rw-r--r--dev-lang/regina-rexx/Manifest1
-rw-r--r--dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild46
-rw-r--r--dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild2
-rw-r--r--dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild2
-rw-r--r--dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild2
-rw-r--r--dev-libs/libsodium/libsodium-1.0.8.ebuild2
-rw-r--r--dev-python/WSME/WSME-0.8.0.ebuild2
-rw-r--r--dev-python/aioeventlet/aioeventlet-0.5.1.ebuild2
-rw-r--r--dev-python/alembic/alembic-0.8.2.ebuild2
-rw-r--r--dev-python/anyjson/anyjson-0.3.3-r1.ebuild2
-rw-r--r--dev-python/automaton/automaton-0.8.0.ebuild2
-rw-r--r--dev-python/backports-abc/backports-abc-0.4.ebuild2
-rw-r--r--dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild2
-rw-r--r--dev-python/backports/backports-1.0.ebuild2
-rw-r--r--dev-python/bcrypt/bcrypt-2.0.0.ebuild2
-rw-r--r--dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild2
-rw-r--r--dev-python/blinker/blinker-1.4.ebuild2
-rw-r--r--dev-python/boto/boto-2.38.0.ebuild2
-rw-r--r--dev-python/cachetools/cachetools-1.1.5.ebuild2
-rw-r--r--dev-python/castellan/castellan-0.2.1.ebuild2
-rw-r--r--dev-python/click/click-6.3.ebuild2
-rw-r--r--dev-python/cliff/cliff-1.14.0.ebuild2
-rw-r--r--dev-python/cmd2/cmd2-0.6.8.ebuild2
-rw-r--r--dev-python/contextlib2/contextlib2-0.5.1.ebuild2
-rw-r--r--dev-python/debtcollector/debtcollector-0.10.0.ebuild2
-rw-r--r--dev-python/decorator/decorator-4.0.6.ebuild2
-rw-r--r--dev-python/dnspython/dnspython-1.12.0-r200.ebuild2
-rw-r--r--dev-python/dnspython/dnspython-1.12.0-r300.ebuild2
-rw-r--r--dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild2
-rw-r--r--dev-python/dogpile-core/dogpile-core-0.4.1.ebuild2
-rw-r--r--dev-python/eventlet/eventlet-0.17.4.ebuild2
-rw-r--r--dev-python/fasteners/fasteners-0.13.0.ebuild2
-rw-r--r--dev-python/futures/futures-3.0.5.ebuild2
-rw-r--r--dev-python/futurist/futurist-0.4.0.ebuild2
-rw-r--r--dev-python/gevent/gevent-1.1_beta6.ebuild2
-rw-r--r--dev-python/glance_store/glance_store-0.9.1.ebuild2
-rw-r--r--dev-python/greenlet/greenlet-0.4.9.ebuild2
-rw-r--r--dev-python/html5lib/html5lib-0.9999999-r1.ebuild2
-rw-r--r--dev-python/httplib2/httplib2-0.9.1.ebuild2
-rw-r--r--dev-python/ipykernel/ipykernel-4.3.0.ebuild2
-rw-r--r--dev-python/ipyparallel/ipyparallel-5.0.1.ebuild2
-rw-r--r--dev-python/ipython/ipython-4.1.1.ebuild2
-rw-r--r--dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild2
-rw-r--r--dev-python/jsonpatch/jsonpatch-1.13.ebuild2
-rw-r--r--dev-python/jsonpointer/jsonpointer-1.10.ebuild2
-rw-r--r--dev-python/jupyter_client/jupyter_client-4.1.1.ebuild2
-rw-r--r--dev-python/jupyter_core/jupyter_core-4.0.6.ebuild2
-rw-r--r--dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild2
-rw-r--r--dev-python/kombu/kombu-3.0.30.ebuild2
-rw-r--r--dev-python/logutils/logutils-0.3.3.ebuild2
-rw-r--r--dev-python/monotonic/monotonic-0.5.ebuild2
-rw-r--r--dev-python/msgpack/msgpack-0.4.6.ebuild2
-rw-r--r--dev-python/neovim-python-client/Manifest1
-rw-r--r--dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild31
-rw-r--r--dev-python/netaddr/netaddr-0.7.18.ebuild2
-rw-r--r--dev-python/netifaces/netifaces-0.10.4.ebuild2
-rw-r--r--dev-python/networkx/networkx-1.11.ebuild2
-rw-r--r--dev-python/oauthlib/oauthlib-1.0.1.ebuild2
-rw-r--r--dev-python/ordereddict/ordereddict-1.1.ebuild2
-rw-r--r--dev-python/os-brick/os-brick-0.5.0.ebuild2
-rw-r--r--dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild2
-rw-r--r--dev-python/oslo-config/oslo-config-2.4.0.ebuild2
-rw-r--r--dev-python/oslo-context/oslo-context-0.6.0.ebuild2
-rw-r--r--dev-python/oslo-db/oslo-db-2.6.0.ebuild2
-rw-r--r--dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild2
-rw-r--r--dev-python/oslo-log/oslo-log-1.10.0.ebuild2
-rw-r--r--dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild2
-rw-r--r--dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild2
-rw-r--r--dev-python/oslo-policy/oslo-policy-0.12.0.ebuild2
-rw-r--r--dev-python/oslo-reports/oslo-reports-0.6.0.ebuild2
-rw-r--r--dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild2
-rw-r--r--dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild2
-rw-r--r--dev-python/oslo-service/oslo-service-0.9.0.ebuild2
-rw-r--r--dev-python/oslo-utils/oslo-utils-2.4.0.ebuild2
-rw-r--r--dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild2
-rw-r--r--dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild2
-rw-r--r--dev-python/osprofiler/osprofiler-0.3.0.ebuild2
-rw-r--r--dev-python/passlib/passlib-1.6.5.ebuild2
-rw-r--r--dev-python/paste/paste-2.0.2.ebuild2
-rw-r--r--dev-python/pastedeploy/pastedeploy-1.5.2.ebuild2
-rw-r--r--dev-python/pecan/pecan-1.0.3.ebuild2
-rw-r--r--dev-python/pickleshare/pickleshare-0.6.ebuild2
-rw-r--r--dev-python/pip/pip-8.0.3.ebuild2
-rw-r--r--dev-python/posix_ipc/posix_ipc-0.9.8.ebuild2
-rw-r--r--dev-python/prettytable/prettytable-0.7.2.ebuild2
-rw-r--r--dev-python/psutil/psutil-1.2.1.ebuild2
-rw-r--r--dev-python/psycopg/psycopg-2.6.1.ebuild2
-rw-r--r--dev-python/py-amqp/py-amqp-1.4.9.ebuild2
-rw-r--r--dev-python/pycadf/pycadf-1.1.0.ebuild2
-rw-r--r--dev-python/pycrypto/pycrypto-2.6.1.ebuild2
-rw-r--r--dev-python/pyjwt/pyjwt-1.4.0.ebuild2
-rw-r--r--dev-python/pyro/pyro-4.41.ebuild2
-rw-r--r--dev-python/pysaml2/pysaml2-3.0.0.ebuild2
-rw-r--r--dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild2
-rw-r--r--dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild2
-rw-r--r--dev-python/python-editor/python-editor-0.4.ebuild2
-rw-r--r--dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild2
-rw-r--r--dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild2
-rw-r--r--dev-python/python-memcached/python-memcached-1.57.ebuild2
-rw-r--r--dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild2
-rw-r--r--dev-python/python-novaclient/python-novaclient-2.30.2.ebuild2
-rw-r--r--dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild2
-rw-r--r--dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild2
-rw-r--r--dev-python/pyudev/pyudev-0.16.1-r1.ebuild2
-rw-r--r--dev-python/pyzmq/pyzmq-15.2.0.ebuild2
-rw-r--r--dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild2
-rw-r--r--dev-python/repoze-who/repoze-who-2.2.ebuild2
-rw-r--r--dev-python/routes/routes-2.2.ebuild2
-rw-r--r--dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild2
-rw-r--r--dev-python/ryu/ryu-3.26.ebuild2
-rw-r--r--dev-python/semantic_version/semantic_version-2.4.2.ebuild2
-rw-r--r--dev-python/serpent/serpent-1.11.ebuild2
-rw-r--r--dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild2
-rw-r--r--dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild2
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild2
-rw-r--r--dev-python/stevedore/stevedore-1.10.0.ebuild2
-rw-r--r--dev-python/suds/suds-0.6-r1.ebuild2
-rw-r--r--dev-python/taskflow/taskflow-1.21.0.ebuild2
-rw-r--r--dev-python/tempita/tempita-0.5.3-r1.ebuild2
-rw-r--r--dev-python/traitlets/traitlets-4.1.0.ebuild2
-rw-r--r--dev-python/trollius/trollius-2.0.ebuild2
-rw-r--r--dev-python/twisted-names/twisted-names-15.2.1.ebuild2
-rw-r--r--dev-python/twisted-web/twisted-web-15.2.1.ebuild2
-rw-r--r--dev-python/unicodecsv/unicodecsv-0.14.1.ebuild2
-rw-r--r--dev-python/waitress/waitress-0.8.9.ebuild2
-rw-r--r--dev-python/warlock/warlock-1.1.0.ebuild2
-rw-r--r--dev-python/webob/webob-1.5.1.ebuild2
-rw-r--r--dev-python/websockify/websockify-0.7.0.ebuild2
-rw-r--r--dev-python/webtest/webtest-2.0.18.ebuild2
-rw-r--r--dev-python/wrapt/wrapt-1.10.6-r1.ebuild2
-rw-r--r--dev-ruby/concurrent-ruby/Manifest1
-rw-r--r--dev-ruby/concurrent-ruby/concurrent-ruby-1.0.1.ebuild36
-rw-r--r--dev-ruby/css_parser/Manifest1
-rw-r--r--dev-ruby/css_parser/css_parser-1.3.7.ebuild45
-rw-r--r--dev-ruby/typhoeus/Manifest1
-rw-r--r--dev-ruby/typhoeus/typhoeus-1.0.1.ebuild30
-rw-r--r--dev-util/cloc/Manifest3
-rw-r--r--dev-util/cloc/cloc-1.60.ebuild35
-rw-r--r--dev-util/cloc/cloc-1.64.ebuild4
-rw-r--r--dev-util/cloc/cloc-1.66.ebuild (renamed from dev-util/cloc/cloc-1.62.ebuild)18
-rw-r--r--dev-util/cloc/metadata.xml4
-rw-r--r--dev-util/jenkins-bin/Manifest6
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild47
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-1.642.2.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild)0
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-1.649.ebuild47
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-1.650.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-1.647.ebuild)0
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r10.ebuild1
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r6.ebuild1
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r7.ebuild1
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r8.ebuild1
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r9.ebuild1
-rw-r--r--dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch201
-rw-r--r--dev-vcs/cvsync/Manifest1
-rw-r--r--dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild82
-rw-r--r--dev-vcs/cvsync/cvsync-9999.ebuild82
-rw-r--r--dev-vcs/cvsync/metadata.xml16
-rw-r--r--dev-vcs/mr/Manifest3
-rw-r--r--dev-vcs/mr/mr-1.20141024.ebuild32
-rw-r--r--dev-vcs/mr/mr-1.20150503.ebuild4
-rw-r--r--dev-vcs/mr/mr-1.20160123.ebuild (renamed from dev-vcs/mr/mr-1.20140831.1.ebuild)4
-rw-r--r--dev-vcs/vcsh/Manifest3
-rw-r--r--dev-vcs/vcsh/vcsh-1.20140508-r2.ebuild34
-rw-r--r--dev-vcs/vcsh/vcsh-1.20150502.ebuild2
-rw-r--r--dev-vcs/vcsh/vcsh-1.20151229.ebuild (renamed from dev-vcs/vcsh/vcsh-1.20141026.ebuild)16
-rw-r--r--mail-client/claws-mail/claws-mail-3.13.2.ebuild2
-rw-r--r--media-sound/quodlibet/Manifest1
-rw-r--r--media-sound/quodlibet/quodlibet-3.5.3.ebuild70
-rw-r--r--net-analyzer/netcat6/netcat6-1.0-r2.ebuild2
-rw-r--r--net-analyzer/wireshark/wireshark-2.0.2.ebuild2
-rw-r--r--net-firewall/ipset/ipset-6.24.ebuild2
-rw-r--r--net-libs/libssh/libssh-0.7.3.ebuild2
-rw-r--r--net-libs/libssh2/libssh2-1.7.0.ebuild2
-rw-r--r--net-libs/zeromq/zeromq-4.1.4.ebuild2
-rw-r--r--net-misc/dhcpcd/dhcpcd-6.10.1.ebuild2
-rw-r--r--net-misc/memcached/memcached-1.4.25.ebuild2
-rw-r--r--net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild2
-rw-r--r--net-misc/radvd/radvd-2.12.ebuild2
-rw-r--r--net-misc/spice-gtk/Manifest5
-rw-r--r--net-misc/spice-gtk/files/0.12-parallel-install.patch16
-rw-r--r--net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch57
-rw-r--r--net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch35
-rw-r--r--net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch84
-rw-r--r--net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch22
-rw-r--r--net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch29
-rw-r--r--net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch54
-rw-r--r--net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch12
-rw-r--r--net-misc/spice-gtk/files/spice.protocol12
-rw-r--r--net-misc/spice-gtk/files/spice.schemas41
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild170
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.21.ebuild174
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild180
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.28.ebuild159
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.29.ebuild159
-rw-r--r--net-proxy/squid/squid-3.5.15.ebuild2
-rw-r--r--profiles/arch/arm64/use.mask1
-rw-r--r--profiles/arch/hppa/package.use.mask4
-rw-r--r--profiles/package.mask4
-rw-r--r--profiles/prefix/linux/parent1
-rw-r--r--profiles/prefix/parent2
-rw-r--r--sci-geosciences/mapserver/Manifest2
-rw-r--r--sci-geosciences/mapserver/files/5.4.2-ldflags.patch90
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch23
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch89
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch15
-rw-r--r--sci-geosciences/mapserver/files/6.1.0-php-5.4.patch69
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch22
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch511
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch56
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch35
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch20
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch34
-rw-r--r--sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch13
-rw-r--r--sci-geosciences/mapserver/files/mapserver_tcl.patch-r144
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild234
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild221
-rw-r--r--sci-geosciences/mapserver/mapserver-7.0.0.ebuild177
-rw-r--r--sci-libs/gdal/Manifest1
-rw-r--r--sci-libs/gdal/gdal-2.0.2.ebuild315
-rw-r--r--sci-libs/libgeotiff/Manifest1
-rw-r--r--sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild4
-rw-r--r--sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild74
-rw-r--r--sci-libs/proj/Manifest2
-rw-r--r--sci-libs/proj/proj-4.9.2.ebuild55
-rw-r--r--sys-apps/dmidecode/dmidecode-3.0.ebuild2
-rw-r--r--sys-apps/mlocate/mlocate-0.26-r1.ebuild4
-rw-r--r--sys-block/partitionmanager/Manifest1
-rw-r--r--sys-block/partitionmanager/partitionmanager-2.0.3.ebuild38
-rw-r--r--sys-cluster/swift/swift-2.5.0-r2.ebuild2
-rw-r--r--sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild2
-rw-r--r--sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild2
-rw-r--r--sys-kernel/genkernel/genkernel-3.4.52.2.ebuild4
-rw-r--r--sys-power/pm-quirks/pm-quirks-20100619.ebuild2
-rw-r--r--sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild2
-rw-r--r--virtual/python-asyncio/python-asyncio-0.ebuild2
-rw-r--r--virtual/python-backports_abc/python-backports_abc-0.ebuild2
-rw-r--r--virtual/python-dnspython/python-dnspython-1.ebuild2
-rw-r--r--virtual/python-futures/python-futures-0.ebuild2
-rw-r--r--virtual/python-greenlet/python-greenlet-1.0.ebuild2
-rw-r--r--virtual/python-singledispatch/python-singledispatch-0.ebuild2
-rw-r--r--virtual/w3m/w3m-0.ebuild2
-rw-r--r--www-client/opera-beta/Manifest2
-rw-r--r--www-client/opera-beta/opera-beta-36.0.2130.21.ebuild91
-rw-r--r--www-client/vivaldi/Manifest2
-rw-r--r--www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild109
-rw-r--r--www-client/w3m/w3m-0.5.3-r5.ebuild2
-rw-r--r--www-servers/tornado/tornado-4.3.ebuild2
-rw-r--r--x11-drivers/xf86-input-libinput/Manifest2
-rw-r--r--x11-drivers/xf86-input-libinput/xf86-input-libinput-0.17.0.ebuild (renamed from x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild)4
-rw-r--r--x11-drivers/xf86-video-intel/Manifest2
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160224.ebuild (renamed from x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild)10
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild2
-rw-r--r--x11-misc/shared-mime-info/Manifest1
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild58
-rw-r--r--x11-wm/stumpwm/metadata.xml48
-rw-r--r--x11-wm/stumpwm/stumpwm-0.9.9.ebuild32
-rw-r--r--x11-wm/stumpwm/stumpwm-9999.ebuild6
321 files changed, 3395 insertions, 3122 deletions
diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
index 10205fc7ef7..ec6d0a046a6 100644
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ b/app-admin/eselect/eselect-1.4.5.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$
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
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"
+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="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 1d2ee1cb6e1..710b59398b9 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1 +1,2 @@
DIST puppetdb-3.2.3.tar.gz 25469315 SHA256 3b9d121e54da1511834d708437c9c9ca15db2818314f442511bbb2e576a7afaa SHA512 d15a497bce10e1af989e1deaba99794929916362e13393814d2c5545f80ee4fb0976758c3bd0ae41466bd0364ba5df417fa69afde8bf24e6573119cdbe814aa9 WHIRLPOOL 031c14df0df52320926030e32290fb8ab5115e800711d90b2c5acdc712fa7bbcefbc83afc380bbeff4f1b30654d724a8db01c9b5ace3f6bc0deeeb31127e4443
+DIST puppetdb-3.2.4.tar.gz 25695565 SHA256 580d25ace29b61d7504dfc2650fd7e1c6a14e77421cbfafed14703d857996d84 SHA512 ff9214a4bcf2815ee4feecae91c697dc409a28acd934a82d56cdbae875fe95b5a0928a302749df2219bbc9db723402739abb2d9dc7fb70ab0934da8534a683b1 WHIRLPOOL bfecad13e578700c271fdaf403163d0c43af9affc826e7b6c0dab54b3457cd10851559ffacf53852cea1e9215c7eeba248c4e2b4260942ee5039252817f28033
diff --git a/app-admin/puppetdb/puppetdb-3.2.4.ebuild b/app-admin/puppetdb/puppetdb-3.2.4.ebuild
new file mode 100644
index 00000000000..512445aa334
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-3.2.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppetdb
+ enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+ sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+ sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ dodir /opt/puppetlabs/server/data/puppetdb
+ insinto /opt/puppetlabs/server/apps/puppetdb
+ insopts -m0744
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppetdb.jar
+ insinto /etc/puppetlabs/puppetdb
+ doins ext/config/logback.xml
+ doins ext/config/bootstrap.cfg
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetdb/conf.d
+ doins ext/config/conf.d/jetty.ini
+ doins ext/config/conf.d/repl.ini
+ doins ext/config/conf.d/database.ini
+ doins ext/config/conf.d/config.ini
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+ doins ext/cli/foreground
+ doins ext/cli/ssl-setup
+ doins ext/cli/export
+ doins ext/cli/config-migration
+ doins ext/cli/foreground
+ doins ext/cli/anonymize
+ doins ext/cli/import
+ insinto /opt/puppetlabs/server/apps/puppetdb/bin
+ doins ext/bin/puppetdb
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+ dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+ # init type tasks
+ newconfd ext/default puppetdb
+ systemd_dounit ext/redhat/puppetdb.service
+ systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+ newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetdb.logrotate.conf puppetdb
+ fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+ fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+ elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+ elog
+ elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-arch/pax/files/pax-3.4-sysmacros.patch b/app-arch/pax/files/pax-3.4-sysmacros.patch
new file mode 100644
index 00000000000..3aede97ec06
--- /dev/null
+++ b/app-arch/pax/files/pax-3.4-sysmacros.patch
@@ -0,0 +1,12 @@
+not all C libs pull in this header via sys/types.h for major()/etc...
+
+--- a/src/extern.h
++++ b/src/extern.h
+@@ -38,6 +38,7 @@
+ */
+
+ #include <sys/cdefs.h>
++#include <sys/sysmacros.h>
+
+ /*
+ * ar_io.c
diff --git a/app-arch/pax/pax-3.4.12.16-r1.ebuild b/app-arch/pax/pax-3.4.12.16-r1.ebuild
index 679fdb45f89..a14e869a02b 100644
--- a/app-arch/pax/pax-3.4.12.16-r1.ebuild
+++ b/app-arch/pax/pax-3.4.12.16-r1.ebuild
@@ -12,7 +12,7 @@ RPM_PV=$(get_version_component_range 3)
FC_PV=$(get_version_component_range 4)
DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
LICENSE="GPL-2"
@@ -26,6 +26,7 @@ src_prepare() {
rpm_spec_epatch ../${PN}.spec
epatch "${FILESDIR}"/pax-3.4-x32.patch
epatch "${FILESDIR}"/pax-3.4-fix-fts-includes.patch
+ epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
sed -i configure.in \
-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-e '/AC_PROG_RANLIB/a AC_PROG_MKDIR_P' \
diff --git a/app-arch/pax/pax-3.4.12.16.ebuild b/app-arch/pax/pax-3.4.12.16.ebuild
index 2b53d8116ce..8d485e6dc3e 100644
--- a/app-arch/pax/pax-3.4.12.16.ebuild
+++ b/app-arch/pax/pax-3.4.12.16.ebuild
@@ -12,7 +12,7 @@ RPM_PV=$(get_version_component_range 3)
FC_PV=$(get_version_component_range 4)
DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
+HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
SRC_URI="mirror://fedora-dev/releases/${FC_PV}/Everything/source/SRPMS/${MY_P}-${RPM_PV}.fc${FC_PV}.src.rpm"
LICENSE="GPL-2"
@@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
rpm_spec_epatch ../${PN}.spec
epatch "${FILESDIR}"/pax-3.4-x32.patch
+ epatch "${FILESDIR}"/pax-3.4-sysmacros.patch
sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
eautoreconf
}
diff --git a/app-backup/attic/attic-0.16.ebuild b/app-backup/attic/attic-0.16.ebuild
index b3249988f1c..909ac1f3cd7 100644
--- a/app-backup/attic/attic-0.16.ebuild
+++ b/app-backup/attic/attic-0.16.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$
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Attic is a deduplicating backup program written in Python."
@@ -29,5 +29,7 @@ RDEPEND="
libressl? ( dev-libs/libressl )
dev-python/llfuse[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}"
diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild
index b3249988f1c..909ac1f3cd7 100644
--- a/app-backup/attic/attic-9999.ebuild
+++ b/app-backup/attic/attic-9999.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$
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/jborg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Attic is a deduplicating backup program written in Python."
@@ -29,5 +29,7 @@ RDEPEND="
libressl? ( dev-libs/libressl )
dev-python/llfuse[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
${RDEPEND}"
diff --git a/app-benchmarks/phoronix-test-suite/Manifest b/app-benchmarks/phoronix-test-suite/Manifest
index 2126ac72011..45db1accc8e 100644
--- a/app-benchmarks/phoronix-test-suite/Manifest
+++ b/app-benchmarks/phoronix-test-suite/Manifest
@@ -1,2 +1,3 @@
DIST phoronix-test-suite-4.8.4.tar.gz 523952 SHA256 113e6c725672c1f379885575e7cd51a3d0a387dc1c842606840e27fcd4695e43 SHA512 e7c201467a52fbbb9b0a87a47bd1eb772e24e43bedc2baf02845a9e9f355d6c22f46901be390d501a0e721ccfa05d28da4b8362817518ba5c801d6f4422c3b6f WHIRLPOOL 0760916473d8544652c0fc9c53f57a41015aacb99b42f53186d8b5008cbe5b2b396b024ce51ba3a3e31c35b319bac63db17db2b29295a8414c031c16d73813f6
DIST phoronix-test-suite-4.8.5.tar.gz 524136 SHA256 ca7bcbb5c72bee24075200449ee33fc75490ba528f804505d62fc3826d15456e SHA512 e37acdb48ba9ca532a6f409aea1c05b11b4320b967aac4576491ba5d401262d149f376506fef50ccee5506b77686aeed7a404102527472250cb7b5c1a247246a WHIRLPOOL be340514f3fdebafda449d60f069efcd44fa97d567b90616dc7332810d2802ed13433c94438937cab37f36744ddd383a918ceac92874f2702f28715c56ba3f9c
+DIST phoronix-test-suite-6.2.1.tar.gz 836633 SHA256 2b83d1c552d13b6e3fc6dde288b661698122003250b1eefe823d99dcabbb91f1 SHA512 d4e3d29645be76804c4ce96f8072d43653607fb34fd003771e614f4b5213c7bf8d9d629261ff2c696e685196d08e05a935d5a496d139a6e9efa37df9c5550fd6 WHIRLPOOL 808963909db7ff227515b05b404c4c1dec106f38c5cd47139b5e059a82d05d82ff47e277f7f6af0eda63c3fc3f3e83ff86d7fa58a5abc4561ef615646f3dcf86
diff --git a/app-benchmarks/phoronix-test-suite/phoronix-test-suite-6.2.1.ebuild b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-6.2.1.ebuild
new file mode 100644
index 00000000000..d67968b17c8
--- /dev/null
+++ b/app-benchmarks/phoronix-test-suite/phoronix-test-suite-6.2.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Phoronix's comprehensive, cross-platform testing and benchmark suite"
+HOMEPAGE="http://www.phoronix-test-suite.com"
+SRC_URI="http://www.phoronix-test-suite.com/download.php?file=${P} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+# php 5.3 doesn't have pcre and reflection useflags anymore
+RDEPEND="dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ sed -i -e "s,export PTS_DIR=\`pwd\`,export PTS_DIR=\"/usr/share/${PN}\"," \
+ phoronix-test-suite
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ dodir /usr/share/${PN}
+ insinto /usr/share/${PN}
+
+ doman documentation/man-pages/phoronix-test-suite.1
+ dodoc AUTHORS ChangeLog README.md
+ dohtml -r documentation/
+ doicon pts-core/static/images/phoronix-test-suite.png
+ doicon pts-core/static/images/openbenchmarking.png
+ domenu pts-core/static/phoronix-test-suite.desktop
+ rm -f pts-core/static/phoronix-test-suite.desktop
+
+ doins -r pts-core
+ exeinto /usr/bin
+ doexe phoronix-test-suite
+
+ fperms a+x /usr/share/${PN}/pts-core/static/root-access.sh
+ fperms a+x /usr/share/${PN}/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
+
+ newbashcomp pts-core/static/bash_completion ${PN}
+
+ # Need to fix the cli-php config for downloading to work. Very naughty!
+ local slots
+ local slot
+ if [[ "x${PHP_TARGETS}" == "x" ]] ; then
+ ewarn
+ ewarn "PHP_TARGETS seems empty, php.ini file can't be configured."
+ ewarn "Make sure that PHP_TARGETS in /etc/make.conf is set."
+ ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+ ewarn "for downloading to work properly."
+ ewarn
+ else
+ for slot in ${PHP_TARGETS}; do
+ slots+=" ${slot/-/.}"
+ done
+ fi
+
+ for slot in ${slots}; do
+ local PHP_INI_FILE="/etc/php/cli-${slot}/php.ini"
+ if [[ -f ${PHP_INI_FILE} ]] ; then
+ dodir $(dirname ${PHP_INI_FILE})
+ cp ${PHP_INI_FILE} "${D}${PHP_INI_FILE}"
+ sed -e 's|^allow_url_fopen .*|allow_url_fopen = On|g' -i "${D}${PHP_INI_FILE}"
+ else
+ if [[ "x$(eselect php show cli)" == "x${slot}" ]] ; then
+ ewarn
+ ewarn "${slot} hasn't a php.ini file."
+ ewarn "phoronix-test-suite needs the 'allow_url_fopen' option set to \"On\""
+ ewarn "for downloading to work properly."
+ ewarn "Check that your PHP_INI_VERSION is set during ${slot} merge"
+ ewarn
+ else
+ elog
+ elog "${slot} hasn't a php.ini file."
+ elog "phoronix-test-suite may need the 'allow_url_fopen' option set to \"On\""
+ elog "for downloading to work properly if you switch to ${slot}"
+ elog "Check that your PHP_INI_VERSION is set during ${slot} merge"
+ elog
+ fi
+ fi
+ done
+
+ ewarn
+ ewarn "If you upgrade from phoronix-test-suite-2*, you should reinstall all"
+ ewarn "your tests because"
+ ewarn " \$HOME/.phoronix-test-suite/installed-tests/\$TEST_NAME/"
+ ewarn "moves to"
+ ewarn " \$HOME/.phoronix-test-suite/installed-tests/pts/\$TEST_NAME-\$TEST_VERSION/"
+ ewarn "in phoronix-test-suite-3* version. The \$TEST_VERSION can be find in"
+ ewarn "pts-install.xml file."
+ ewarn
+}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 3a0cd29d3ed..3bac6da3484 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,3 +1,4 @@
DIST siege-3.0.6.tar.gz 496002 SHA256 78b79964e3d6772e532c6008a084700f830a02a00ca80b44f3e71380b4908c5b SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b WHIRLPOOL 0c94eb828681b2ab67cab13bbaf802f25804e976f4f1eac6cb3cb45160ee6dd2f73d726c39f9ab6be6e4243ac4c6c79d76f406eba72d3fe4a929fb24838b1de0
DIST siege-3.1.0.tar.gz 502444 SHA256 f6a104cb2a3ac6c0efb2699649e8c4f8da2b548147bbbb7af2483089e4940e7f SHA512 b5c0ed75795096dd6c78856747acd1cb778f54ece4ee7b735e676edc898677dd0d23fa544ae249fa6ed9e7780a118936372c271ff24b73f2a54402a94cc0a67a WHIRLPOOL 9a79b0a58fc54c7005406319494acc14fa80c2b98c7c519a39fea92dcded3d330351fa2da7830ff8d52de91744a8646d62b89f8330cf184e7539c86f60065aa0
DIST siege-3.1.3.tar.gz 527862 SHA256 4d3932ea23cbf6d1d22df7c7ee6e7a6bc9f591b604ab582393eeb62f393f5a33 SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b WHIRLPOOL 48e9bb9cd6c66005d17fc8bde1de62d18148114aca48700f26fd3b4710d6dd912dd2e022bbacb3b9adc636fb7003c2a6f561340794aef8142f33fcfe29baa8d9
+DIST siege-3.1.4.tar.gz 530149 SHA256 0436970ca81ade76eb419bc42d3f8460b475079eb5d8f199d2fa83328893099d SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068 WHIRLPOOL 2081e4661a1272d99f16ff350d241c4ba26a6cec7ba34a0968d8db94e2195e0d3f9b1b5b47b5c0575b6b9af0d02d386b020dbcc46ebccdff47bed8e9cd5bd8eb
diff --git a/app-benchmarks/siege/siege-3.1.4.ebuild b/app-benchmarks/siege/siege-3.1.4.ebuild
new file mode 100644
index 00000000000..f8d6138e1c4
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home/"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d:= )"
+DEPEND="${RDEPEND}
+ sys-devel/libtool"
+
+src_prepare() {
+ # bundled macros break recent libtool
+ sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
+ rm *.m4 || die "failed to remove bundled macros"
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
+ doc/siegerc doc/urls.txt
+
+ newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+ echo
+ elog "An example ~/.siegerc file has been installed in"
+ elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
index 45315ec7d19..9b74a9c3d8f 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug hfs unicode"
RDEPEND="app-arch/bzip2
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c193ff5c66f..0216bc8394c 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +1,3 @@
DIST doxygen-1.8.10.src.tar.gz 4818276 SHA256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 SHA512 a7f29b5f7b9f55b7e5382b7b7dc7212247a27869bc265433c0ee51480645b3f5f0732d1f5aefd54952204c8a1c98b96ec1ecc22c1ff7a072db5b2356b5981074 WHIRLPOOL 5607e1da5cf8e653ec895a7601a3a6585790a555207928bde6d154ab06173c68e088a61c1963da8d8cdc1a571b66eeaa102acc2a2e4291e0be87634d8e554962
+DIST doxygen-1.8.11.src.tar.gz 4834291 SHA256 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 SHA512 44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e WHIRLPOOL 240c84bd02ea3ab747e59bb8db434e40e743ed24cbb8ca78b8846d3bb4f7672497106fd620c14851c06d80e474301811978def5d85db5b01df97b40a4ec74813
DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
index 54a13b32fc2..86e2e326d46 100644
--- a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.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$
@@ -55,7 +55,7 @@ DEPEND="sys-apps/sed
${RDEPEND}"
# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="mirror test"
+RESTRICT="test"
EPATCH_SUFFIX="patch"
get_langs() {
diff --git a/app-doc/doxygen/doxygen-1.8.11.ebuild b/app-doc/doxygen/doxygen-1.8.11.ebuild
new file mode 100644
index 00000000000..fefba30fbd0
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.11.ebuild
@@ -0,0 +1,186 @@
+# 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} )
+
+inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
+ SRC_URI=""
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+else
+ SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
+
+#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
+LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
+nl nb pl pt ro ru sl sk sr sv tr uk vi af)
+for X in "${LANGS[@]}" ; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="app-text/ghostscript-gpl
+ dev-lang/perl
+ media-libs/libpng
+ virtual/libiconv
+ clang? ( sys-devel/clang )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doxysearch? ( =dev-libs/xapian-1.2* )
+ latex? ( app-text/texlive[extra] )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ "
+
+REQUIRED_USE="doc? ( latex )"
+
+DEPEND="sys-apps/sed
+ sys-devel/flex
+ sys-devel/bison
+ doc? ( ${PYTHON_DEPS} )
+ ${RDEPEND}"
+
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="test"
+EPATCH_SUFFIX="patch"
+
+get_langs() {
+ # using only user set linguas also fixes #263641
+ my_linguas=()
+ for lingua in ${LINGUAS}; do
+ if has ${lingua} "${LANGS[@]}"; then
+ case ${lingua} in
+ hy) lingua=am ;;
+ pt_BR) lingua=br ;;
+ zh*) lingua=cn ;;
+ cs) lingua=cz ;;
+ da) lingua=dk ;;
+ el*) lingua=gr ;;
+ ja*) lingua=jp ;;
+ ko) lingua=kr ;;
+ nb) lingua=no ;;
+ sl) lingua=si ;;
+ tr*) lingua=tr ;;
+ uk) lingua=ua ;;
+ af) lingua=za ;;
+ esac
+ has ${lingua} "${my_linguas[@]}" ||
+ my_linguas+=(${lingua})
+ fi
+ done
+ f_langs="${my_linguas[@]^^}"
+ echo ${f_langs// /;}
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # Ensure we link to -liconv
+ if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
+ for pro in */*.pro.in */*/*.pro.in; do
+ echo "unix:LIBS += -liconv" >> "${pro}"
+ done
+ fi
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
+
+ epatch "${FILESDIR}"/${P}-link_with_pthread.patch
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ if is-flagq "-O3" ; then
+ echo
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen."
+ echo
+ elog "Continuing with -O2 instead ..."
+ echo
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR="share/doc/${P}"
+ -DLANG_CODES="$(get_langs)"
+ $(cmake-utils_use clang use_libclang)
+ $(cmake-utils_use doc build_doc)
+ $(cmake-utils_use doxysearch build_search)
+ $(cmake-utils_use qt5 build_wizard)
+ $(cmake-utils_use sqlite use_sqlite3)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ # generate html and pdf documents. errors here are not considered
+ # fatal, hence the ewarn message TeX's font caching in /var/cache/fonts
+ # causes sandbox warnings, so we allow it.
+ if use doc; then
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {Doxyfile,doc/Doxyfile} \
+ || ewarn "disabling dot failed"
+ fi
+ cd "${BUILD_DIR}" && emake docs
+ fi
+}
+
+src_install() {
+ if use qt5; then
+ doicon "${DISTDIR}/doxywizard.png"
+ make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+ "/usr/share/pixmaps/doxywizard.png" \
+ "Development"
+ fi
+
+ dodoc LANGUAGE.HOWTO README.md
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ elog
+ elog "For examples and other goodies, see the source tarball. For some"
+ elog "example output, run doxygen on the doxygen source using the"
+ elog "Doxyfile provided in the top-level source dir."
+ elog
+ elog "Disabling the dot USE flag will remove the GraphViz dependency,"
+ elog "along with Doxygen's ability to generate diagrams in the docs."
+ elog "See the Doxygen homepage for additional helper tools to parse"
+ elog "more languages."
+ elog
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index e26d99d9a32..6be87bcb1ac 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.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
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2
+inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.doxygen.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU"
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
@@ -43,7 +43,10 @@ RDEPEND="app-text/ghostscript-gpl
)
doxysearch? ( =dev-libs/xapian-1.2* )
latex? ( app-text/texlive[extra] )
- qt4? ( dev-qt/qtgui:4 )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
sqlite? ( dev-db/sqlite:3 )
"
@@ -56,7 +59,7 @@ DEPEND="sys-apps/sed
${RDEPEND}"
# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="mirror test"
+RESTRICT="test"
EPATCH_SUFFIX="patch"
get_langs() {
@@ -83,7 +86,7 @@ get_langs() {
my_linguas+=(${lingua})
fi
done
- f_langs="${my_linguas[@]}"
+ f_langs="${my_linguas[@]^^}"
echo ${f_langs// /;}
}
@@ -102,10 +105,7 @@ src_prepare() {
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
- # prefix search tools patch, plus OSX fixes
- epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
-
- epatch "${FILESDIR}"/${P}-link_with_pthread.patch
+ epatch "${FILESDIR}"/${PN}-1.8.11-link_with_pthread.patch
# fix pdf doc
sed -i.orig -e "s:g_kowal:g kowal:" \
@@ -129,7 +129,7 @@ src_configure() {
$(cmake-utils_use clang use_libclang)
$(cmake-utils_use doc build_doc)
$(cmake-utils_use doxysearch build_search)
- $(cmake-utils_use qt4 build_wizard)
+ $(cmake-utils_use qt5 build_wizard)
$(cmake-utils_use sqlite use_sqlite3)
)
@@ -153,7 +153,7 @@ src_compile() {
}
src_install() {
- if use qt4; then
+ if use qt5; then
doicon "${DISTDIR}/doxywizard.png"
make_desktop_entry doxywizard "DoxyWizard ${PV}" \
"/usr/share/pixmaps/doxywizard.png" \
diff --git a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch
new file mode 100644
index 00000000000..cdc630c4d42
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch
@@ -0,0 +1,32 @@
+diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
+index 33e01c1..165fc3e 100644
+--- a/addon/doxysearch/CMakeLists.txt
++++ b/addon/doxysearch/CMakeLists.txt
+@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer
+ ${ZLIB_LIBRARIES}
+ ${WIN_EXTRA_LIBS}
+ qtools
++ pthread
+ )
+
+ add_executable(doxysearch.cgi
+@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi
+ ${XAPIAN_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${WIN_EXTRA_LIBS}
++ pthread
+ )
+
+ install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
+index bf2eda8..8eb2a1c 100644
+--- a/addon/doxywizard/CMakeLists.txt
++++ b/addon/doxywizard/CMakeLists.txt
+@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC}
+ qt_use_modules(doxywizard Core Gui Widgets Xml)
+ target_link_libraries(doxywizard
+ ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
++pthread
+ )
+
+ install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 529450773bb..c2ecc1f6233 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,3 @@
DIST GuideXML-templates.tar.gz 884 SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e SHA512 1a303c8f0664d950b89430f940fc27b8cc4f3b76d076437e62edbc736c50bce5794a7178a2c99712a29db4de7e9e8b03c0f598ab702e4289cb77625d5a63ab30 WHIRLPOOL 6094faa76f1b731537e5d254cdd33a98830c22ad4fb99817fd8332b59a03451bf9e3c14ef2fc71c32ed2c74bf1c1ca132210aaf3b2bdeb4342f2a0fc24505f6f
DIST xmlcopyeditor-1.2.0.12.tar.gz 4052354 SHA256 7f33795ca8c6c25207970a4933ff41651314dbd9fd73e94ae68dfde100baa415 SHA512 501ad0302d0dfd3a695adc430ca4b2a720092c04797ee9d2da597971be3c10a51984ab3d444b044f058ba6b1b7a384f71c16aac9fa30e7eb32d509d56972e349 WHIRLPOOL 7b731890a61a2c6742c3c97de9e661fe625a72d289711f9d04cd376e16b3f37dfde8b2d595fdd7ab35d1de8b2e992fdd0e2c824f9b915744f2e52fd2830a9f86
-DIST xmlcopyeditor-1.2.0.6-2.tar.gz 1526457 SHA256 9a4ba41d67604d303b1728877768f9e3ef85d56e6f580b0eeef840e12b84f02c SHA512 9833a520ed835ea1bb285ace9deca3e309a5b31fd923582f79302cd1b81e5caf1de39296efe6eda33d329b2c40aabb10bcd7b476e61d8b3ea6e5aac43b361b72 WHIRLPOOL 9e79075e4a0b325a08b9784a5bcdfdd414390d161440a47394bf63ed5944e700fef4c61e6e29c508ec7bfee802f527a5b393824d48ac82bd55527231ba341916
-DIST xmlcopyeditor-1.2.0.9.tar.gz 1815995 SHA256 850df750f3561320f6ab1b612e00cd2b9ecc2bed49ab1dcc261af78d0a28b7f7 SHA512 a375476fe1140a2089e7322c9d219ae3440a3b971947ced440f71c72e99b3b3998419bf34303df3e6093378336b2d69652c4e7dc93880ff40d8c3fac48103eaa WHIRLPOOL 75bbd422c7618650d183eac45f24871a80bf8cffcaa9f3d320d7fcb0a282cabf1f14b9f825e893373b85d99bd6c5f58db882a91eb427c9775822ce417f5d5278
+DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 SHA256 9b684b5042b4af85d3626fd55108bd1d63c0007b5c794ef7cc4b026012b29d2f SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d WHIRLPOOL c536382a6669f54f7abb84f31de57fc1cc11c85ddc20a90828c39e5edb2d112a741b9d1d7e5a0011b4c4ae337bf12f31ec556b9fd4a54da2219b754e48434df5
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index 90e12aac80c..ee6b0abe16e 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -2,17 +2,13 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>dabbott@gentoo.org</email>
- <name>David Abbott</name>
- <description>Maintainer. Assign bugs to him</description>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>rhill@gentoo.org</email>
+ <name>Ryan Hill</name>
+ <description>Maintainer</description>
</maintainer>
<longdescription>
Fast, free, validating XML editor.
-</longdescription>
+ </longdescription>
<use>
<flag name="guidexml">Install GuideXML templates to work with Gentoo
official docs</flag>
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild
deleted file mode 100644
index 255dfa477a9..00000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-MY_P=${P}-2
-
-inherit autotools eutils wxwidgets
-
-DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
-HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xml-copy-editor/${MY_P}.tar.gz
- guidexml? ( mirror://gentoo/GuideXML-templates.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua guidexml"
-
-RDEPEND=">=dev-libs/libxml2-2.7.3-r1
- dev-libs/libxslt
- dev-libs/xerces-c[icu]
- dev-libs/libpcre
- app-text/aspell
- !aqua? ( x11-libs/wxGTK:2.8[X] )
- aqua? ( x11-libs/wxGTK:2.8[aqua] )"
-DEPEND="${RDEPEND}
- dev-libs/boost"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
- # fix desktop file
- sed -i -e '/Categories/s/Application;//' \
- -e '/Icon/s/.png//' \
- "src/${PN}.desktop" || die "sed on src/${PN}.desktop failed"
- # bug #440744
- sed -i -e 's/ -Wall -g -fexceptions//g' \
- -e '/CXXFLAGS/s/CPPFLAGS/CXXFLAGS/' \
- configure.in || die 'sed on configure.in failed'
- # bug #464280
- epatch "${FILESDIR}/${P}-gcc-4.8.patch"
-
- eautoreconf
-}
-
-src_install() {
- default
- if use guidexml; then
- insinto /usr/share/xmlcopyeditor/templates/
- for TEMPLATE in "${WORKDIR}"/GuideXML-templates/*.xml; do
- newins "${TEMPLATE}" "${TEMPLATE##*/}"
- done
- fi
-}
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild
deleted file mode 100644
index a33e4e154b6..00000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils wxwidgets
-
-DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
-HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz
- guidexml? ( mirror://gentoo/GuideXML-templates.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua guidexml"
-
-RDEPEND="app-text/aspell
- >=dev-libs/libxml2-2.7.3-r1
- dev-libs/libxslt
- dev-libs/xerces-c[icu]
- dev-libs/libpcre
- !aqua? ( x11-libs/wxGTK:2.8[X] )
- aqua? ( x11-libs/wxGTK:2.8[aqua] )"
-DEPEND="${RDEPEND}
- dev-libs/boost"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
- # fix desktop file
- sed -i -e '/Categories/s/Application;//' \
- -e '/Icon/s/.png//' \
- "src/${PN}.desktop" || die "sed on src/${PN}.desktop failed"
- # bug #440744
- sed -i -e 's/ -Wall -g -fexceptions//g' \
- -e '/CXXFLAGS/s/CPPFLAGS/CXXFLAGS/' \
- configure.in || die 'sed on configure.in failed'
- # bug #464280
- epatch "${FILESDIR}/${PN}-1.2.0.6-gcc-4.8.patch"
-
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use guidexml; then
- insinto /usr/share/xmlcopyeditor/templates/
- for TEMPLATE in "${WORKDIR}"/GuideXML-templates/*.xml; do
- newins "${TEMPLATE}" "${TEMPLATE##*/}"
- done
- fi
-
-}
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
new file mode 100644
index 00000000000..c28d341dc27
--- /dev/null
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+WX_GTK_VER="3.0"
+
+inherit autotools wxwidgets
+
+DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
+HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="aqua nls"
+
+RDEPEND="
+ app-text/aspell
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/xerces-c[icu]
+ dev-libs/libpcre
+ !aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+ aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-util/intltool"
+
+DOCS=( AUTHORS ChangeLog README NEWS )
+
+src_prepare() {
+ # bug #440744
+ sed -i -e 's/ -Wall -g -fexceptions//g' configure.ac || die
+ eautoreconf
+
+ need-wxwidgets unicode
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 155d4003103..4a1c8126a24 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,2 +1 @@
-DIST libvirt-glib-0.2.2.tar.gz 853052 SHA256 d7be16025231c91ccae43838b7cdb1d55d181856a2a50b0f7b1c5078ad202d9d SHA512 77adcf74dd057b8c5e3c21e1fbe0a99eedbe0005d0247c0173bce69e4e6209dbffe18c7a2f0de9a4c279f138ab5bcc360c14cc2335d0b2b55f22b5819c3e5b70 WHIRLPOOL 628d76cf20fe0b707a56688ad4f17c2c95b12b89fe89f4628e42cee2e8c5855aeac0e06ad45fe71fb63ae935b1ff7a17ee69f294b8358653f7cbcd03aea59876
DIST libvirt-glib-0.2.3.tar.gz 876258 SHA256 c3b11aa34584b3416148b36bb005505e461830c73c9fd2f40143cca3309250dd SHA512 007e642724658e7f2d4ad10094e70a93186196467140662d5e71644ae8efac25a7f60dcf51b55b60d056d3079ecf0798428e077cb6110292ce5f2a474db9e369 WHIRLPOOL 594ab70f4647e053d9540e857aeba7853491200d825eed713a1025afe5eabbe2f3c698d30b00e0da1735f2fc8465212eae2a965fb93a68099df5d11ce494a0d2
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild
deleted file mode 100644
index 4b1ff53b328..00000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 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=( python2_7 )
-
-inherit gnome2 python-single-r1 vala
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection python +vala"
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- vala? ( introspection )
-"
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libxml2:2
- >=app-emulation/libvirt-1.2.6:=
- >=dev-libs/glib-2.38.0:2
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-test-coverage \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala) \
- $(use_with python)
-}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
index 0ce6e0862ab..fbc3fc2814d 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.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$
@@ -15,7 +15,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection python +vala"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-emulation/qemu/qemu-2.5.0-r1.ebuild b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
index 8c353391966..5037f8d30b4 100644
--- a/app-emulation/qemu/qemu-2.5.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0-r1.ebuild
@@ -20,7 +20,7 @@ else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -122,7 +122,10 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
media-libs/libsdl2[static-libs(+)]
)
)
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ seccomp? (
+ arm64? ( >=sys-libs/libseccomp-2.2.3[static-libs(+)] )
+ >=sys-libs/libseccomp-2.1.0[static-libs(+)]
+ )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? (
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
index 858b0c34231..0220e1b83f1 100644
--- a/app-emulation/rkt/rkt-1.0.0.ebuild
+++ b/app-emulation/rkt/rkt-1.0.0.ebuild
@@ -30,6 +30,7 @@ REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
+ app-crypt/trousers
sys-fs/squashfs-tools
dev-perl/Capture-Tiny"
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
index fcb665c9746..72c10a9e6dc 100644
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
+ app-crypt/trousers
sys-fs/squashfs-tools
dev-perl/Capture-Tiny
rkt_stage1_src? (
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 452a7d43090..c29e3678053 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1 @@
-DIST virt-manager-1.1.0.tar.gz 2509440 SHA256 ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 SHA512 8c3aa56e13f1ec4a67e353b15b4f61bdc067300dbc459790b04e5f5258bf526694ec712a9f74d7af48ddd271081d48ae98d576f4bc5ed139e046620a9aa64e2d WHIRLPOOL aaffdf75b313c88a10648503bf552357139aff2a1624da1b17cac3975fec21ad6c3ccce00999ef8f4f1f4731aabf5ae2c07e70e453785caefe932c3b0deab456
-DIST virt-manager-1.2.1.tar.gz 2524812 SHA256 74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be SHA512 b99144f498bc2f28c98bb2395e0a9c2fe244a3da476892698ff0f1fd4a6d36a8ddf53e13561593c5e94932ce8176a27092c818ed218634fc5201666ad6792791 WHIRLPOOL d2402087453ec720add0a815433e9feda1bd36e253178dfe1cf27f52e0ad41a13e1e1d6a9977b63485ed8acc257d93c903625b775c6ab130ea7235e52be0e8fc
-DIST virt-manager-1.3.0.tar.gz 2564090 SHA256 a6ebec0dd695b195778c5d710c7b6f1cd28d3ccb8b128fa006eebb35b156a315 SHA512 8cba9ad45aa3b070e29ec72cc45c5eb88231dfb0ef2a24cdc913acdf30158d29cc0b18e23f168fb5eafa4d890b5cd286a04669210b1411701adc912e29274101 WHIRLPOOL 379c54e1541b2186b1c218849758a917a8913e92603f8c492e707c206ef1fb7084bb7f21c474d6829e613b5ba524684562c1b3d696823478909f2a9d5a0f780f
DIST virt-manager-1.3.2.tar.gz 2564573 SHA256 270c1f631fd029fee5291e83f50d69e261db666aa952c184643bc6cece77fdb3 SHA512 a60efa8ecd0a3fad50f2ab3b7f27347e3fc7ac1928e7bfc13860f6fed6d929399fbd072d1dfe2424de38a3926fcf03d0092a43b958601bc6af6f87f2cad0aaab WHIRLPOOL b1e59c17d5891aa19a2965a93d601e7f677141b1730ad3a717b97e9d799328bc94f276c12c53f7ea61f1d67458ca7d7a37d5dedf49a1a95a446b1651a6e575a3
diff --git a/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch b/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch
deleted file mode 100644
index a480148d8c5..00000000000
--- a/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/virtManager/connect.py b/virtManager/connect.py
-index f7f268e..c19c224 100644
---- a/virtManager/connect.py
-+++ b/virtManager/connect.py
-@@ -95,7 +95,10 @@ class vmmConnect(vmmGObjectUI):
- self.avahiserver = Gio.DBusProxy.new_sync(self.dbus, 0, None,
- "org.freedesktop.Avahi", "/",
- "org.freedesktop.Avahi.Server", None)
-+ self.avahiserver.GetVersionString()
-+ logging.debug("self.avahiserver=%s", self.avahiserver)
- except Exception, e:
-+ self.avahiserver = None
- logging.debug("Couldn't contact avahi: %s", str(e))
-
- self.reset_state()
diff --git a/app-emulation/virt-manager/virt-manager-1.1.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-1.1.0-r2.ebuild
deleted file mode 100644
index 4d97c50c3cc..00000000000
--- a/app-emulation/virt-manager/virt-manager-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- KEYWORDS=""
- EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
-else
- SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- >=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/urlgrabber[${PYTHON_USEDEP}]
- sys-libs/libosinfo[introspection]
- gtk? (
- x11-libs/gtk+:3[introspection]
- gnome-base/dconf
- >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
- net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
- net-misc/x11-ssh-askpass
- x11-libs/vte:2.90[introspection]
- gnome-keyring? ( dev-python/gnome-keyring-python )
- policykit? ( sys-auth/polkit[introspection] )
- x11-themes/gnome-icon-theme
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/intltool"
-
-DOCS=( README NEWS )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-optional_avahi.patch
-
- distutils-r1_src_prepare
-}
-
-distutils-r1_python_compile() {
- local defgraphics=
-
- esetup.py configure \
- --qemu-user=qemu \
- --default-graphics=spice
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- python_fix_shebang \
- "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_pkg_preinst
-
- cd "${ED}"
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- else
- rm -rf "${ED}/usr/share/virt-manager/virtManager"
- rm -f "${ED}/usr/share/virt-manager/virt-manager"
- rm -rf "${ED}/usr/share/virt-manager/ui/"
- rm -rf "${ED}/usr/share/virt-manager/icons/"
- rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
- rm -rf "${ED}/usr/share/icons/"
- rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
- rm -rf "${ED}/usr/bin/virt-manager"
- fi
-}
-
-pkg_postinst() {
- use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.2.1.ebuild b/app-emulation/virt-manager/virt-manager-1.2.1.ebuild
deleted file mode 100644
index b79811547c1..00000000000
--- a/app-emulation/virt-manager/virt-manager-1.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- KEYWORDS=""
- EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
-else
- SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- >=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/urlgrabber[${PYTHON_USEDEP}]
- sys-libs/libosinfo[introspection]
- gtk? (
- x11-libs/gtk+:3[introspection]
- gnome-base/dconf
- >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
- net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
- net-misc/x11-ssh-askpass
- x11-libs/vte:2.90[introspection]
- gnome-keyring? ( dev-python/gnome-keyring-python )
- policykit? ( sys-auth/polkit[introspection] )
- x11-themes/gnome-icon-theme
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/intltool"
-
-DOCS=( README NEWS )
-
-src_prepare() {
- distutils-r1_src_prepare
-}
-
-distutils-r1_python_compile() {
- local defgraphics=
-
- esetup.py configure \
- --qemu-user=qemu \
- --default-graphics=spice
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- python_fix_shebang \
- "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_pkg_preinst
-
- cd "${ED}"
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- else
- rm -rf "${ED}/usr/share/virt-manager/virtManager"
- rm -f "${ED}/usr/share/virt-manager/virt-manager"
- rm -rf "${ED}/usr/share/virt-manager/ui/"
- rm -rf "${ED}/usr/share/virt-manager/icons/"
- rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
- rm -rf "${ED}/usr/share/icons/"
- rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
- rm -rf "${ED}/usr/bin/virt-manager"
- fi
-}
-
-pkg_postinst() {
- use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild
deleted file mode 100644
index 9a6fb846d3e..00000000000
--- a/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- KEYWORDS=""
- EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
- SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
- it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te
- tr uk vi zh_CN zh_TW )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}"
-
-RDEPEND="!app-emulation/virtinst
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- >=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=sys-libs/libosinfo-0.2.10[introspection]
- gtk? (
- x11-libs/gtk+:3[introspection]
- gnome-base/dconf
- >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
- net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
- net-misc/x11-ssh-askpass
- x11-libs/vte:2.90[introspection]
- gnome-keyring? ( dev-python/gnome-keyring-python )
- policykit? ( sys-auth/polkit[introspection] )
- x11-themes/gnome-icon-theme
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-util/intltool"
-
-DOCS=( README NEWS )
-
-src_prepare() {
- distutils-r1_src_prepare
-
- local lang
- for lang in ${VM_LINGUAS[@]}; do
- use linguas_${lang} || rm -v "po/${lang}.po" || die
- done
-}
-
-distutils-r1_python_compile() {
- local defgraphics=
-
- esetup.py configure \
- --qemu-user=qemu \
- --default-graphics=spice
-}
-
-src_install() {
- local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-
- distutils-r1_src_install
-
- python_fix_shebang \
- "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_pkg_preinst
-
- cd "${ED}"
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- else
- rm -rf "${ED}/usr/share/virt-manager/virtManager"
- rm -f "${ED}/usr/share/virt-manager/virt-manager"
- rm -rf "${ED}/usr/share/virt-manager/ui/"
- rm -rf "${ED}/usr/share/virt-manager/icons/"
- rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
- rm -rf "${ED}/usr/share/icons/"
- rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
- rm -rf "${ED}/usr/bin/virt-manager"
- fi
-}
-
-pkg_postinst() {
- use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-1.3.2.ebuild b/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
index dced9d8224e..843475c1a96 100644
--- a/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.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$
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
else
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 85a94395def..de92e7d4b0b 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,3 +1 @@
-DIST virt-viewer-2.0.tar.gz 771874 SHA256 e9c583bcb5acdabac6a8a13eff6ce4e093a3050645771628f832e15ce685d437 SHA512 271ded11e4af3f1dd208c7b8ab7d1c0cd24f641a79e05178d0762a03de3dcf99ae7432acde2b67460e7a98d1fa562587b6b08cf06ab3cf80f025a7b259e8203e WHIRLPOOL aba5eabc490c5b998dfb4b1f5bbac6ae43affc782ccf19072e3a23333607256ce65328e80d46673ab6c25e38ba1bcd8410c270e213d0e28534fd141fd7d90ed3
-DIST virt-viewer-3.0.tar.gz 832490 SHA256 6331fd64ef9e999e0943844ddc0f89d35bd91bcc9c8e919f7274500930e97144 SHA512 8a7ca7ef6315d63e15b5ed5232d82c1ce119468e7e0b098a4c2aaf7ef8b85b02070183275523f944ee8aa93e0d2feafa863f632eadc78d15bd4dfa81f0b2abd3 WHIRLPOOL d3fe3d9aea3c35e8554d0fe6bdecad47231f476d40e11f6303e54d8476aba524a9a6ce0edadb3302b903e5d7aec5ac5caaf28c376f7ffddc33ace23ee9dbcc48
DIST virt-viewer-3.1.tar.gz 835147 SHA256 be4e49470b650fc22513c2c01f2e13e30ee2d494d0d7b319b6f414ca781078c7 SHA512 72deb289c32a315fc4e1d73148d0b0a366cf929ff9fb389b62d750d317d02a43e2bf3bc170f43d9f37a184d8c7754b3e282de404fbcfa59ff278a87e4aa0acaf WHIRLPOOL 90f47dfc79f1529272fae8fbaf7553c369a9c2161b63071037fcb5279050a5ff9391800922e2a43f5c37e133b13f6736b59f3574531e22ce7dd27d2de9c714cf
diff --git a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
deleted file mode 100644
index bdad6c79f29..00000000000
--- a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2 fdo-mime
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
- >=dev-libs/libxml2-2.6
- x11-libs/gtk+:3
- spice? ( >=net-misc/spice-gtk-0.22[sasl?,gtk3] )
- vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- spice? ( >=app-emulation/spice-protocol-0.10.1 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-pkg_setup() {
- G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
- G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt --disable-update-mimedb"
-}
-
-src_prepare() {
- epatch_user
-}
-
-src_test() {
- default
-}
-
-src_install() {
- default
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-3.0.ebuild b/app-emulation/virt-viewer/virt-viewer-3.0.ebuild
deleted file mode 100644
index 0e7c8b57785..00000000000
--- a/app-emulation/virt-viewer/virt-viewer-3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils gnome2 fdo-mime
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
- >=dev-libs/libxml2-2.6
- x11-libs/gtk+:3
- spice? ( >=net-misc/spice-gtk-0.30[sasl?,gtk3] )
- vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-pkg_setup() {
- G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
- G2CONF="${G2CONF} --with-gtk=3.0 --without-ovirt --disable-update-mimedb"
-}
-
-src_prepare() {
- epatch_user
-}
-
-src_test() {
- default
-}
-
-src_install() {
- default
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-3.1.ebuild b/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
index 2aae4d7c574..9921e93195a 100644
--- a/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="sasl +spice +vnc"
RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
index da154f27f85..d7646beaca0 100644
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
index e02ae6f2d17..e7924a338a4 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-1.2.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gentoo.org/"
SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
LICENSE="GPL-2"
SLOT="0"
-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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 97594f026fa..047742a2628 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~sparc ~x86"
IUSE=""
DEPEND=""
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index f14f84c10a4..4b3c000f7e9 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,2 +1,2 @@
-DIST zsh-completions-0.14.0.tar.gz 199317 SHA256 54e4f5aad66acd729c46f589dc0b9f2a518b453892e4c21e495f33bb959c7eef SHA512 fd2fa683c5990fba9dfa12e839d70c24b7821b487175f5c51d603d21a494f7e9e921628fdd8fff1c02f8c2f52ac1fba1f48638da6a356240e0b7806c1b747ec2 WHIRLPOOL 28df4d93c0bf80bd5c3bb2c189897042e0cfd99fef77492adfe410dca96e140a8e654c0a896b45991f3605822a209d6561f7b196344b704ccd718f0a284f3e28
DIST zsh-completions-0.15.0.tar.gz 217047 SHA256 358c576a44247959966d65f673d2861f232dbef04457954d9ac06e1f5315ca51 SHA512 d4670eb960bf620d627e57ec8dfd92bfba004ccffbbbc3f5e1209fe1569f99477cdd7105837fc6052c7b017c8d0216a44505f60c69abf00031927e6f457c931d WHIRLPOOL b0ceed917498dd3ef843fcca73b6fc730055df3996e0dd19317c0591817662e9b4cf7a69d87dacddf3efd5e484e2d807b65bb4beec84fadc57b5f1b2864fc54c
+DIST zsh-completions-0.16.0.tar.gz 218282 SHA256 37fec2bfa7497165530b6afe6d6b837cefff3c8f918c36556cc5ef89f2781102 SHA512 f438dd42fed5cb6b18bc0de3d68792d0fcc6364ff7fc286a9359976987a812010d0c0ce7845d8794a87f1106968cb1afd72cbf73628d7128c1f6e76497f25108 WHIRLPOOL 3724acd47502de7a940c93d9d48d5bef1832c99ac9169a5b77fd2596d187c0d0f52e43e4bd6e88bd95b861cf022bfcb3c4e3920d26ab333b9177ff76d5016c6c
diff --git a/app-shells/zsh-completions/zsh-completions-0.14.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.16.0.ebuild
index e5b1d5f40bc..e5b1d5f40bc 100644
--- a/app-shells/zsh-completions/zsh-completions-0.14.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.16.0.ebuild
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index 76f401efbbf..40bad410daa 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,3 +1,2 @@
-DIST pdf2djvu-0.8.2.tar.xz 234412 SHA256 40b0812e954f374704bd8dbb5952786f6744623a2ec6df1c56de0b8057be93d6 SHA512 72a3ee719b6311824c1f71269787b31cdd600bc8671f0486419f4d023cb10f9d338df18ce33c982ed43f893d441a723bffd502a17287be43a00dc695ca959042 WHIRLPOOL 72863dfc7f4a7d1665de77a3fa12242c83746f4c3a237b45e92fd3111581f55e16a5c020590d12185db13b7035a987ab2efaa8fee9b47adb60f0502703af6a7c
-DIST pdf2djvu-0.9.1.tar.xz 238840 SHA256 9f9919e97fe244f4c49fa4074120cfc03397379b39f32a911793088039c63df5 SHA512 9ccc5a5523f9b9f17f67912a63f0314eac93a633282bb8bee95bcd9b0f50ef2d05ddbb3456daee7b8d5795081c27002ffc355e6effcfbee4ce9a52b7f92bdf50 WHIRLPOOL ae3e531a5de524e03cd353af54bb4171a62fc01b4162ec31b2401eea53732acb13fed80f3b5eb7ed797080b1b2aab5908d6666a95068b0583b3f8ce92130897e
DIST pdf2djvu-0.9.3.tar.xz 239492 SHA256 d05eb7a10e22d18b77113831ac1c6e380c4569e021c39554d5bb54effe4c7077 SHA512 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193 WHIRLPOOL 76f5d53c11c921968eaf9f91b4fcf7ff25bd6405b6f92638af4fd38c5931941f6c48f4ba586d0ef3a6f5f8bdcfff68b1681c6429e32c818ffe379bd3a6891bfc
+DIST pdf2djvu-0.9.4.tar.xz 250332 SHA256 c5702283fc6f39e8c0c49c2dc67b95e321dc926199bc77578d3daeef4de62fa8 SHA512 6b97d0577ee6e623d8c877393f551dd2a5e19508e5cd6dc5bb2d3ae1a2b71c2f0ffc7020d85507bc52a25da09a301dd5ddf45ab2628928477e0846707ea57322 WHIRLPOOL 007e1d2a150ca1300d67852ef6ee5e47e0ab36c253d0628438f3a199c42b889613f0aeb8d2ab661555d87bf0b913975ffa65f80fc3d9c5fad475d581d13fb2b6
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild
deleted file mode 100644
index 653e9bbc712..00000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use test && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
-
-src_install() {
- default
- dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild
index 653e9bbc712..e1760fe2396 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.4.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/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
index 05dfdf9e5ed..605f0c735ce 100644
--- a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.25-r3.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$
@@ -12,7 +12,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-text/xhtml1/xhtml1-20020801-r4.ebuild b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
index 46625a78a51..5328b5fe14d 100644
--- a/app-text/xhtml1/xhtml1-20020801-r4.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
LICENSE="W3C"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND="app-text/sgml-common
diff --git a/dev-cpp/eigen/eigen-3.2.7.ebuild b/dev-cpp/eigen/eigen-3.2.7.ebuild
index f0cc3dd00ab..2004683d7e7 100644
--- a/dev-cpp/eigen/eigen-3.2.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="LGPL-2 GPL-3"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="altivec debug doc openmp test"
IUSE+=" cpu_flags_x86_sse2"
IUSE+=" cpu_flags_x86_sse3"
diff --git a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
index 5cc961add28..9f23df9491e 100644
--- a/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.8-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="LGPL-2 GPL-3"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="altivec debug doc openmp test"
IUSE+=" cpu_flags_x86_sse2"
IUSE+=" cpu_flags_x86_sse3"
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index ca2a3cbd529..cce4f0493b8 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -1,2 +1,3 @@
DIST pgbouncer-1.5.4.tar.gz 339610 SHA256 08040482f4c887e14d8c8c46fab838fff640c0f3cf231f86ad7f766b7a292280 SHA512 ade8304eba682a468a5e4c1c5e661d67ea64fad951d6f767a3157de4e5398c52492b2ca022f274c55e43022df8d5fad87e45fc60adbcbab00a5ac843a26c6b71 WHIRLPOOL 107d028eaa4ea9f0469994ca9fa3caab64fc33dd2c7228aa7784b04b89091352a6b086fe7123ddfbcc9900b1c1cadef4c08030d9b9a5b169a4be4441ff3a6f02
DIST pgbouncer-1.5.5.tar.gz 336145 SHA256 d65a192d1e2e69bf445d536f10211857959fc38e0247d1974e8008253080e234 SHA512 fd31b25ab2c0fb206797d54cba42f221bf5d9d1bae76d8f0b77ae746b504b51640cab04d60589c7d96f275c50b98b8bdf854702981838b74c23ed7095d85e853 WHIRLPOOL 115a45a4c9e9589c4d872c9469619a7fa6199d8a010d090e530051867210ed5647565c93c118b83717fc70b73b99f6f1309815d767bbb768b46e1ab2b9378c29
+DIST pgbouncer-1.7.2.tar.gz 462374 SHA256 de36b318fe4a2f20a5f60d1c5ea62c1ca331f6813d2c484866ecb59265a160ba SHA512 11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d WHIRLPOOL 3b007d6ea8f9c5e7e8ee3e2908839e24c120fa458f127192f40f8f7d37e5e56bcce3501f76b623670a210c96af66a861adf183e62c152e92e030b2cef60f3d03
diff --git a/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild b/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild
new file mode 100644
index 00000000000..ac4754deb90
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.7.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Upstream has *way* broken tests.
+RESTRICT="test"
+
+inherit eutils user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="https://pgbouncer.github.io"
+SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libevent udns"
+REQUIRED_USE="
+ libevent? ( !udns )
+ udns? ( !libevent )
+"
+RDEPEND="
+ >=sys-libs/glibc-2.10
+ libevent? ( >=dev-libs/libevent-2.0 )
+ udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="
+ ${RDEPEND}
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ >=app-text/asciidoc-8.4
+"
+
+pkg_setup() {
+ enewgroup postgres 70
+ enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+ enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/pgbouncer-dirs.patch"
+}
+
+src_configure() {
+ # --enable-debug is only used to disable stripping
+ econf \
+ --docdir=/usr/share/doc/${PF} \
+ --enable-debug \
+ $(use_enable debug cassert) \
+ $(use_with libevent) \
+ $(use_with udns)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS
+
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+ insinto /etc
+ doins etc/pgbouncer.ini
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ einfo "Please read the config.txt for Configuration Directives"
+ einfo
+ einfo "For Administration Commands, see:"
+ einfo " man pgbouncer"
+ einfo
+ einfo "By default, PgBouncer does not have access to any database."
+ einfo "GRANT the permissions needed for your application and make sure that it"
+ einfo "exists in PgBouncer's auth_file."
+ fi
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 99052b1d6da..76af6724318 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -3,3 +3,4 @@ DIST postgis-2.0.6.tar.gz 5651448 SHA256 438fc9cf8d008c537ed2d6776bc30e726eb1f9a
DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
+DIST postgis-2.2.1.tar.gz 10069889 SHA256 0fe500b0250203aac656bfa8f42f8458b63f33258404844e066e0e535988fa09 SHA512 e580fc6556e1d8e2ba36d62795650852d303ce4c935c8e538d14f0bf0f00c3c27dcb034c42dfafa0c8995eb0f28f71119c8ada4ceecaa8ca9897d0653552bb2f WHIRLPOOL a91f5e44de49b1b41d90188a4f7842c23d41b8c589416014273f4a1e655e0f3013176f7341bac0ea7004c3f7af86634981f3c0695d3e848e45798eeb5f7bfdeb
diff --git a/dev-db/postgis/postgis-2.2.1.ebuild b/dev-db/postgis/postgis-2.2.1.ebuild
new file mode 100644
index 00000000000..c6e8ec13b20
--- /dev/null
+++ b/dev-db/postgis/postgis-2.2.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+ || (
+ dev-db/postgresql:9.5[server]
+ dev-db/postgresql:9.4[server]
+ dev-db/postgresql:9.3[server]
+ dev-db/postgresql:9.2[server]
+ dev-db/postgresql:9.1[server]
+ )
+ dev-libs/json-c
+ dev-libs/libxml2:2
+ >=sci-libs/geos-3.5.0
+ >=sci-libs/proj-4.6.0
+ >=sci-libs/gdal-1.10.0
+ gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/libxslt
+ || (
+ media-gfx/imagemagick[png]
+ media-gfx/graphicsmagick[imagemagick,png]
+ )
+ )
+ virtual/pkgconfig
+ test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+ if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+ die 'POSTGRES_COMPAT not declared.'
+ fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+ && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+ local res=$(echo ${POSTGRES_COMPAT[@]} \
+ | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+ if [[ "$res" -eq "0" ]] ; then
+ eerror "PostgreSQL slot must be set to one of: "
+ eerror " ${POSTGRES_COMPAT[@]}"
+ return 1
+ fi
+
+ return 0
+}
+
+pkg_pretend() {
+ postgres_check_slot || die
+}
+
+pkg_setup() {
+ postgres_check_slot || die
+ export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+ local AT_M4DIR="macros"
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=""
+ use gtk && myargs+=" --with-gui"
+ econf \
+ --with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+ ${myargs}
+}
+
+src_compile() {
+ emake
+ emake -C topology
+
+ if use doc ; then
+ emake comments
+ emake cheatsheets
+ emake -C doc html
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use doc && emake DESTDIR="${D}" comments-install
+ emake -C topology DESTDIR="${D}" install
+ dobin ./utils/postgis_restore.pl
+
+ dodoc CREDITS TODO loader/README.* doc/*txt
+
+ use doc && dohtml -r doc/html/*
+
+ docinto topology
+ dodoc topology/{TODO,README}
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "To finish installing PostGIS, follow the directions detailed at:"
+ elog "http://postgis.net/docs/manual-${MY_PV}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild
index 8a77d200ca8..7f035dabeaa 100644
--- a/dev-db/postgresql/postgresql-9.5.1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.1.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 ~arm64 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-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
index c9dfa6c449b..1bce507ba28 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.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$
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild b/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
index e22ccf5dd80..677dcd45ff5 100644
--- a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild
+++ b/dev-go/blackfriday/blackfriday-1.2_p20150720.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 @@ EGO_PN=github.com/russross/${PN}
if [[ ${PV} = *9999* ]]; then
inherit golang-vcs
else
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
EGIT_COMMIT="8cec3a8"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
inherit golang-vcs-snapshot
diff --git a/dev-go/go-md2man/go-md2man-1.0.3.ebuild b/dev-go/go-md2man/go-md2man-1.0.3.ebuild
index ece084e9d05..fa861b69337 100644
--- a/dev-go/go-md2man/go-md2man-1.0.3.ebuild
+++ b/dev-go/go-md2man/go-md2man-1.0.3.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 @@ EGO_PN=github.com/cpuguy83/go-md2man
if [[ ${PV} = *9999* ]]; then
inherit golang-vcs
else
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
EGIT_COMMIT=v${PV}
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
inherit golang-vcs-snapshot
diff --git a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild
index 3eec0dc4c15..3e247566dfa 100644
--- a/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.ebuild
+++ b/dev-go/sanitized-anchor-name/sanitized-anchor-name-0_pre20150822.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 @@ EGO_PN=github.com/shurcooL/sanitized_anchor_name
if [[ ${PV} = *9999* ]]; then
inherit golang-vcs
else
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm64"
EGIT_COMMIT="244f5ac"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
inherit golang-vcs-snapshot
diff --git a/dev-lang/erlang/erlang-18.2.1.ebuild b/dev-lang/erlang/erlang-18.2.1.ebuild
index 5f64b027264..6d34a36af58 100644
--- a/dev-lang/erlang/erlang-18.2.1.ebuild
+++ b/dev-lang/erlang/erlang-18.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index f83a7ed80e9..6ab17f1e394 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -6,6 +6,7 @@ DIST go-linux-amd64-bootstrap.tbz 48722911 SHA256 0ab0842fb1f6cc6f10a85f225ff1a2
DIST go-linux-arm-bootstrap.tbz 46055976 SHA256 a44e33b95046e01fd7125c3cc3c34b13f83bbf692cddfd3e86e267da11de2a44 SHA512 a8cf3225dafd2f08b944e60d0fb6320b5e394646f5df2ca2464c76a2e6e6b72f4840ddcc65dc5f59c94907715780f1e25c73b480a79909d9455faad59ffd38d5 WHIRLPOOL 304bb37f94b8f5d0bd77c0d5faebed1cb627cc3b453c686d7297f6542ee3e0ddabc7139e13a21ee2f5a20caca273c63bcfbcbd4daf670b1dbfe77b599f8111ac
DIST go-linux-arm64-bootstrap.tbz 45369354 SHA256 810c998e6701580fe0f26d46c5796eefce648e252ff9d6d761304e60556b7fc0 SHA512 3f64869430c03efa77796ed74d07a337e2a205802485605cbdd67778a08e5ce041ce3925b7a5cca0a6b4ad24ab70e07ee54091b010f67ec7370a985022f5a21e WHIRLPOOL f6f470081d5f23c190310280aaf7454a4f58fe4e7545bbd219046711f8d27ce97cc5f5f1c207e777067d1f6332e4b3f2c819b178e899d21c2d5d1d466a42cc37
DIST go-linux-ppc64-bootstrap.tbz 45266082 SHA256 89902cebaf93b95dea225b7304eedcae101d6fb83bba0fcdfee001361b4868c0 SHA512 d013a1a5953207505a9f7e0c5cfdc7f463d4669fd18b36cf1df10126e9d4c012252bc4d207dd4503c34301e76197d8e89a9ed9d9d0b8a3b54b62e782b4c39d7b WHIRLPOOL 3ec868d94e8452a3cdb49a1292f9f32ebeb813ea297e419849cdee28c8d952887feb70e1095ce109ff6b8bb81dee47b7eb6f275b15bb6f46422095c3b260f968
+DIST go-solaris-amd64-bootstrap.tbz 48367195 SHA256 92ebdbf001f243a78a6c2d8ee30e929ba2cecbedf8e0fc07e129b04b107453ad SHA512 cf8725db0d001d61badee71624799a3c9e75f61f77ab090c1f6c490d694c4be367019b28d88306045d877ab5a324a1f9b0674293caf3acb19c193fc3746a48f2 WHIRLPOOL 672c6642e340b6d4f38b633f67fdc3202e3725022a8a61e2129276fccd6c42ddc24ed06c1d57eb31a25ea8056b79686619cbb36431b9c23b6d4be5bcb715bd89
DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8
DIST go1.6.src.tar.gz 12613308 SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146 SHA512 59e9d72a80558fd5e3f176e068897a45333b36e35f6c00393647941a70e741168e65941b6059397378020c3b78ec3471a48809682f7efd97cf33eec6325fc3e8 WHIRLPOOL c6debe1a5039f0ca34c29b4a53f958503a724cae13715ea14f0237b5faacd26e09eb6405462e22abd6806540dd8fb9eb2fa08ff6e8676b0f6dffa267210f5eac
diff --git a/dev-lang/go/go-1.6-r2.ebuild b/dev-lang/go/go-1.6-r2.ebuild
index e9e0d2bc381..a5c39f27980 100644
--- a/dev-lang/go/go-1.6-r2.ebuild
+++ b/dev-lang/go/go-1.6-r2.ebuild
@@ -27,6 +27,9 @@ kernel_linux? (
ppc64? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz )
x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap.tbz )
)
+kernel_SunOS? (
+ x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap.tbz )
+)
"
if [[ ${PV} = 9999 ]]; then
@@ -39,7 +42,7 @@ else
case ${PV} in
*9999*|*_rc*) ;;
*)
- KEYWORDS="-* ~amd64 ~arm64"
+ KEYWORDS="-* ~amd64 ~arm64 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
;;
esac
fi
diff --git a/dev-lang/nwcc/Manifest b/dev-lang/nwcc/Manifest
index f21b884b47b..98170365464 100644
--- a/dev-lang/nwcc/Manifest
+++ b/dev-lang/nwcc/Manifest
@@ -1 +1,2 @@
DIST nwcc_0.8.2.tar.gz 948656 SHA256 e274626d79b98a5d869fb7edc6264957c37addce80dc028346769e73c62f9d96 SHA512 b399baf16a41ae3782343521fc65b8e94bf76dc0a29719a3addc33881bd0d9dd68170f0e7eb2c79aaafa3ced254fac15847883a38d4a5956280fa5fed10d24e0 WHIRLPOOL da2c47fdf130ff5ad7105345a16b540529adee8e3d3a9669c08db48f17da5a0fefc1aabac8c98625731c725cf9cc9e2627a0a9a393951aff6d70cb859335b7ee
+DIST nwcc_0.8.3.tar.gz 954946 SHA256 e64b16c663f2f845d6436342722d29a5e32d03602971de2d521281a18188b065 SHA512 f6af50bd18e13070b512bfac6659f49d10d3ad65ea2c4c5ca3f199c8b87540ec145c7dbbe97272f48903ca1c8afaf58c146ec763c851da0b352d5980746f94f6 WHIRLPOOL 623ef09dfd161542c45e8f5cba275be218094b6d702c46fb15aac37397ab6ec53ae5f0160620ea8e27a6f45b6ee15cefe2b3a4541624dbf7cd1aabda0284deab
diff --git a/dev-lang/nwcc/nwcc-0.8.3.ebuild b/dev-lang/nwcc/nwcc-0.8.3.ebuild
new file mode 100644
index 00000000000..2d4b6860d18
--- /dev/null
+++ b/dev-lang/nwcc/nwcc-0.8.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Nils Weller's C Compiler"
+HOMEPAGE="http://nwcc.sourceforge.net/index.html"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/nwcc%200.8.3/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ # custom hackery hack
+ ABI="" ./configure --installprefix=/usr || die
+}
diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest
index 64d09cb8759..6b6e69bd676 100644
--- a/dev-lang/regina-rexx/Manifest
+++ b/dev-lang/regina-rexx/Manifest
@@ -1 +1,2 @@
DIST Regina-REXX-3.6.tar.gz 1140272 SHA256 687a52327b74e75cf383c427268346ef884c9aed6cdd7d3108feff2171ecfbcc SHA512 07a65c633da97e2a696c3d038808fa377af05f99fef2322398f4712726f4b7311957afeb9e2c18988feb29392ef06ddae7f7bde1a7574af0b0e8bbd286aa2e8e WHIRLPOOL be930cd0e8cf96a95eccf61d711ec633d7acfaf7b383f2633ac696bddbf8c01ab2ba2ef4bda8cf0f4f9404128e9f3eabbb3168864a5b93360f46b5f09fa1feb1
+DIST Regina-REXX-3.9.1.tar.gz 1358458 SHA256 5d13df26987e27f25e7779a2efa87a5775213beeda449a9efac59b57a5d5f3ee SHA512 679d146d68598ccca28c4e66a12ab898d5bfb77e2e5d64ce5ffc9159b982dcda419815a83b05e5dfbe3acea84f8f59955726a6466defefe1ac24646c46609677 WHIRLPOOL f46e60eb15b290cf8ad0488eae1a4073155051d8be18a7118020937e81de91b4758b08e48f897be0e19dd382f99755b51d9c81368b7d894d2aa373b152921cdc
diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild
new file mode 100644
index 00000000000..9b932ad84bf
--- /dev/null
+++ b/dev-lang/regina-rexx/regina-rexx-3.9.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Portable Rexx interpreter"
+HOMEPAGE="http://regina-rexx.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/Regina-REXX-${PV}
+
+MAKEOPTS+=" -j1"
+
+DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO )
+
+src_prepare() {
+ sed -e 's/CFLAGS=/UPSTREAM_CFLAGS=/' -i common/incdebug.m4 || die
+
+ eautoconf
+ tc-export CC #don't move it as tc-getCC
+}
+
+src_compile() {
+ emake LIBEXE="$(tc-getAR)"
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rxstack-r1 rxstack
+}
+
+pkg_postinst() {
+ elog "You may want to run"
+ elog
+ elog "\trc-update add rxstack default"
+ elog
+ elog "to enable Rexx queues (optional)."
+}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
index fa6d46c14fb..12a9f461d82 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
LICENSE="boehm-gc"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cxx static-libs threads"
DEPEND=">=dev-libs/libatomic_ops-7.4
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
index 5ce44429949..7fa6ca5f1de 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ivmai/${PN}/archive/${MY_P}.tar.gz"
LICENSE="MIT boehm-gc GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}/${PN}-${MY_P}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
index 8c577eaa6ff..083ca2c08dd 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
# clause "or later" so we use LGPL-2.1 without +
LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="+cxx static-libs test"
RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libsodium/libsodium-1.0.8.ebuild b/dev-libs/libsodium/libsodium-1.0.8.ebuild
index dda09ab0013..ab4b75127c3 100644
--- a/dev-libs/libsodium/libsodium-1.0.8.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+asm minimal static-libs +urandom"
src_configure() {
diff --git a/dev-python/WSME/WSME-0.8.0.ebuild b/dev-python/WSME/WSME-0.8.0.ebuild
index 37e1ee457c2..46b6f22d878 100644
--- a/dev-python/WSME/WSME-0.8.0.ebuild
+++ b/dev-python/WSME/WSME-0.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
index 2c8eef27a44..ce91d53488a 100644
--- a/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/alembic/alembic-0.8.2.ebuild b/dev-python/alembic/alembic-0.8.2.ebuild
index b161af1e0fc..49b65b9bba2 100644
--- a/dev-python/alembic/alembic-0.8.2.ebuild
+++ b/dev-python/alembic/alembic-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test doc"
# requires.txt cites 'SQLAlchemy>=0.7.3' which is really both old and silly
diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
index f7cafefdfbd..c692047d628 100644
--- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
+++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
# please keep all supported implementations in 'test?'
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
index 58a54106caf..6bc2d8e1907 100644
--- a/dev-python/automaton/automaton-0.8.0.ebuild
+++ b/dev-python/automaton/automaton-0.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-abc/backports-abc-0.4.ebuild b/dev-python/backports-abc/backports-abc-0.4.ebuild
index 73fef3ac10d..2f8d88b762d 100644
--- a/dev-python/backports-abc/backports-abc-0.4.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
index 89628b3fb95..0a94a0edef9 100644
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 6d4042b9ec2..40da09d51b9 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bcrypt/bcrypt-2.0.0.ebuild b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
index 808814409ad..111d2dab671 100644
--- a/dev-python/bcrypt/bcrypt-2.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
index 279468beeb1..b84fa686941 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc test"
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
index 38b3973f79c..69781dee82a 100644
--- a/dev-python/blinker/blinker-1.4.ebuild
+++ b/dev-python/blinker/blinker-1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-python/boto/boto-2.38.0.ebuild b/dev-python/boto/boto-2.38.0.ebuild
index 5be2ca90007..6f63003cdf9 100644
--- a/dev-python/boto/boto-2.38.0.ebuild
+++ b/dev-python/boto/boto-2.38.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
index 69dfd7ed268..80c2a037cd0 100644
--- a/dev-python/cachetools/cachetools-1.1.5.ebuild
+++ b/dev-python/cachetools/cachetools-1.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/castellan/castellan-0.2.1.ebuild b/dev-python/castellan/castellan-0.2.1.ebuild
index d4715b6f0f5..674baae55db 100644
--- a/dev-python/castellan/castellan-0.2.1.ebuild
+++ b/dev-python/castellan/castellan-0.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/click/click-6.3.ebuild b/dev-python/click/click-6.3.ebuild
index 6c9a3dcf738..d4e8418d4de 100644
--- a/dev-python/click/click-6.3.ebuild
+++ b/dev-python/click/click-6.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc examples test"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/cliff/cliff-1.14.0.ebuild b/dev-python/cliff/cliff-1.14.0.ebuild
index 50924641f27..b888d6b6499 100644
--- a/dev-python/cliff/cliff-1.14.0.ebuild
+++ b/dev-python/cliff/cliff-1.14.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
CDEPEND="
diff --git a/dev-python/cmd2/cmd2-0.6.8.ebuild b/dev-python/cmd2/cmd2-0.6.8.ebuild
index f799a817942..a5688a2a0df 100644
--- a/dev-python/cmd2/cmd2-0.6.8.ebuild
+++ b/dev-python/cmd2/cmd2-0.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/contextlib2/contextlib2-0.5.1.ebuild b/dev-python/contextlib2/contextlib2-0.5.1.ebuild
index 5d90531dfab..682e3a29864 100644
--- a/dev-python/contextlib2/contextlib2-0.5.1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2.4"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
diff --git a/dev-python/debtcollector/debtcollector-0.10.0.ebuild b/dev-python/debtcollector/debtcollector-0.10.0.ebuild
index a7666c67bd0..f5933ef4080 100644
--- a/dev-python/debtcollector/debtcollector-0.10.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-0.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/decorator-4.0.6.ebuild b/dev-python/decorator/decorator-4.0.6.ebuild
index f357ca8e993..43cdf0adf78 100644
--- a/dev-python/decorator/decorator-4.0.6.ebuild
+++ b/dev-python/decorator/decorator-4.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dnspython/dnspython-1.12.0-r200.ebuild b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
index d6bf3e4a2c6..766f836f07e 100644
--- a/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
+++ b/dev-python/dnspython/dnspython-1.12.0-r200.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
LICENSE="ISC"
SLOT="py2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="examples test"
RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-1.12.0-r300.ebuild b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
index c85f2ca1a7b..529ffea6fcc 100644
--- a/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
+++ b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip"
LICENSE="ISC"
SLOT="py3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="examples test"
RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
index bf9d347ffe7..1c0627671bc 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.5.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
RDEPEND=">=dev-python/dogpile-core-0.4.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
index 44e7416b498..aabc3564f26 100644
--- a/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
+++ b/dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.core-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/eventlet/eventlet-0.17.4.ebuild b/dev-python/eventlet/eventlet-0.17.4.ebuild
index 9c94d369b0b..756c5dc7700 100644
--- a/dev-python/eventlet/eventlet-0.17.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.17.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc examples test"
RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/fasteners/fasteners-0.13.0.ebuild b/dev-python/fasteners/fasteners-0.13.0.ebuild
index bbc356f6e27..d5d10f4013b 100644
--- a/dev-python/fasteners/fasteners-0.13.0.ebuild
+++ b/dev-python/fasteners/fasteners-0.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/futures/futures-3.0.5.ebuild b/dev-python/futures/futures-3.0.5.ebuild
index 360e3ad2d7b..31c887bd91a 100644
--- a/dev-python/futures/futures-3.0.5.ebuild
+++ b/dev-python/futures/futures-3.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc"
DEPEND="
diff --git a/dev-python/futurist/futurist-0.4.0.ebuild b/dev-python/futurist/futurist-0.4.0.ebuild
index 7bec014a75a..4f9203f9f51 100644
--- a/dev-python/futurist/futurist-0.4.0.ebuild
+++ b/dev-python/futurist/futurist-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/gevent/gevent-1.1_beta6.ebuild b/dev-python/gevent/gevent-1.1_beta6.ebuild
index 890f67d8169..e663e27ef59 100644
--- a/dev-python/gevent/gevent-1.1_beta6.ebuild
+++ b/dev-python/gevent/gevent-1.1_beta6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/glance_store/glance_store-0.9.1.ebuild b/dev-python/glance_store/glance_store-0.9.1.ebuild
index adf1500d29b..9cc7e67c3c5 100644
--- a/dev-python/glance_store/glance_store-0.9.1.ebuild
+++ b/dev-python/glance_store/glance_store-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="+cinder +swift"
CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/greenlet/greenlet-0.4.9.ebuild b/dev-python/greenlet/greenlet-0.4.9.ebuild
index a2e1cf9bce3..0d2e7d284c9 100644
--- a/dev-python/greenlet/greenlet-0.4.9.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm -hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DEPEND="
diff --git a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
index f55b65fe2c7..19968671ea1 100644
--- a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
+++ b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/httplib2/httplib2-0.9.1.ebuild b/dev-python/httplib2/httplib2-0.9.1.ebuild
index b00504e657e..0435ec351c4 100644
--- a/dev-python/httplib2/httplib2-0.9.1.ebuild
+++ b/dev-python/httplib2/httplib2-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipykernel/ipykernel-4.3.0.ebuild b/dev-python/ipykernel/ipykernel-4.3.0.ebuild
index d2ccad182f0..c12f097ffba 100644
--- a/dev-python/ipykernel/ipykernel-4.3.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
index 8bf04a1ec2f..369de929605 100644
--- a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/ipython/ipython-4.1.1.ebuild b/dev-python/ipython/ipython-4.1.1.ebuild
index 3c9b5dae547..3934c31c2cc 100644
--- a/dev-python/ipython/ipython-4.1.1.ebuild
+++ b/dev-python/ipython/ipython-4.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
REQUIRED_USE="
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
index 07d3b68e2de..a2e69dd9a4c 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
DEPEND="
diff --git a/dev-python/jsonpatch/jsonpatch-1.13.ebuild b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
index 9c5428ce423..a4f7b038b2c 100644
--- a/dev-python/jsonpatch/jsonpatch-1.13.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
diff --git a/dev-python/jsonpointer/jsonpointer-1.10.ebuild b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
index 0c784a0711d..534296fef56 100644
--- a/dev-python/jsonpointer/jsonpointer-1.10.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild b/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild
index 4549973940c..d379492b52c 100644
--- a/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-4.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
index 002d53cfc60..c680315868e 100644
--- a/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
index ef7504473ec..b1c565ed44f 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/kombu/kombu-3.0.30.ebuild b/dev-python/kombu/kombu-3.0.30.ebuild
index 7e938932b64..ebc902c7ae9 100644
--- a/dev-python/kombu/kombu-3.0.30.ebuild
+++ b/dev-python/kombu/kombu-3.0.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="amqplib doc examples msgpack sqs test"
# couchdb backend support possible via dev-python/couchdb-python
diff --git a/dev-python/logutils/logutils-0.3.3.ebuild b/dev-python/logutils/logutils-0.3.3.ebuild
index df2ad231f34..c7cb30eb012 100644
--- a/dev-python/logutils/logutils-0.3.3.ebuild
+++ b/dev-python/logutils/logutils-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/monotonic/monotonic-0.5.ebuild b/dev-python/monotonic/monotonic-0.5.ebuild
index fd220ddc142..ce597396e26 100644
--- a/dev-python/monotonic/monotonic-0.5.ebuild
+++ b/dev-python/monotonic/monotonic-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/msgpack/msgpack-0.4.6.ebuild b/dev-python/msgpack/msgpack-0.4.6.ebuild
index aa06f99bec2..d23b7b94c2d 100644
--- a/dev-python/msgpack/msgpack-0.4.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.4.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
IUSE="test"
DEPEND="
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index f9abd3b4494..c2bfc247b0c 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,3 +1,4 @@
DIST neovim-python-client-0.0.37.tar.xz 38008 SHA256 615120048e0bac403fe85dd9bc74a5b2fe92cc9d1dc7c65f92f8a2bf361e0ec9 SHA512 23c3557564a16f9d1c4561d6ebb6d546d52c1cdc0216f36e77edf4567f7143f30e6832296324a3897a1eb38992973c63f99c373d88e330650cd8de6e4ba665cd WHIRLPOOL d0099e8f149eea2b115129b226253d848aa1b5be2685bab5eff6cd2fa5c5c5d0de6f070ed2fca860d9bc8105a139bbb6bb9d7a4f02baef1bf337d13046803463
DIST neovim-python-client-0.0.38.tar.xz 38524 SHA256 40599735f14dc6f715fbdc3b8e91ec4e1dd7e4a184ee0b4c7f4d69e768b557dd SHA512 b6f912802a1807eef4353fb6c8f15f9f43b9a1cde449e2c23a031b099de448dd6a2856dc4545ee33094e7f9e8842fd1101008fe4272d21e3fcf6eb38a3c144df WHIRLPOOL 218d46cc61b8e8a7e386c61fe68958888f46cf0e8da96edcd926e67ad236371d80b2a58ed385cb20526440910488265e6661537f579a2fc37dd8d63d81e98096
DIST neovim-python-client-0.1.0.tar.gz 43142 SHA256 2a9a1f07bd6d5617b1b85ee1772feed9aabd1f7a6ddb24664a48896c7db6121a SHA512 31d9c7ac32513871d7121a07269c643da97bba76469de0756aa3b71db3ff70b638d56b4da8b91d550ca41be6f53d2bd3e320e9c751ee5a6ce4e6230bd423b41a WHIRLPOOL 9192eff0dec934e949e201e425ee3bb316988078e9887290735b15b7c44f7a27a81556909f963e58414adf65e89354bcc26b9c7e7b1d372f73eff1d27cb6f901
+DIST neovim-python-client-0.1.2.tar.gz 43428 SHA256 2d85a493194b5dfbc08cad1fd2e252f7ad35b65eb826dd61f67f4fecfc8476b2 SHA512 a050cd7fcc3ab9863bd777331a6ebce3b9ac110682c445ca3e18a59ef4296b4da486a2586ae8be36f4fc6c9ac5e0d5513c19d06f2783bdf37554f37ca547c908 WHIRLPOOL d5f08178bc8738fcdae7c50a43d4e58731ce8665e93d6b8e905c6a83e1b6fe0655dabc9c5ee96a1415b84710ec043f25cea72761af3fe4977d96b862ca81bb31
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild
new file mode 100644
index 00000000000..83767617edc
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.2.ebuild
@@ -0,0 +1,31 @@
+# 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,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+REQUIRED_USE="gtk? ( python_targets_python2_7 )" # experimental gui only works with py2
+
+DEPEND="
+ >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+ virtual/python-greenlet[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+ gtk? (
+ >=dev-python/click-3.0[${PYTHON_USEDEP}]
+ dev-python/pygobject:2
+ dev-python/pygtk:2
+ x11-libs/gtk+:2[introspection]
+ )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/netaddr/netaddr-0.7.18.ebuild b/dev-python/netaddr/netaddr-0.7.18.ebuild
index b46f96d60b4..85d2d8975da 100644
--- a/dev-python/netaddr/netaddr-0.7.18.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="cli test"
RDEPEND="cli? ( >=dev-python/ipython-0.13.1-r1[${PYTHON_USEDEP}] )"
diff --git a/dev-python/netifaces/netifaces-0.10.4.ebuild b/dev-python/netifaces/netifaces-0.10.4.ebuild
index f185ae84e10..bd1b6e68f7d 100644
--- a/dev-python/netifaces/netifaces-0.10.4.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index 6852606878e..25ef19d2334 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/oauthlib/oauthlib-1.0.1.ebuild b/dev-python/oauthlib/oauthlib-1.0.1.ebuild
index 63579d2617a..f3c6dcee5ff 100644
--- a/dev-python/oauthlib/oauthlib-1.0.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="test"
# optional extras hard set as RDEPs. See setup.py
diff --git a/dev-python/ordereddict/ordereddict-1.1.ebuild b/dev-python/ordereddict/ordereddict-1.1.ebuild
index 1d145cb8bc1..246ecd59e3d 100644
--- a/dev-python/ordereddict/ordereddict-1.1.ebuild
+++ b/dev-python/ordereddict/ordereddict-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/os-brick/os-brick-0.5.0.ebuild b/dev-python/os-brick/os-brick-0.5.0.ebuild
index a0797e6e912..b0f07dc5358 100644
--- a/dev-python/os-brick/os-brick-0.5.0.ebuild
+++ b/dev-python/os-brick/os-brick-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
index d0f70d3c4e9..f51ff287909 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDPEND="
diff --git a/dev-python/oslo-config/oslo-config-2.4.0.ebuild b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
index ff3546b3b91..17d7d145698 100644
--- a/dev-python/oslo-config/oslo-config-2.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/oslo-context-0.6.0.ebuild b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
index 9d9fc4e39e6..a300cc41972 100644
--- a/dev-python/oslo-context/oslo-context-0.6.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/oslo-db-2.6.0.ebuild b/dev-python/oslo-db/oslo-db-2.6.0.ebuild
index a5ead163459..f993a9580ef 100644
--- a/dev-python/oslo-db/oslo-db-2.6.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-2.6.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.db-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="+sqlite mysql postgres"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
index e19b1f7312c..34080fe191c 100644
--- a/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
CDEPEND=">dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/oslo-log-1.10.0.ebuild b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
index a1807caee3b..79510e5104e 100644
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
index a20e5a5072d..3c5b2849ca8 100644
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.messaging-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
index 2adfb21131b..790ac313279 100644
--- a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
index 18ecc1fd94e..f958205e1ae 100644
--- a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.policy-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
index 86509eab7be..11ea4eec0d6 100644
--- a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
index 2087ae7b6a1..4272b5884a9 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.rootwrap-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
index 1e883ff9365..e8a4fc1a303 100644
--- a/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-1.11.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
index b0cc9b81300..25e7c7f2793 100644
--- a/dev-python/oslo-service/oslo-service-0.9.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.service-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
index 07d87f97817..d654adbf0dd 100644
--- a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
CDEPEND="
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
index 00a53b0308c..70817dc788f 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
index 9a3495e2e91..847dabdf9bb 100644
--- a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND="
diff --git a/dev-python/osprofiler/osprofiler-0.3.0.ebuild b/dev-python/osprofiler/osprofiler-0.3.0.ebuild
index f9fadd98400..62a78956ff1 100644
--- a/dev-python/osprofiler/osprofiler-0.3.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-0.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/passlib/passlib-1.6.5.ebuild b/dev-python/passlib/passlib-1.6.5.ebuild
index 2af0b8c405a..817616ce8a4 100644
--- a/dev-python/passlib/passlib-1.6.5.ebuild
+++ b/dev-python/passlib/passlib-1.6.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
SLOT="0"
IUSE="test doc"
diff --git a/dev-python/paste/paste-2.0.2.ebuild b/dev-python/paste/paste-2.0.2.ebuild
index b4ddf3c902b..d26bf813ab2 100644
--- a/dev-python/paste/paste-2.0.2.ebuild
+++ b/dev-python/paste/paste-2.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc flup openid"
RDEPEND="
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
index d36ecab01d4..2389524a942 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pecan/pecan-1.0.3.ebuild b/dev-python/pecan/pecan-1.0.3.ebuild
index c679d7f1f7a..64c8f9b9d02 100644
--- a/dev-python/pecan/pecan-1.0.3.ebuild
+++ b/dev-python/pecan/pecan-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pickleshare/pickleshare-0.6.ebuild b/dev-python/pickleshare/pickleshare-0.6.ebuild
index fd3c22091f7..e67548d6752 100644
--- a/dev-python/pickleshare/pickleshare-0.6.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pip/pip-8.0.3.ebuild b/dev-python/pip/pip-8.0.3.ebuild
index 9756daab6b4..496399cae60 100644
--- a/dev-python/pip/pip-8.0.3.ebuild
+++ b/dev-python/pip/pip-8.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
index f154f944468..e3e7fc2dc8e 100644
--- a/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
+++ b/dev-python/posix_ipc/posix_ipc-0.9.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/prettytable/prettytable-0.7.2.ebuild b/dev-python/prettytable/prettytable-0.7.2.ebuild
index 1c02133a0a4..5fe6dbd69bb 100644
--- a/dev-python/prettytable/prettytable-0.7.2.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/psutil/psutil-1.2.1.ebuild b/dev-python/psutil/psutil-1.2.1.ebuild
index 8138b03b1f0..710c41fa165 100644
--- a/dev-python/psutil/psutil-1.2.1.ebuild
+++ b/dev-python/psutil/psutil-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/psycopg/psycopg-2.6.1.ebuild b/dev-python/psycopg/psycopg-2.6.1.ebuild
index 68ac338af53..e10451e7351 100644
--- a/dev-python/psycopg/psycopg-2.6.1.ebuild
+++ b/dev-python/psycopg/psycopg-2.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug doc examples"
RDEPEND=">=dev-db/postgresql-8.1"
diff --git a/dev-python/py-amqp/py-amqp-1.4.9.ebuild b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
index 5edc15a5e46..ae3cb378c8e 100644
--- a/dev-python/py-amqp/py-amqp-1.4.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-1.4.9.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc examples extras test"
RDEPEND=""
diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild
index 652bff8e58f..b2df3b9a20b 100644
--- a/dev-python/pycadf/pycadf-1.1.0.ebuild
+++ b/dev-python/pycadf/pycadf-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pycrypto/pycrypto-2.6.1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
index a2285a22c6e..a73b1d27b72 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
LICENSE="PSF-2 public-domain"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
IUSE="doc +gmp"
RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/dev-python/pyjwt/pyjwt-1.4.0.ebuild b/dev-python/pyjwt/pyjwt-1.4.0.ebuild
index 33ee5991bbe..2feff6c2e56 100644
--- a/dev-python/pyjwt/pyjwt-1.4.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
index 6a140ed38ec..bffa488ed22 100644
--- a/dev-python/pyro/pyro-4.41.ebuild
+++ b/dev-python/pyro/pyro-4.41.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/pysaml2/pysaml2-3.0.0.ebuild b/dev-python/pysaml2/pysaml2-3.0.0.ebuild
index d2d88e88062..c9ccb9aa2fa 100644
--- a/dev-python/pysaml2/pysaml2-3.0.0.ebuild
+++ b/dev-python/pysaml2/pysaml2-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
index d3b2472c202..7095fa709ac 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
index 000bb2ba9b2..fda73cd6022 100644
--- a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
CDEPEND="
diff --git a/dev-python/python-editor/python-editor-0.4.ebuild b/dev-python/python-editor/python-editor-0.4.ebuild
index 70014924ee0..1a8453d56e1 100644
--- a/dev-python/python-editor/python-editor-0.4.ebuild
+++ b/dev-python/python-editor/python-editor-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild
index 5b792672fd3..9277b38e146 100644
--- a/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
REQUIRED_USE="test? ( doc )"
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
index 29ea670c307..4a835e59f99 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
# Note: blacklist version not in portage:
diff --git a/dev-python/python-memcached/python-memcached-1.57.ebuild b/dev-python/python-memcached/python-memcached-1.57.ebuild
index 4f853ead758..6cc00f92c55 100644
--- a/dev-python/python-memcached/python-memcached-1.57.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.57.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OSL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
index d4fb892c7a3..242a382ad90 100644
--- a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
REQUIRED_USE="test? ( doc )"
diff --git a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
index a0ec520f402..869304ee1b2 100644
--- a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
CDEPEND="
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild
index 6bea092f1f7..d1f95a6aaff 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://code.google.com/p/python-sqlparse/ https://github.com/andialbr
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
LICENSE="BSD-2"
IUSE="doc test"
diff --git a/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
index 4fa4360725c..fc7f86dc0bd 100644
--- a/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyudev/pyudev-0.16.1-r1.ebuild b/dev-python/pyudev/pyudev-0.16.1-r1.ebuild
index eefe667b592..d38244791aa 100644
--- a/dev-python/pyudev/pyudev-0.16.1-r1.ebuild
+++ b/dev-python/pyudev/pyudev-0.16.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
IUSE="pygobject pyqt4 pyside test"
RDEPEND="virtual/udev
diff --git a/dev-python/pyzmq/pyzmq-15.2.0.ebuild b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
index ce4a9231174..2ed5a56d2d4 100644
--- a/dev-python/pyzmq/pyzmq-15.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-15.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
PY2_USEDEP=$(python_gen_usedep python2_7)
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
index eafca1f557d..9c87bc00d0b 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="repoze"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-python/repoze-who/repoze-who-2.2.ebuild b/dev-python/repoze-who/repoze-who-2.2.ebuild
index 9f997958257..822c8219655 100644
--- a/dev-python/repoze-who/repoze-who-2.2.ebuild
+++ b/dev-python/repoze-who/repoze-who-2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/repoze.who-${PV}"
LICENSE="repoze"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/dev-python/routes/routes-2.2.ebuild b/dev-python/routes/routes-2.2.ebuild
index 448f8f35af0..2d06a69aef6 100644
--- a/dev-python/routes/routes-2.2.ebuild
+++ b/dev-python/routes/routes-2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
index 329d67fbc7a..e3a86e37a8a 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ryu/ryu-3.26.ebuild b/dev-python/ryu/ryu-3.26.ebuild
index f92c0dd5933..cf82eb2de86 100644
--- a/dev-python/ryu/ryu-3.26.ebuild
+++ b/dev-python/ryu/ryu-3.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/semantic_version/semantic_version-2.4.2.ebuild b/dev-python/semantic_version/semantic_version-2.4.2.ebuild
index 0588d19247c..8ac16486953 100644
--- a/dev-python/semantic_version/semantic_version-2.4.2.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/serpent/serpent-1.11.ebuild b/dev-python/serpent/serpent-1.11.ebuild
index 559ec68a0ab..615de6cf88d 100644
--- a/dev-python/serpent/serpent-1.11.ebuild
+++ b/dev-python/serpent/serpent-1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
# not bundled
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild
index c6fdce9e9b7..ac8c1cf00cc 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild
index 1beddd80aaa..a5682bf643e 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="doc"
CDEPEND=">=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild
index aaa990b83a3..6a81e2afec7 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples +sqlite test"
REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/stevedore/stevedore-1.10.0.ebuild b/dev-python/stevedore/stevedore-1.10.0.ebuild
index efb2e19253a..ddef870f3b8 100644
--- a/dev-python/stevedore/stevedore-1.10.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/suds/suds-0.6-r1.ebuild b/dev-python/suds/suds-0.6-r1.ebuild
index b99f3b046b9..bb1f81a5e4a 100644
--- a/dev-python/suds/suds-0.6-r1.ebuild
+++ b/dev-python/suds/suds-0.6-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-jurko-${PV}"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
REQUIRED_USE="doc? ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/taskflow/taskflow-1.21.0.ebuild b/dev-python/taskflow/taskflow-1.21.0.ebuild
index 73514646832..7262a1fccd3 100644
--- a/dev-python/taskflow/taskflow-1.21.0.ebuild
+++ b/dev-python/taskflow/taskflow-1.21.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index 05aad78eebd..e2f5f2f1aa6 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/traitlets/traitlets-4.1.0.ebuild b/dev-python/traitlets/traitlets-4.1.0.ebuild
index 9eb66b0b88b..87b479c4838 100644
--- a/dev-python/traitlets/traitlets-4.1.0.ebuild
+++ b/dev-python/traitlets/traitlets-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/trollius/trollius-2.0.ebuild b/dev-python/trollius/trollius-2.0.ebuild
index cec8cec9091..bdade40435f 100644
--- a/dev-python/trollius/trollius-2.0.ebuild
+++ b/dev-python/trollius/trollius-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/twisted-names/twisted-names-15.2.1.ebuild b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
index df8da10295d..c95d5f17041 100644
--- a/dev-python/twisted-names/twisted-names-15.2.1.ebuild
+++ b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
@@ -9,7 +9,7 @@ inherit twisted-r1
DESCRIPTION="A Twisted DNS implementation"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted-web/twisted-web-15.2.1.ebuild b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
index 039a4cbff40..9cccf68580e 100644
--- a/dev-python/twisted-web/twisted-web-15.2.1.ebuild
+++ b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
@@ -10,7 +10,7 @@ inherit twisted-r1
MY_PN="TwistedWeb"
DESCRIPTION="Twisted web server, programmable in Python"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="soap"
DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index 788e74a7c3e..f43c8e0e37b 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~arm64 ~x86 ~ppc"
IUSE=""
python_test() {
diff --git a/dev-python/waitress/waitress-0.8.9.ebuild b/dev-python/waitress/waitress-0.8.9.ebuild
index 125504cbfd1..9f674f1c24b 100644
--- a/dev-python/waitress/waitress-0.8.9.ebuild
+++ b/dev-python/waitress/waitress-0.8.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz \
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="doc test"
RDEPEND=""
diff --git a/dev-python/warlock/warlock-1.1.0.ebuild b/dev-python/warlock/warlock-1.1.0.ebuild
index 73a719b5e4f..c19ce58a0a3 100644
--- a/dev-python/warlock/warlock-1.1.0.ebuild
+++ b/dev-python/warlock/warlock-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webob/webob-1.5.1.ebuild b/dev-python/webob/webob-1.5.1.ebuild
index 6951a17c5a7..067524bbf53 100644
--- a/dev-python/webob/webob-1.5.1.ebuild
+++ b/dev-python/webob/webob-1.5.1.ebuild
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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}]
diff --git a/dev-python/websockify/websockify-0.7.0.ebuild b/dev-python/websockify/websockify-0.7.0.ebuild
index 60faa026fbc..895ff222a58 100644
--- a/dev-python/websockify/websockify-0.7.0.ebuild
+++ b/dev-python/websockify/websockify-0.7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/kanaka/websockify"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/webtest-2.0.18.ebuild b/dev-python/webtest/webtest-2.0.18.ebuild
index ccac72d8f04..90d1867863a 100644
--- a/dev-python/webtest/webtest-2.0.18.ebuild
+++ b/dev-python/webtest/webtest-2.0.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc test"
# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
diff --git a/dev-python/wrapt/wrapt-1.10.6-r1.ebuild b/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
index 38f49bc1d88..4102610efb2 100644
--- a/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.6-r1.ebuild
@@ -15,7 +15,7 @@ S="${S}-r1"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index f92198a739c..e2e4eb70505 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1 +1,2 @@
DIST concurrent-ruby-1.0.0.tar.gz 1269980 SHA256 21a5942bd18d6ca2bdf547f16925f167b0c18592f737091ea5531f07de92fba0 SHA512 5b2a6b5d0e43d1df768d9e18328ecee04796af70edaa72646431e0c4e2ff75387542cce8f78b69d73514166348ed73f906f00bd6e627969159ab1ce4e2a75e6c WHIRLPOOL c7875df7f5c3f91487c1a85a46948225ccfebeb625ae1d4c6fd5b87ba7f224bc50aeb782a58bcfd6f5423d52dea7a54ef57189ae0bc4a23b5996e0b9b41feede
+DIST concurrent-ruby-1.0.1.tar.gz 1277569 SHA256 696c1f8044f072512d512b48c21e9c66ec4e970706cdbb8fa90e0fab5a4ea254 SHA512 14dfdad55701fcdf6ac97e87ac9ee4113340d8f2a01eb1970b2635b175a34d04c9f208d2ed445dfd8d28f67acb5cd8b6e2e89ace86bccff8c8728ee69eb0f87a WHIRLPOOL 5166bd500deeab934e97ff9c560e6d56d37113201436f528a63a57af91cc9cbb2e4ff5f45397fd77ff01db8b4eb816ec4678cf8f404e09cfd740e79dbffdf929
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.1.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.1.ebuild
new file mode 100644
index 00000000000..6fe323ef009
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 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_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ # Remove edge files as defined in support/file_map.rb
+ rm -rf {lib,spec}/concurrent/{actor,channel,edge}* \
+ lib/concurrent/{concurrent-edge,lazy_register.rb} \
+ spec/concurrent/lazy_register_spec.rb || die
+ sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+
+ # Remove specs for the ext gem
+ rm -rf spec/concurrent/atomic || die
+
+ sed -i -e '/file_map/d' -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 1c28956093a..adf3c3dc654 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,2 +1,3 @@
DIST css_parser-1.3.5.tar.gz 23699 SHA256 d08f0a28e97d2d8e80bebe1253ed68f98a75f6afbc5f453a570170972d3af08e SHA512 92897839387649379f35d9b0368cab9d5c8148c588a421f155f5ff6bdc6e7b9d776ccc267d73a2484c48c4d4d6084f99c86ba84c20f3025952dcb9b84c1a3901 WHIRLPOOL f32766fb8727245db9d9f6b8f764fbbddff865e0378b42904da58a6385ed697df053be6948244278bf231ec8d667c81693c6753840d17a48f4d7c8f03fca51b6
DIST css_parser-1.3.6.tar.gz 24422 SHA256 1931ca0a02d14a0ae7863921a18f3475fa6beee58585e9949af70ceffed8fc80 SHA512 a9d09a95320b3a6853a5f079c17d2913868a3d97ee20d9df8076d9206721bf23442e793a722e67c87d4083d3734ba9eaf98b81d93e6257aaaa43ff32b8e6e65b WHIRLPOOL 13ca571034974d09bf4165f1ca8cc947d66aafdacbd098e25e1f16e312bcbe3bf850b2d1f62d404c0878641f0e9b60c5a00f2b24007295cc0881299f5eb4767f
+DIST css_parser-1.3.7.tar.gz 24559 SHA256 4b21cf4ffd2d6bca40e11f350aaf2bfb2970913145771aeff97bcfdec86c31e1 SHA512 98ea3d5c806887ea3a6ddc4a8b3780bac92150db6be1fe9011035bc2a5d72e64002d36b06a80c5d49eb0ed7a5e51bce29d3b07dc83238d8128b580c8ff455ed7 WHIRLPOOL 9192e9b08f5bca2743d3d81d836fdcb16230e4c673760f4a1d8d8deece04c143ffe64d46cc903165459749ce204ebdff1cf1d5a01e3c54616da17fa40cb1487a
diff --git a/dev-ruby/css_parser/css_parser-1.3.7.ebuild b/dev-ruby/css_parser/css_parser-1.3.7.ebuild
new file mode 100644
index 00000000000..3a55f8990b5
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.3.7.ebuild
@@ -0,0 +1,45 @@
+# 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_DOC="rdoc"
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="http://compass-style.org/ https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+ virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest )"
+
+all_ruby_prepare() {
+ # get rid of bundler usage
+ rm Gemfile || die
+ sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+ sed -i -e '/bundler/d' test/test_helper.rb || die
+ # Avoid tests using the network.
+ sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 6f622d1aced..5d8c986dcca 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,2 +1,3 @@
DIST typhoeus-0.7.3.gem 51712 SHA256 13d1b1056fcb559d571da52fb13387797ff7b4f99ea157a7ef80e121e9356061 SHA512 2c837504cc81ee3131e5c0cfdd2da6ef123624ee166063ca749d9e001714aa45514d103229eb1d3c42e756acefa83697cd74d856e07ee584d5b5834d67a173b5 WHIRLPOOL ec10bb9a48428abc7c3afa63fc4f20c98b0eca41ab06dee4b28f9480d677b20e1b78080d349a6fa31717790d884eb19d035184756246fe315eb0e321d81a9011
DIST typhoeus-0.8.0.gem 52224 SHA256 28b7cf3c7d915a06d412bddab445df94ab725252009aa409f5ea41ab6577a30f SHA512 e9e65bd1a912ee2c5f0e2026a478ccdbc7f7d34289a24849b23a03b64dea875bc81335a3206d8ee38acc36accaf98bfaf733574768bb54df4a0dd9945d9f1fa8 WHIRLPOOL adfcad38b4f7b35c4001836be05b895cc6e825311aa1119522a111d0acf5f4dbb4ea95619188798ade224013a5b268f2a6bc7642a649e828645ed0818212c9a6
+DIST typhoeus-1.0.1.gem 52224 SHA256 a9bee66ddb7ba039690baf4a5b26ba2bac09ec534dc1c923791b23f3fc9baabc SHA512 805aced5843a1a0d62691ddec78be1cb7f8dbc8d5ca630b8448f925eb379d52b6de53e460ccb24af29d834ef2a9f13690efaceb4709b11ffb4e67aac4da26863 WHIRLPOOL 6c161679a4fced598f9312b811575be97a4dd9c50e7e628d0973ec06fe56c045e238be0e1f620e127ab1a303afb70e46bf2d1fbbc0a29f9ab06d42eeb8c7bfb4
diff --git a/dev-ruby/typhoeus/typhoeus-1.0.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.0.1.ebuild
new file mode 100644
index 00000000000..112a41923a2
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.0.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
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="http://rubygems.org/gems/typhoeus/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ethon-0.8.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
+
+all_ruby_prepare() {
+ sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index e5aea9837e4..5f8c706d6c0 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,4 +1,3 @@
-DIST cloc-1.60.pl 344405 SHA256 4aa870bef104fd2b8f03c667ef8be2cd671cdf59f46c72046c43ed14e222a05c SHA512 569f789cb5ba4164b4f75e4953d8a5be7cd6fbb83ce0356aa0eb6d1c7d863aac91e131df79d90dbc2319c20757e9f758b55ee76390f7f4511e534c451e1a6913 WHIRLPOOL cb2b1ca35aab8eadb0335bac914e546b744c2246d1afc961eb0d683de7461f031bc12e3725d32ff0bcd29260ad2098fccd5291130d321b242797fd93b3de95cd
-DIST cloc-1.62.pl 374834 SHA256 fa3793b576895cde2acae26a49447bf0c55ab3f79bdacfb00a88fc1d255c2570 SHA512 35ad9c9722b423cfae0c81877d5541175feb9d9c61789e4dc7de7ec35a663e3c519f889c03279c39c61aaca0b7d11c8c64f1962029c76f81034a0e9588bad584 WHIRLPOOL c21f1372b5e86f61ad540fb0cddbc5a4bd96de0f448d134da3a8fcc8fa95591f24416f117a71b9b1f72d7c714bf9a9993ef7a53d3395591588446712fb271b3b
DIST cloc-1.64.pl 408977 SHA256 79edea7ea1f442b1632001e23418193ae4571810e60de8bd25e491036d60eb3d SHA512 bed788cb77ce9ae83714fc14ca04d90d5ae73a7443e180ab815ab81b1d58737f51a8c81360eb7be756afc9d324f9dcf1174b5505b665401217231087ba9461ad WHIRLPOOL 5c56b8be65d16bdadb79950fc4fb3446f36705ea6f5d5ca13304d290e5669a9370cc7b20f60ba1c5e5c4a147d62603beb34e5829a26223efa1ae36e690916518
+DIST cloc-1.66.tar.gz 215719 SHA256 3a8a6d090e6adda9c842583eb49847d6469c65fcf8b2ccefd8e4b18dbb29524e SHA512 2f0bb2de83c6cd8eee251dbf418002301fdfa76bfda6cfbd0d746d9ea0c9d27cf3ee91110504819c4b85e0ae6c1c496fb125c3ede0d516d452cfea6af46e9473 WHIRLPOOL 96a5447d6f3ec406e596a682a418d890d581a3c5e4cb62cf797a908c20147cbe425ef4282cb30b80af79c6deaccbe9895f91904ff871729341458d113d853e01
DIST cloc.1.pod 12468 SHA256 0e6890acd5836ec43aabed1476e2a1417ea4d454968297c68c1b782e818f979b SHA512 50b4085704c7936de9993476195570957c9c5e864f4a2dbac114ff148a813b50ccba0c6e29d5bda4c4e5cd7c7a09e314233438ddd28f0e0585db54975e602659 WHIRLPOOL 25d9b78a7a0fb88f2ff1192afd8cd5963ab61b06883874b8339a1d4fefbeac4b080d413107f06b34975cd2e7ea92e4313767f2c2aebf39e21ef7cd408bf152ae
diff --git a/dev-util/cloc/cloc-1.60.ebuild b/dev-util/cloc/cloc-1.60.ebuild
deleted file mode 100644
index 5b2ccbf5a16..00000000000
--- a/dev-util/cloc/cloc-1.60.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="http://cloc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
- dev-perl/Algorithm-Diff
- dev-perl/regexp-common
- virtual/perl-Digest-MD5
- virtual/perl-Getopt-Long
- virtual/perl-File-Spec
- virtual/perl-File-Temp"
-
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
- pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
-}
-
-src_install() {
- doman ${PN}.1
- newbin "${DISTDIR}"/${P}.pl ${PN}
-}
diff --git a/dev-util/cloc/cloc-1.64.ebuild b/dev-util/cloc/cloc-1.64.ebuild
index 6d8b4d95967..e44958b78e8 100644
--- a/dev-util/cloc/cloc-1.64.ebuild
+++ b/dev-util/cloc/cloc-1.64.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$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.p
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
DEPEND=">=dev-lang/perl-5.6"
RDEPEND="${DEPEND}
diff --git a/dev-util/cloc/cloc-1.62.ebuild b/dev-util/cloc/cloc-1.66.ebuild
index 52588410043..a1f8821c425 100644
--- a/dev-util/cloc/cloc-1.62.ebuild
+++ b/dev-util/cloc/cloc-1.66.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+inherit eutils
+
DESCRIPTION="Count Lines of Code"
-HOMEPAGE="http://cloc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.pl mirror://sourceforge/${PN}/${PN}.1.pod"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
@@ -21,15 +23,11 @@ RDEPEND="${DEPEND}
virtual/perl-File-Spec
virtual/perl-File-Temp"
-S=${WORKDIR}
-
-src_unpack() { :; }
-
-src_prepare() {
- pod2man "${DISTDIR}"/${PN}.1.pod > ${PN}.1 || die
+src_compile() {
+ pod2man Unix/${PN}.1.pod > ${PN}.1 || die
}
src_install() {
doman ${PN}.1
- newbin "${DISTDIR}"/${P}.pl ${PN}
+ dobin Unix/${PN}
}
diff --git a/dev-util/cloc/metadata.xml b/dev-util/cloc/metadata.xml
index f77e31c3787..42bbb00a33f 100644
--- a/dev-util/cloc/metadata.xml
+++ b/dev-util/cloc/metadata.xml
@@ -6,7 +6,7 @@
<name>Matthias Maier</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge">cloc</remote-id>
- <bugs-to>http://sourceforge.net/tracker/?group_id=174787</bugs-to>
+ <remote-id type="github">AlDanial/cloc</remote-id>
+ <bugs-to>https://github.com/AlDanial/cloc/issues</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d3a66eeef35..a7f744a18a2 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,4 +1,2 @@
-DIST jenkins-bin-1.625.3.war 63322455 SHA256 9964b10581414b5504921dd8a717b172c07bcdf5f9d1bae50595aca07ddacf20 SHA512 daa739c902d417949dd348780fe4c3d088d64917231273083638bbfe87a47c69007669298175d5bc60623aa7bb6c3ce19c250764b6108ae026e0622d968a3b26 WHIRLPOOL da0e99183bb22ef4b1475acd840c67c3d0e2cc2f3d998340ea0d6cbb0ce4cc4e26d60871d65aaf08d9af0026b51152274640c485592e6cb36cd95813848eddc6
-DIST jenkins-bin-1.642.1.war 63664516 SHA256 ce036e227fe1fed15e3da9be8d29e859bdcda7118895fd269d1c9ac35925de66 SHA512 1fa79b6029078d8a8c0996b63dc7c411f9a56037257dbb3080e07559cb949af819f6245846b5c586ba7c9a61d5a25137d3c2d9c91a7a63fe2b4f3358d7c439c2 WHIRLPOOL 2b54f22895f7de1ced34bd99a03d37b4f06211e6dd5bdd56ac49eff2b010797f82f4d67f2a2b051feb2eba08f5eb87ca7223c46a75c690588361eb11aa007d62
-DIST jenkins-bin-1.647.war 63359416 SHA256 52778609d34cb532c934509bb2a63c77986ae8e9b7e85186bad0235f58e4200f SHA512 cf8130453b52a19d6fa1f54a6676496f7d3ffe2a0793fe2b95ecb9296ab0bae831aebb5d3af81d8e7ee5c51e0942f315ba3c720be09e31e6c0d7e1a972bb6c29 WHIRLPOOL 4c4e388fc6909608f340d9e3eb6c379d228193b9f00d2875d096b0d938bbe14af2c3cab0285510b45ee3d1ed048dbf1a07b6f39279077fc91f5516d356b8080c
-DIST jenkins-bin-1.649.war 64590491 SHA256 ca270b2a7e3d8927e7765e516c7cff9b90a85c7a3010d632f8f3b96a5acb9b82 SHA512 5480692cdb2efd94ea6c6f5f56909f69b2b0be7d794dd7e8860a2e31a650992aa63ffbdc67686dfd7cb484d07766227151dc40b8729340d5a07daa461216b57c WHIRLPOOL 5828194b863d64cd2d80c30306622479347846f56b517d2df3ccc26ba1b37861ecf2e98b10196d2e62f1f6764015376802cbb04bd8a70dd0aa8cff29d40e6fa8
+DIST jenkins-bin-1.642.2.war 63668826 SHA256 024b04524f230dea62424de95f372d8c89ed942b21dbef68117b259842b96907 SHA512 9f4b06bdd72e61c732e0ae87abf3dcaad347744934e6d634be7b182a4d77aba1f41bc6c762cbd4ae804b822c52d06bad825b07a487e6424b28ecc8d90e62b280 WHIRLPOOL 30b93639b356d81ff2e7fde09336497db606b9fc4e52576a2dae7fa3f8bf221a3cba5445225bcd8c400c747ebfc7fa531e416fcd68330930167ebdda9280cb14
+DIST jenkins-bin-1.650.war 64593723 SHA256 16008a85246a9d2b36eaae18405135347280898edea8818c34433acda49fd747 SHA512 cedcd11b877bfd5c10cc3a08ea2666090da02fb655d3e7d532da24458ee175468bed38e5ff74ecf7524dcaf857c103652259d9ab0d36af8bdc1f866e85bf477a WHIRLPOOL cf13574e8661a691240704b701664650d308853d0ba650506e6dccf6c1d7484295a3754b1a6a75604393b65110b25598b10e184fd19fbef0322c93ed0f67d710
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild
deleted file mode 100644
index 49fa34a8423..00000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.625.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 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.642.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.642.2.ebuild
index 88dc7f8565d..88dc7f8565d 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.642.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.642.2.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild
deleted file mode 100644
index 96dfaf75f07..00000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.649.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:lts
- >=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.647.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.650.ebuild
index 96dfaf75f07..96dfaf75f07 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.647.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.650.ebuild
diff --git a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
index 5198af42911..01964f05d97 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r10.ebuild
@@ -41,6 +41,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
epatch "${FILESDIR}"/${P}-mktime-x32.patch # 395641
epatch "${FILESDIR}"/${P}-fix-massive-leak.patch
+ epatch "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
index 4f5a3539155..bfc18183857 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
@@ -33,6 +33,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
epatch "${FILESDIR}"/${P}-install-sh.patch
epatch "${FILESDIR}"/${P}-mktime-x32.patch # 395641
+ epatch "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
index 754e0c14355..b33ca479c3c 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r7.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
epatch "${FILESDIR}"/${P}-install-sh.patch
epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+ epatch "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
index 18e0e6c1f37..a65db04727a 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r8.ebuild
@@ -38,6 +38,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-install-sh.patch
epatch "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
epatch "${FILESDIR}"/${P}-getdelim.patch # 314791
+ epatch "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
index 4531ce4b4e7..d88e63bd36f 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r9.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-getdelim.patch # 314791
epatch "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
epatch "${FILESDIR}"/${P}-mktime-x32.patch # 395641
+ epatch "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
new file mode 100644
index 00000000000..1a9c47b68ba
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
@@ -0,0 +1,201 @@
+https://bugs.gentoo.org/220040
+https://bugs.gentoo.org/570208
+
+update mktime check to latest autoconf version which is less buggy
+
+--- configure
++++ configure
+@@ -5299,26 +6059,25 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ /* Test program from Paul Eggert and Tony Leneis. */
+-#if TIME_WITH_SYS_TIME
++#ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+-# if HAVE_SYS_TIME_H
++# ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ # else
+ # include <time.h>
+ # endif
+ #endif
+
+-#if HAVE_STDLIB_H
+-# include <stdlib.h>
+-#endif
++#include <limits.h>
++#include <stdlib.h>
+
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+
+-#if !HAVE_ALARM
++#ifndef HAVE_ALARM
+ # define alarm(X) /* empty */
+ #endif
+
+@@ -5335,9 +6094,9 @@
+ };
+ #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
+
+-/* Fail if mktime fails to convert a date in the spring-forward gap.
++/* Return 0 if mktime fails to convert a date in the spring-forward gap.
+ Based on a problem report from Andreas Jaeger. */
+-static void
++static int
+ spring_forward_gap ()
+ {
+ /* glibc (up to about 1998-10-07) failed this test. */
+@@ -5356,29 +6115,27 @@
+ tm.tm_min = 0;
+ tm.tm_sec = 0;
+ tm.tm_isdst = -1;
+- if (mktime (&tm) == (time_t)-1)
+- exit (1);
++ return mktime (&tm) != (time_t) -1;
+ }
+
+-static void
++static int
+ mktime_test1 (now)
+ time_t now;
+ {
+ struct tm *lt;
+- if ((lt = localtime (&now)) && mktime (lt) != now)
+- exit (1);
++ return ! (lt = localtime (&now)) || mktime (lt) == now;
+ }
+
+-static void
++static int
+ mktime_test (now)
+ time_t now;
+ {
+- mktime_test1 (now);
+- mktime_test1 ((time_t) (time_t_max - now));
+- mktime_test1 ((time_t) (time_t_min + now));
++ return (mktime_test1 (now)
++ && mktime_test1 ((time_t) (time_t_max - now))
++ && mktime_test1 ((time_t) (time_t_min + now)));
+ }
+
+-static void
++static int
+ irix_6_4_bug ()
+ {
+ /* Based on code from Ariel Faigon. */
+@@ -5391,11 +6148,10 @@
+ tm.tm_sec = 0;
+ tm.tm_isdst = -1;
+ mktime (&tm);
+- if (tm.tm_mon != 2 || tm.tm_mday != 31)
+- exit (1);
++ return tm.tm_mon == 2 && tm.tm_mday == 31;
+ }
+
+-static void
++static int
+ bigtime_test (j)
+ int j;
+ {
+@@ -5417,8 +6173,39 @@
+ && lt->tm_wday == tm.tm_wday
+ && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
+ == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
+- exit (1);
++ return 0;
+ }
++ return 1;
++}
++
++static int
++year_2050_test ()
++{
++ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
++ ignoring leap seconds. */
++ unsigned long int answer = 2527315200UL;
++
++ struct tm tm;
++ time_t t;
++ tm.tm_year = 2050 - 1900;
++ tm.tm_mon = 2 - 1;
++ tm.tm_mday = 1;
++ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
++ tm.tm_isdst = -1;
++
++ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
++ instead of "TZ=America/Vancouver" in order to detect the bug even
++ on systems that don't support the Olson extension, or don't have the
++ full zoneinfo tables installed. */
++ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
++
++ t = mktime (&tm);
++
++ /* Check that the result is either a failure, or close enough
++ to the correct answer that we can assume the discrepancy is
++ due to leap seconds. */
++ return (t == (time_t) -1
++ || (0 < t && answer - 120 <= t && t <= answer + 120));
+ }
+
+ int
+@@ -5432,12 +6219,15 @@
+ isn't worth using anyway. */
+ alarm (60);
+
+- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+- continue;
+- time_t_max--;
+- if ((time_t) -1 < 0)
+- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+- continue;
++ for (;;)
++ {
++ t = (time_t_max << 1) + 1;
++ if (t <= time_t_max)
++ break;
++ time_t_max = t;
++ }
++ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
++
+ delta = time_t_max / 997; /* a suitable prime number */
+ for (i = 0; i < N_STRINGS; i++)
+ {
+@@ -5445,18 +6235,22 @@
+ putenv (tz_strings[i]);
+
+ for (t = 0; t <= time_t_max - delta; t += delta)
+- mktime_test (t);
+- mktime_test ((time_t) 1);
+- mktime_test ((time_t) (60 * 60));
+- mktime_test ((time_t) (60 * 60 * 24));
+-
+- for (j = 1; 0 < j; j *= 2)
+- bigtime_test (j);
+- bigtime_test (j - 1);
++ if (! mktime_test (t))
++ return 1;
++ if (! (mktime_test ((time_t) 1)
++ && mktime_test ((time_t) (60 * 60))
++ && mktime_test ((time_t) (60 * 60 * 24))))
++ return 1;
++
++ for (j = 1; ; j <<= 1)
++ if (! bigtime_test (j))
++ return 1;
++ else if (INT_MAX / 2 < j)
++ break;
++ if (! bigtime_test (INT_MAX))
++ return 1;
+ }
+- irix_6_4_bug ();
+- spring_forward_gap ();
+- exit (0);
++ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
diff --git a/dev-vcs/cvsync/Manifest b/dev-vcs/cvsync/Manifest
new file mode 100644
index 00000000000..f2938246f7b
--- /dev/null
+++ b/dev-vcs/cvsync/Manifest
@@ -0,0 +1 @@
+DIST cvsync-2014.08.24.014706.tar.xz 94820 SHA256 ddb753a03c2e80e9507cb971a1ff0c682e353eb36737189457d6e8e507a04467 SHA512 8aa05d3e2459a14e6abe48eb13b7130aa0bdba7bc9e3604b8406622541450349c233bf43f11804d3820567f882335e1079a9fb747e1d1b8a5d93325bf4e97158 WHIRLPOOL 23ad6ce402f4b3785b0c365b7cc181bf88ed118316e1217034e477b6637d019aee72b149e1cd6d5a1fc0b27773d021d15e202e67c7e76296a69f92ab45e7bb93
diff --git a/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
new file mode 100644
index 00000000000..7013e775230
--- /dev/null
+++ b/dev-vcs/cvsync/cvsync-2014.08.24.014706.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/cvsync/cvsync.git"
+ inherit git-2
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="portable CVS repository synchronization utility"
+HOMEPAGE="https://github.com/cvsync/cvsync"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gcrypt mhash +openssl"
+REQUIRED_USE="!openssl? ( ^^ ( gcrypt mhash ) )"
+
+RDEPEND="sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ !openssl? (
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ mhash? ( app-crypt/mhash )
+ )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+maint_pkg_create() {
+ cd "${S}"
+ local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u "+%Y.%m.%d.%H%M%S")
+ local tar="${T}/${PN}-${ver}.tar.xz"
+ git archive --prefix "${PN}/" HEAD | xz > "${tar}" || die "creating tar failed"
+ einfo "Packaged tar now available:"
+ einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ maint_pkg_create
+ else
+ default
+ fi
+}
+
+_emake() {
+ # USE flag settings are enforced by REQUIRED_USE.
+ local hash=$(usex openssl openssl $(usex gcrypt gcrypt mhash))
+
+ # Probably want to expand this at some point.
+ local host_os="Linux"
+
+ emake \
+ CC="$(tc-getCC)" \
+ ECHO="echo" \
+ TEST="test" \
+ INSTALL="install" \
+ HASH_TYPE="${hash}" \
+ HOST_OS="${host_os}" \
+ BINOWN="$(id -u)" \
+ BINGRP="$(id -g)" \
+ BINDIR="\$(PREFIX)/usr/bin" \
+ MANDIR="\$(PREFIX)/usr/share/man" \
+ "$@"
+}
+
+src_compile() {
+ _emake PREFIX="${EPREFIX}"
+}
+
+src_install() {
+ dodir /usr/bin /usr/share/man/man1
+ _emake PREFIX="${ED}" install
+ dodoc samples/*.conf
+}
diff --git a/dev-vcs/cvsync/cvsync-9999.ebuild b/dev-vcs/cvsync/cvsync-9999.ebuild
new file mode 100644
index 00000000000..7013e775230
--- /dev/null
+++ b/dev-vcs/cvsync/cvsync-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/cvsync/cvsync.git"
+ inherit git-2
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="portable CVS repository synchronization utility"
+HOMEPAGE="https://github.com/cvsync/cvsync"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gcrypt mhash +openssl"
+REQUIRED_USE="!openssl? ( ^^ ( gcrypt mhash ) )"
+
+RDEPEND="sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ !openssl? (
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ mhash? ( app-crypt/mhash )
+ )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+maint_pkg_create() {
+ cd "${S}"
+ local ver=$(date --date="$(git log -n1 --pretty=format:%ci HEAD)" -u "+%Y.%m.%d.%H%M%S")
+ local tar="${T}/${PN}-${ver}.tar.xz"
+ git archive --prefix "${PN}/" HEAD | xz > "${tar}" || die "creating tar failed"
+ einfo "Packaged tar now available:"
+ einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ maint_pkg_create
+ else
+ default
+ fi
+}
+
+_emake() {
+ # USE flag settings are enforced by REQUIRED_USE.
+ local hash=$(usex openssl openssl $(usex gcrypt gcrypt mhash))
+
+ # Probably want to expand this at some point.
+ local host_os="Linux"
+
+ emake \
+ CC="$(tc-getCC)" \
+ ECHO="echo" \
+ TEST="test" \
+ INSTALL="install" \
+ HASH_TYPE="${hash}" \
+ HOST_OS="${host_os}" \
+ BINOWN="$(id -u)" \
+ BINGRP="$(id -g)" \
+ BINDIR="\$(PREFIX)/usr/bin" \
+ MANDIR="\$(PREFIX)/usr/share/man" \
+ "$@"
+}
+
+src_compile() {
+ _emake PREFIX="${EPREFIX}"
+}
+
+src_install() {
+ dodir /usr/bin /usr/share/man/man1
+ _emake PREFIX="${ED}" install
+ dodoc samples/*.conf
+}
diff --git a/dev-vcs/cvsync/metadata.xml b/dev-vcs/cvsync/metadata.xml
new file mode 100644
index 00000000000..d32f150a3a9
--- /dev/null
+++ b/dev-vcs/cvsync/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>vapier@gentoo.org</email>
+ <description>feel free to update</description>
+</maintainer>
+<use>
+ <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for hash functions.</flag>
+ <flag name="mhash">Use <pkg>app-crypt/mhash</pkg> for hash functions.</flag>
+ <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash functions.</flag>
+</use>
+<upstream>
+ <remote-id type="github">cvsync/cvsync</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
index 0648f3ac351..4adf769098c 100644
--- a/dev-vcs/mr/Manifest
+++ b/dev-vcs/mr/Manifest
@@ -1,3 +1,2 @@
-DIST mr-1.20140831.1.tar.gz 44706 SHA256 efb864848d3c557d913138a52e3d5a4736edcccd9f9b46bb65931060cf8548f0 SHA512 f8004c37200bf0f227371d2cb747f38c1bf37d1ff270c299b1a97ee92b22a2be039da3c8e9b31b4402adb8ee985a16764115debedad027c5b0f830ceb3a39216 WHIRLPOOL d2eff39628324c3be7996a715ff487e8cb37313eecaed4dcaa25bc320c5d96ba32cc578a85dab241b53556b297ba29def3cd9ea2b3b5a7afe5e2dac57cfd544b
-DIST mr-1.20141024.tar.gz 45032 SHA256 7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a SHA512 d39428bc9858a3d9649ff841fa688a5cb92632bf957af9101c7f7e709d2821dbc38a2ab5400d9fe31208159873156cc6d740538b5567e758c35afb01744000d6 WHIRLPOOL a806e3543b1fc4864b2581883a348cc1441a75fb8ebd4fe6ab393f8180b820e0b389c0b40123798b8257a1641409747981227b6616368eafda4f3d56e9ba39a5
DIST mr-1.20150503.tar.gz 45613 SHA256 6e61e2a0b298841cbc2ea0106fae7c628a5b34e705aafa7536848c60eb448e89 SHA512 ea850c338c9488b964cffbbf510d65354b6773239d8ba7030e33a881ff7e0490cee6b3aa5f3ae0cd3a298bf874cc6d0edd344b9a801b162cb4b2cd11bfcdb1ee WHIRLPOOL 9c9cea6df047471809a7576e4d24e31a54ba1f23f4cc1b697a77e8188fec5d823e185e72c8944dce57356852bd76fb16ba6d699c21ad977a0aa428ae713e512c
+DIST mr-1.20160123.tar.gz 46724 SHA256 13d3b2c309d8130896e54456ae466763dc187433f737de12179f5e05cb63439c SHA512 ad22f0369530347d104815338f27f5b375b88f323ef3821040db7270e179974018e269ecb650d7fd3a3d42ad62b17dfb7be43645f25e06578e0269f1f744ee4d WHIRLPOOL 3d42223e72b362b4121e312c1526fce4ac19f67ced2345905e085daed5b1e6f172875294fbb0f4faa12db09dc774fb412c3164f7238888824d88b25134242335
diff --git a/dev-vcs/mr/mr-1.20141024.ebuild b/dev-vcs/mr/mr-1.20141024.ebuild
deleted file mode 100644
index c2fb1cc1aaa..00000000000
--- a/dev-vcs/mr/mr-1.20141024.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="myrepos-${PV}"
-
-DESCRIPTION="Multiple Repository management tool"
-HOMEPAGE="https://github.com/joeyh/myrepos"
-SRC_URI="https://github.com/joeyh/myrepos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- dev-perl/libwww-perl
- dev-perl/HTML-Parser
-"
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- dobin mr webcheckout
- doman mr.1 webcheckout.1
- dodoc README debian/changelog \
- mrconfig mrconfig.complex
- insinto /usr/share/${PN}
- doins lib/*
-}
diff --git a/dev-vcs/mr/mr-1.20150503.ebuild b/dev-vcs/mr/mr-1.20150503.ebuild
index 9e6ee3330df..2ea67f3bd8d 100644
--- a/dev-vcs/mr/mr-1.20150503.ebuild
+++ b/dev-vcs/mr/mr-1.20150503.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$
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joeyh/myrepos/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-vcs/mr/mr-1.20140831.1.ebuild b/dev-vcs/mr/mr-1.20160123.ebuild
index d051afa7157..7e61b639811 100644
--- a/dev-vcs/mr/mr-1.20140831.1.ebuild
+++ b/dev-vcs/mr/mr-1.20160123.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$
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/joeyh/myrepos/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-vcs/vcsh/Manifest b/dev-vcs/vcsh/Manifest
index 6542ff7d2c4..23c394b5e33 100644
--- a/dev-vcs/vcsh/Manifest
+++ b/dev-vcs/vcsh/Manifest
@@ -1,3 +1,2 @@
-DIST vcsh-1.20140508-manpage-static.tar.gz 28573 SHA256 1d4d9fe459071da3fffa392c7e62ce1386bc4b24a641e23633494dc2299598e3 SHA512 d9f5ba701e05f14d63c6e3ceebb75190fe30c663d12b5346d7cf19ed0b3e75e96a2676fdca3b86e59516efd21da383ea99ba783a77c0531cd9c980f63ee802ca WHIRLPOOL 8a49b63acbfbe99272e2169613fa3e5564b6b55077b775a43f3d77f212c44d79858889144cc890d10f1bfebab3e9c107ada7565469c7785abe3e61f943415d7b
-DIST vcsh-1.20141026-manpage-static.tar.gz 32248 SHA256 07737a52b7a4165981e05e07ecbc4023fe07a964247f177f6a2aa39f823d15a2 SHA512 7358fe738cbacb5a0bf1709a62422b7722c324c5fe9792a4f2266484b17aa70566ec0606227142eb5645e27fa3bf5d84d1551f8ffccf168b7944a8e552137803 WHIRLPOOL 32ea56edeed05e9ca5b33678d695b8366a676fa44a1deaa8a82c3513f4f41c632151afc47278b561a4a20186a01a71169c7548f4e597e160097a848fd72983e6
DIST vcsh-1.20150502.tar.gz 33813 SHA256 127c7f35e9b097b722917d42f9652375033b12f14b6702a08621cb16205d253f SHA512 54306b424bbef145f1231b88823a6959b6263c11b677200a2d3914e0cdfd0595902e6193cd9acfa53c3c5c3aff18d2e9a974373e70da4516b0237005d95d5630 WHIRLPOOL 51f6a51e625e39e17143dd7ba8d51800bcd17d06849dbce4c35ee3f277b10a575d117cc68be2ffa042085e223c0dc7d1e5aee61ed6921438cc0088ba90295a5f
+DIST vcsh-1.20151229.tar.gz 34481 SHA256 ae069506b0490287aefa582ab4e6af1c7ebc4dca743b17d91e0c8d0327d7a3fa SHA512 213297d008f6f0701e9002e5b44eca0e7eb4bcaf62c12bc1efbf6d5c9590d1ca59a38f102e735eec9b2e85556e003632d948abc4325c7e78e478521d1c164d80 WHIRLPOOL 331abfe5fb22bd5ff72b43cddbe406dd0a6a62e5fed53f2c8ecc59f57d9b6728641941b94c8b82ce2a9ca54a931f72243f38cb8dbf44a1b66a402595d41ea9c0
diff --git a/dev-vcs/vcsh/vcsh-1.20140508-r2.ebuild b/dev-vcs/vcsh/vcsh-1.20140508-r2.ebuild
deleted file mode 100644
index 0749de039c9..00000000000
--- a/dev-vcs/vcsh/vcsh-1.20140508-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION='Manage config files in $HOME via fake bare git repositories'
-HOMEPAGE="https://github.com/RichiH/vcsh/"
-SRC_URI="https://github.com/RichiH/vcsh/archive/v${PV}-manpage-static.tar.gz -> ${P}-manpage-static.tar.gz"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-vcs/git"
-DEPEND=""
-
-DOCS=( changelog README.md CONTRIBUTORS )
-
-S=${S}-manpage-static
-
-src_prepare() {
- default
- sed -i \
- -e 's,vendor-completions,site-functions,' \
- -e "s,\(\$(DOCDIR_PREFIX)\)/\$(self),\1/${PF}," \
- Makefile || die
-}
-
-src_install() {
- default
- dodoc -r doc/sample_hooks
-}
diff --git a/dev-vcs/vcsh/vcsh-1.20150502.ebuild b/dev-vcs/vcsh/vcsh-1.20150502.ebuild
index 2bfc4e8365c..78e9e9b3938 100644
--- a/dev-vcs/vcsh/vcsh-1.20150502.ebuild
+++ b/dev-vcs/vcsh/vcsh-1.20150502.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/RichiH/vcsh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-vcs/git"
diff --git a/dev-vcs/vcsh/vcsh-1.20141026.ebuild b/dev-vcs/vcsh/vcsh-1.20151229.ebuild
index 0749de039c9..8bbd8455316 100644
--- a/dev-vcs/vcsh/vcsh-1.20141026.ebuild
+++ b/dev-vcs/vcsh/vcsh-1.20151229.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$
@@ -6,7 +6,7 @@ EAPI=5
DESCRIPTION='Manage config files in $HOME via fake bare git repositories'
HOMEPAGE="https://github.com/RichiH/vcsh/"
-SRC_URI="https://github.com/RichiH/vcsh/archive/v${PV}-manpage-static.tar.gz -> ${P}-manpage-static.tar.gz"
+SRC_URI="https://github.com/RichiH/vcsh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="0"
@@ -18,14 +18,20 @@ DEPEND=""
DOCS=( changelog README.md CONTRIBUTORS )
-S=${S}-manpage-static
-
src_prepare() {
default
sed -i \
-e 's,vendor-completions,site-functions,' \
-e "s,\(\$(DOCDIR_PREFIX)\)/\$(self),\1/${PF}," \
- Makefile || die
+ Makefile || die "sed failed"
+
+ # remove dysfunctional tests
+ sed -i -e 's,install: all,install:,' \
+ Makefile || die "sed failed"
+}
+
+src_compile() {
+ :
}
src_install() {
diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
index 8aae5c0c774..cac1724e1ed 100644
--- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
REQUIRED_USE="libcanberra? ( notification )
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index f6e3b39f226..6be699a0625 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,2 +1,3 @@
DIST quodlibet-3.4.1.tar.gz 3318301 SHA256 0500f8f2e052a67e4397b8f7c634f800c9ce37c0456820aedbbef4003354ba78 SHA512 2f77825b696c9bdf411a039c234383ea728af0ca85d103082a17e3e9c8a13d180f06147c82fad1f0bb06c6e37e66ad99e8e5c227a8a32ed23ca981f33344ffc9 WHIRLPOOL 59858b25a13b2ec24ddd332f846713c65d5081843efdae98505879c21c430e56b0792c55790636977c09098a4aaf8250cbc93e7f4f1862dc2bcc55a7ba2f0871
DIST quodlibet-3.5.1.tar.gz 3421676 SHA256 f168606ce931c30fcd478d354916bb07ae4ca9a61113af9b988e33f73adcb6c6 SHA512 c14447b17d15ad65fc54e4c81b26b190fa4622b1d83b0b7a4c85e42e332585fe067f93a2f0236bab20186072fb2af0a334bb2741660edb282f1e5e7a00a23c9d WHIRLPOOL 733a7bc88797561a27d2757422bb65bb09f366f91824772b54ac99aefa95b8769f1f566772424a8a819fc7e861bead048ab5c2f4ffc4656d46235454739d09b0
+DIST quodlibet-3.5.3.tar.gz 3421980 SHA256 f11f5986c830812278cc10fb5d5beed423212e249f45e7e8ddc6721e726a5ee7 SHA512 ea564360fa960e3130a318fb3925ff70fc46173b4287be67e9bd541855852101083037b9e72730c4064187fdc9e7be92609ff7f6cb865c94d82a86696a9379f4 WHIRLPOOL 179bc20aea94c3e10bb8c776ef17615316fb2a5edc2798b4a1e9eab7c15df77829102003920d1da2d763aaf03fea74eef9ece8c916f0cb47ebf0ca9e631a134e
diff --git a/media-sound/quodlibet/quodlibet-3.5.3.ebuild b/media-sound/quodlibet/quodlibet-3.5.3.ebuild
new file mode 100644
index 00000000000..6ba96d36007
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.5.3.ebuild
@@ -0,0 +1,70 @@
+# 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 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+ dev-python/feedparser[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-meta:1.0
+ )
+ !gstreamer? ( media-libs/xine-lib )
+ dbus? (
+ app-misc/media-player-info
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )
+ ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
+ udev? ( virtual/udev )
+ !media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+ local qlconfig=${PN}/config.py
+
+ if ! use gstreamer; then
+ sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+ fi
+
+ sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ distutils-r1_src_install
+ dodoc NEWS README
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index e2a289a62e5..c59ac859cc5 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="ipv6 nls bluetooth"
# need to block netcat as we provide the "nc" file now too
diff --git a/net-analyzer/wireshark/wireshark-2.0.2.ebuild b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
index 8427afa27b5..479c692c491 100644
--- a/net-analyzer/wireshark/wireshark-2.0.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="
adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua
+netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark
diff --git a/net-firewall/ipset/ipset-6.24.ebuild b/net-firewall/ipset/ipset-6.24.ebuild
index 0db53d79e7b..3fb97b77f03 100644
--- a/net-firewall/ipset/ipset-6.24.ebuild
+++ b/net-firewall/ipset/ipset-6.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
RDEPEND=">=net-firewall/iptables-1.4.7
net-libs/libmnl"
diff --git a/net-libs/libssh/libssh-0.7.3.ebuild b/net-libs/libssh/libssh-0.7.3.ebuild
index 214ed2f8972..2ad39579cae 100644
--- a/net-libs/libssh/libssh-0.7.3.ebuild
+++ b/net-libs/libssh/libssh-0.7.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.libssh.org/"
SRC_URI="https://red.libssh.org/attachments/download/195/${MY_P}.tar.xz -> ${P}.tar.xz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0/4" # subslot = soname major version
IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
# Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-libs/libssh2/libssh2-1.7.0.ebuild b/net-libs/libssh2/libssh2-1.7.0.ebuild
index 27e18acd42d..ddcfe4165e6 100644
--- a/net-libs/libssh2/libssh2-1.7.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
LICENSE="BSD"
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-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-solaris"
IUSE="gcrypt libressl static-libs test zlib"
DEPEND="
diff --git a/net-libs/zeromq/zeromq-4.1.4.ebuild b/net-libs/zeromq/zeromq-4.1.4.ebuild
index c4461410ca5..0686cadf9e6 100644
--- a/net-libs/zeromq/zeromq-4.1.4.ebuild
+++ b/net-libs/zeromq/zeromq-4.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.zeromq.org/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="pgm static-libs test"
RDEPEND="
diff --git a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
index 2a1f46ca56e..7a5e857c385 100644
--- a/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.10.1.ebuild
@@ -11,7 +11,7 @@ else
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/memcached/memcached-1.4.25.ebuild b/net-misc/memcached/memcached-1.4.25.ebuild
index d6eb3e07eaa..53f09846f64 100644
--- a/net-misc/memcached/memcached-1.4.25.ebuild
+++ b/net-misc/memcached/memcached-1.4.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild
index 2c84db42c90..799f4049453 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server
LICENSE="GPL-2 MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="dev-lang/erlang"
diff --git a/net-misc/radvd/radvd-2.12.ebuild b/net-misc/radvd/radvd-2.12.ebuild
index a6d0c0aa0d7..14b6499957f 100644
--- a/net-misc/radvd/radvd-2.12.ebuild
+++ b/net-misc/radvd/radvd-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="kernel_FreeBSD selinux test"
CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 383f8684f62..bcbce6e1a5d 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,6 +1 @@
-DIST spice-gtk-0.20.tar.bz2 1210694 SHA256 b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df SHA512 db07d05d93bf5639c193f374b6eb3fe9f6bb198f0146e64f8e6e6c03d12e931c1f18a353aed123fe28535a95eb8448ef8a8babc66bdd283f951b8433839d6b9e WHIRLPOOL 82ea2e7a1ebec0155c6aadd03143456498db332e64f4a2c5cb15beb47e0371790ee5fc29b7ff1b40dba34c63dd021cecf6f27cd1aaa1c58c465f9bb2d22ca50e
-DIST spice-gtk-0.21.tar.bz2 1191082 SHA256 73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564 SHA512 970c5de33c5f2117c4c4c0864da4d3796226771be54fdcc5393d17eefecb297cdc0767003699afa03db7e72a9810de4d157217e40de62013e410b90c8c759151 WHIRLPOOL caabfcc4654077dce70d9f82d7ccd77bd390d365c23f6c82c906b5490c1dd135c82c48e2aab486b699470829b24b3253dcb39c22921c13132dc16a03369d62f9
-DIST spice-gtk-0.25.tar.bz2 1242457 SHA256 0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087 SHA512 5d44ffa784af3c94492e80129b7350065f4d108c8e3bc42be673fc1f42b47023757d0b8131d047432b7c59c03662db0652759cb4bdf677062a6d1e0508d02bd9 WHIRLPOOL 63002ec6d309c949d296e70ff5e22a7cf9e8300e7001e37a4a5b2de6ccb833915d884798347e04a06c60ea4508f85f265b3d4b4dc1c00a3a8e036ddf21e003f8
-DIST spice-gtk-0.28.tar.bz2 1274095 SHA256 15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4 SHA512 a183ab3d9a463de13acc3333d6927fbaba00f184b40f4346d1fd4de94a3394a6cdfeb51b02666be9154d9f65184d1499560f2aa5a387a526915671e951e1493f WHIRLPOOL 96e25ec39b060136b9e6b1cbb5c38c06f319aeb582742acc2741abb29ea45853fe2fe5f2c2da5a0c61176bdd68e37a7be1f64d0b02b1e8db6754514a2a20bfe5
-DIST spice-gtk-0.29.tar.bz2 1277160 SHA256 44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973 SHA512 87cdcc5daa0f14eda5225cbe5cf0f29c1fb059c9fbbd6dfd52da02655db13f67f508c448dd5754877e12c577b5efde230914928fd91fcccf33eff52fac2319b0 WHIRLPOOL 96e2a2acaef4b824316aefdf5af59b45b33393264c70761cd7754b860166dafc3340526ca3f51dcf425dd904b35f27c1da83d0124a7c66b0b9fc6de6c0f85d1b
DIST spice-gtk-0.30.tar.bz2 1228727 SHA256 e23323fa399efba17b3c18475ef10a29815851be5e7dbedd246b28ee8eb1379c SHA512 8a0ad6df3b1ab353d1e63178e13e440c07751821d9693a1599d6f61dece6ed20b664511abaa50771b026be0f457787b0bb5b172884e68c7a95d9068b0bb79198 WHIRLPOOL e58798cbabfe716dcf35a7668ed8e9838f347b13dd25e13ec5d290f35da2170d321a9a3bb2701564b14564ee89f2b43c8b6fcb84d85ed2293514a2f7c9d3759a
diff --git a/net-misc/spice-gtk/files/0.12-parallel-install.patch b/net-misc/spice-gtk/files/0.12-parallel-install.patch
deleted file mode 100644
index 04a22bdf066..00000000000
--- a/net-misc/spice-gtk/files/0.12-parallel-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 7b29e61..86b3939 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -505,6 +505,11 @@ vncdisplaykeymap_win322xtkbd.c:
- if WITH_PYTHON
- pyexec_LTLIBRARIES = SpiceClientGtk.la
-
-+# workaround for broken parallel install support in automake with LTLIBRARIES
-+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
-+install_pyexecLTLIBRARIES = install-pyexecLTLIBRARIES
-+$(install_pyexecLTLIBRARIES): install-libLTLIBRARIES
-+
- SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS)
- SpiceClientGtk_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(WARN_PYFLAGS)
- SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC
diff --git a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch b/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
deleted file mode 100644
index 04679453180..00000000000
--- a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a8a6ac1d0f4893860efad48833ce6168f684054a Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 25 Sep 2012 12:59:13 +0200
-Subject: [PATCH 01/21] Deal with libusbredirparser.pc rename to
- libusbredirparser-0.5.pc
-
-The usbredir 0.5 release introduced the new API for 64 bit packet ids, but
-it kept the libusbredirparser.pc name as is, meaning that older versions of
-qemu will still have their pkg-config check for usbredirparser fulfilled,
-and build with the usb-redir device. Due to the API change there will be
-some compiler warnings, but the build will succeed, however the usb-redir
-device will be broken on 32 bit machines.
-
-To solve this, the usbredir-0.5.2 release renames the libusbredirparser.pc
-file to libusbredirparser-0.5.pc, so that it will no longer fulfill the
-pkg-config check of the qemu-1.2 and older releases, stopping the (silent)
-breakage.
-
-spice-gtk does not use the changed parts of the API, but does
-use libusbredirparser for the usbredirfilter* functions. This patch adapts
-spice-gtk's configure to accept both the libusbredirparser-0.5 and the
-libusbredirparser pkg-config names.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- configure.ac | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c7367cc..7c59575 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,10 +349,17 @@ AC_ARG_ENABLE([usbredir],
- if test "x$enable_usbredir" = "xno"; then
- have_usbredir="no"
- else
-- PKG_CHECK_MODULES([USBREDIR],
-- [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-- [have_usbredir=yes],
-- [have_usbredir=no])
-+ if ${PKG_CONFIG} libusbredirparser-0.5; then
-+ PKG_CHECK_MODULES([USBREDIR],
-+ [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5],
-+ [have_usbredir=yes],
-+ [have_usbredir=no])
-+ else
-+ PKG_CHECK_MODULES([USBREDIR],
-+ [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-+ [have_usbredir=yes],
-+ [have_usbredir=no])
-+ fi
- if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then
- AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available])
- fi
---
-1.7.12.1
-
diff --git a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch b/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
deleted file mode 100644
index 92be8ccc5aa..00000000000
--- a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6d454e4100a01499c13d55057fdd9307437a5f87 Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Wed, 16 Jan 2013 22:47:18 +0000
-Subject: build-sys: fix out-of-tree build with vala
-
----
-diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
-index f2abf93..00552e8 100644
---- a/gtk/controller/Makefile.am
-+++ b/gtk/controller/Makefile.am
-@@ -76,14 +76,16 @@ spice_controller_dump_SOURCES = dump.c
- spice_controller_dump_LDADD = libspice-controller.la
-
- controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi
-- @if test -z "$(VALAC)"; then \
-- echo "" ; \
-- echo " *** Error: missing valac!" ; \
-+ @if test -z "$(VALAC)"; then \
-+ echo "" ; \
-+ echo " *** Error: missing valac!" ; \
- echo " *** You must run autogen.sh or configure --enable-vala" ; \
-- echo "" ; \
-- exit 1 ; \
-+ echo "" ; \
-+ exit 1 ; \
- fi
-- $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h
-+ $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) \
-+ $(addprefix $(srcdir)/,$(libspice_controller_la_VALASOURCES)) \
-+ -H spice-controller.h
- @touch $@
-
- $(libspice_controller_la_BUILT_SOURCES): controller.vala.stamp
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch b/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch
deleted file mode 100644
index 3375d801ab2..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 26 Jun 2013 15:39:39 +0000
-Subject: Add spice_channel_string_to_type to map files
-
-And document both spice_channel_string_to_type and
-spice_channel_type_to_string.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
-diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt
-index e1e2833..8d61aa9 100644
---- a/doc/reference/spice-gtk-sections.txt
-+++ b/doc/reference/spice-gtk-sections.txt
-@@ -98,6 +98,7 @@ spice_channel_disconnect
- spice_channel_test_capability
- spice_channel_test_common_capability
- spice_channel_type_to_string
-+spice_channel_string_to_type
- spice_channel_set_capability
- spice_channel_flush_async
- spice_channel_flush_finish
-diff --git a/gtk/map-file b/gtk/map-file
-index a0b7330..a69eb40 100644
---- a/gtk/map-file
-+++ b/gtk/map-file
-@@ -11,6 +11,7 @@ spice_channel_get_type;
- spice_channel_new;
- spice_channel_open_fd;
- spice_channel_set_capability;
-+spice_channel_string_to_type;
- spice_channel_test_capability;
- spice_channel_test_common_capability;
- spice_channel_type_to_string;
-diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
-index 0a32d6c..093b292 100644
---- a/gtk/spice-channel.c
-+++ b/gtk/spice-channel.c
-@@ -1884,6 +1884,15 @@ static const char *to_string[] = {
- [ SPICE_CHANNEL_PORT ] = "port",
- };
-
-+/**
-+ * spice_channel_type_to_string:
-+ * @type: a channel-type property value
-+ *
-+ * Convert a channel-type property value to a string.
-+ *
-+ * Returns: string representation of @type.
-+ * Since: 0.20
-+ **/
- const gchar* spice_channel_type_to_string(gint type)
- {
- const char *str = NULL;
-@@ -1895,6 +1904,15 @@ const gchar* spice_channel_type_to_string(gint type)
- return str ? str : "unknown channel type";
- }
-
-+/**
-+ * spice_channel_string_to_type:
-+ * @str: a string representation of the channel-type property
-+ *
-+ * Convert a channel-type property value to a string.
-+ *
-+ * Returns: the channel-type property value for a @str channel
-+ * Since: 0.21
-+ **/
- gint spice_channel_string_to_type(const gchar *str)
- {
- int i;
-diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
-index 2b172d0..8540307 100644
---- a/gtk/spice-glib-sym-file
-+++ b/gtk/spice-glib-sym-file
-@@ -14,6 +14,7 @@ spice_channel_set_capability
- spice_channel_test_capability
- spice_channel_test_common_capability
- spice_channel_type_to_string
-+spice_channel_string_to_type
- spice_client_error_quark
- spice_cursor_channel_get_type
- spice_display_channel_get_type
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch b/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
deleted file mode 100644
index 83e51db67d8..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f31bc2a9a6700bebc258130e802f40180af77d8e Mon Sep 17 00:00:00 2001
-From: Marc-André Lureau <marcandre.lureau@redhat.com>
-Date: Fri, 20 Sep 2013 15:54:58 +0000
-Subject: build-sys: fix g_clear_pointer usage on old glib
-
-As pointed out and verified on the ML after 0.21 release by Klaus
-Hochlehnert.
----
-diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
-index 0443b9f..bbfb3c9 100644
---- a/gtk/channel-cursor.c
-+++ b/gtk/channel-cursor.c
-@@ -15,6 +15,7 @@
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-+#include "glib-compat.h"
- #include "spice-client.h"
- #include "spice-common.h"
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
deleted file mode 100644
index fe24734ed0d..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1dcf7acb4288a27f125458bfa86cf614437657d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
-Date: Tue, 20 May 2014 18:49:28 +0200
-Subject: [PATCH 2/2] Do not depend on libsoup directly
-
-The libsoup-dependency is not directly used but comes in as a dependency
-of phodav and phodav has libsoup correctly recorded in its pkg-config
-file.
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 70ab75c..f47ee20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-
--PKG_CHECK_MODULES(SOUP, libsoup-2.4)
--AC_SUBST(SOUP_CFLAGS)
--AC_SUBST(SOUP_LIBS)
- AC_ARG_ENABLE([webdav],
- AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
- [Enable webdav support @<:@default=auto@:>@]),
---
-1.9.2
-
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
deleted file mode 100644
index 817a9b0a6d0..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f25626a68a2fb83b02ee7a13dd4887d1305bc068 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
-Date: Tue, 20 May 2014 18:48:05 +0200
-Subject: [PATCH 1/2] Introduce --enable/disable-webdav option
-
-This makes the phodav dependency configureable.
-And name it after the corresponding channel.
----
- configure.ac | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d89bd6f..70ab75c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4)
- AC_SUBST(SOUP_CFLAGS)
- AC_SUBST(SOUP_LIBS)
-+AC_ARG_ENABLE([webdav],
-+ AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
-+ [Enable webdav support @<:@default=auto@:>@]),
-+ [],
-+ [enable_webdav="auto"])
-+
-+if test "x$enable_webdav" = "xno"; then
-+ have_phodav="no"
-+else
-+ PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
-+ AC_SUBST(PHODAV_CFLAGS)
-+ AC_SUBST(PHODAV_LIBS)
-
--PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
--AC_SUBST(PHODAV_CFLAGS)
--AC_SUBST(PHODAV_LIBS)
-+ if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then
-+ AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available])
-+ fi
-+fi
- AS_IF([test "x$have_phodav" = "xyes"],
- AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
-
-@@ -754,7 +767,7 @@ AC_MSG_NOTICE([
- Smartcard support: ${have_smartcard}
- USB redirection support: ${have_usbredir} ${with_usbredir_hotplug}
- DBus: ${have_dbus}
-- PhoDAV: ${have_phodav}
-+ WebDAV support: ${have_phodav}
-
- Now type 'make' to build $PACKAGE
-
---
-1.9.2
-
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
deleted file mode 100644
index 8429afd5060..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 8da1a11..6332db9 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -189,6 +189,7 @@ libspice_client_glib_2_0_la_LIBADD = \
- $(top_builddir)/spice-common/common/libspice-common-client.la \
- $(GLIB2_LIBS) \
- $(SOUP_LIBS) \
-+ $(GIO_LIBS) \
- $(GOBJECT2_LIBS) \
- $(CELT051_LIBS) \
- $(OPUS_LIBS) \
diff --git a/net-misc/spice-gtk/files/spice.protocol b/net-misc/spice-gtk/files/spice.protocol
deleted file mode 100644
index 348247f8ca1..00000000000
--- a/net-misc/spice-gtk/files/spice.protocol
+++ /dev/null
@@ -1,12 +0,0 @@
-[Protocol]
-exec=/usr/bin/spicy --uri="%u"
-protocol=spice
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-
diff --git a/net-misc/spice-gtk/files/spice.schemas b/net-misc/spice-gtk/files/spice.schemas
deleted file mode 100644
index 43b12171c84..00000000000
--- a/net-misc/spice-gtk/files/spice.schemas
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-<schemalist>
-<schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/enabled</key>
- <applyto>/desktop/gnome/url-handlers/spice/enabled</applyto>
- <owner>spice</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>How to handle spice URLs</short>
- <long>Set to true to have a program specified in command handle spice URLs</long>
- </locale>
-</schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/command</key>
- <applyto>/desktop/gnome/url-handlers/spice/command</applyto>
- <owner>spice</owner>
- <type>string</type>
- <default>/usr/bin/spicy --uri="%s"</default>
- <locale name="C">
- <short>URL handler for spice URIs</short>
- <long>URL handler for spice URIs</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/need-terminal</key>
- <applyto>/desktop/gnome/url-handlers/spice/need-terminal</applyto>
- <owner>spice</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run program in terminal</short>
- <long>True if the program to handle this URL should be run in a terminal</long>
- </locale>
- </schema>
-</schemalist>
-</gconfschemafile>
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild
deleted file mode 100644
index e447d1bddce..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/libcacard )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.101 )
- )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-
- epatch "${FILESDIR}"/${P}-add-spice-channel-string-to-type.patch
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.21.ebuild b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
deleted file mode 100644
index efdc4045265..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.21.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/libcacard )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
-
- epatch "${FILESDIR}"/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
-
- epatch_user
-
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
deleted file mode 100644
index 4f5d78f9b99..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? ( net-libs/phodav:1.0 )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-Introduce-enable-disable-webdav-option.patch" \
- "${FILESDIR}/${P}-Do-not-depend-on-libsoup-directly.patch" \
- "${FILESDIR}/${P}-missing_gio_libs.patch"
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.28.ebuild b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
deleted file mode 100644
index 34ea2b782b3..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.28.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multibuild python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ?? ( pulseaudio gstreamer )
-"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- ${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl:=
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.28:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-src_prepare() {
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- # Parameter of --with-gtk
- MULTIBUILD_VARIANTS=( 2.0 )
- use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-
- configure() {
- local myconf=()
- myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
- if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
- myconf+=( $(use_with python) )
- else
- myconf+=( --without-python )
- fi
-
- ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
- }
- multibuild_foreach_variant run_in_build_dir configure ${myconf}
-}
-
-src_compile() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- multibuild_foreach_variant run_in_build_dir default
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.29.ebuild b/net-misc/spice-gtk/spice-gtk-0.29.ebuild
deleted file mode 100644
index 33656b080ca..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.29.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multibuild python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ?? ( pulseaudio gstreamer )
-"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- ${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl:=
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.28:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-src_prepare() {
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- # Parameter of --with-gtk
- MULTIBUILD_VARIANTS=( 2.0 )
- use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-
- configure() {
- local myconf=()
- myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
- if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
- myconf+=( $(use_with python) )
- else
- myconf+=( --without-python )
- fi
-
- ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
- }
- multibuild_foreach_variant run_in_build_dir configure ${myconf}
-}
-
-src_compile() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- multibuild_foreach_variant run_in_build_dir default
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-proxy/squid/squid-3.5.15.ebuild b/net-proxy/squid/squid-3.5.15.ebuild
index f92b88f09c4..02542ffa9e2 100644
--- a/net-proxy/squid/squid-3.5.15.ebuild
+++ b/net-proxy/squid/squid-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite \
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 38092793593..f2b2cbc499b 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -108,7 +108,6 @@ libupnp
zvbi
ldap
mysql
-postgres
dvd
fluidsynth
gnomecd
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index fbb652ec815..de042f7d4f7 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,10 +4,6 @@
# DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
-# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
-# Missing test deps keyword #575366
-dev-cpp/eigen test
-
# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
# Needs arch love for elementary. #575322
media-libs/elementary javascript
diff --git a/profiles/package.mask b/profiles/package.mask
index 1573110338f..8390676e8ec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -228,10 +228,6 @@ www-apache/mod_auth_pgsql
dev-perl/ExtUtils-Constant
# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
-# Not useful anymore, bug #562998. Removal in a month.
-app-editors/xmlcopyeditor
-
-# Pacho Ramos <pacho@gentoo.org> (08 Jan 2016)
# Doesn't work at all, bug #564106. Removal in a month.
media-gfx/fr0st
diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent
index 085c1b8aefb..f3229c5b987 100644
--- a/profiles/prefix/linux/parent
+++ b/profiles/prefix/linux/parent
@@ -1,2 +1 @@
-../../features/prefix/rpath
..
diff --git a/profiles/prefix/parent b/profiles/prefix/parent
index a88ecf69d27..4085e5ad378 100644
--- a/profiles/prefix/parent
+++ b/profiles/prefix/parent
@@ -1,2 +1,2 @@
-../base
../features/prefix/rpath
+../base
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index d294b0baf4b..735318aeeec 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1 @@
-DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
+DIST mapserver-7.0.0.tar.gz 2495028 SHA256 b306b8111e0718a577ce595640c2d3224f913745af732a1b75f6f5cb3dddce45 SHA512 1e4d15f6c42cdf0b00533e2aa26c1b65f84bdbb3a91538d6addde3aa0e8874deed4969146cf7045858bcab2880e4d7429965660c5985d175bd19ce018ae90652 WHIRLPOOL f18f0679b70da795d0585df2dbcc07fda0f8533c9ef7972280301446e5d521d9f24f0ff482d8e5497954e3b67436f2f9f2576516f6f088dc388046314817a46b
diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
deleted file mode 100644
index d202b8d4692..00000000000
--- a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 56cb209..46a8a4c 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -252,7 +252,7 @@ SUP_LIBS = $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
- # STATIC_LIBS is full filename with path of libs that will be statically linked
- STATIC_LIBS= $(GD_STATIC)
-
--EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-
- RM= /bin/rm -f
-
-@@ -316,59 +316,59 @@ $(LIBMAP_SHARED): $(LIBMAP_STATIC)
- && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
-
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
-- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
-+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
-
- shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h
-- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
-+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
-
- sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h
-- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
-+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
-
- legend: $(LIBMAP_STATIC) legend.o mapserver.h
-- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
-+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
-
- scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h
-- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
-+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
-
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h
-- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
-+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
-
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
-- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
-+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
-
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
-- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
-+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
-
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
-- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
-+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
-
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
-- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
-+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
-
- sortshp: sortshp.o
-- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
-+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
-
- tile4ms: tile4ms.o
-- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
-+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
-
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
-- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
-+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
-
- testexpr: testexpr.o mapparser.o maplexer.o
-- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
-+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
-
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
-- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
-+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
-
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c
-- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
-+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
-
- mapscriptvars: Makefile
- touch mapscriptvars
- pwd > mapscriptvars
- echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
- echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
-- echo $(EXE_LDFLAGS) >> mapscriptvars
-+ echo $(LDFLAGS) >> mapscriptvars
- echo $(STATIC_LIBS) >> mapscriptvars
- grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
-
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
deleted file mode 100644
index 8016961b515..00000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h
---- mapserver-6.0.0-rc1.old/mapscript/php/bool.h 1970-01-01 01:00:00.000000000 +0100
-+++ mapserver-6.0.0-rc1/mapscript/php/bool.h 2011-05-02 22:00:00.000000000 +0200
-@@ -0,0 +1,8 @@
-+#ifndef BOOL_H
-+#define BOOL_H
-+
-+#define bool_t int
-+#define TRUE 1
-+#define FALSE 0
-+
-+#endif /* BOOL_H */
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h
---- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h 2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h 2011-05-02 22:00:11.000000000 +0200
-@@ -32,6 +32,7 @@
- #ifndef PHP_MAPSCRIPT_H
- #define PHP_MAPSCRIPT_H
-
-+#include "bool.h"
- #include "php.h"
- #include "zend_interfaces.h"
- #include "php_mapscript_util.h"
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
deleted file mode 100644
index 336fb2eff4f..00000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN mapserver-6.0.0-rc1.old/Makefile.in mapserver-6.0.0-rc1/Makefile.in
---- mapserver-6.0.0-rc1.old/Makefile.in 2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/Makefile.in 2011-05-02 16:29:31.000000000 +0200
-@@ -264,7 +264,7 @@
- # STATIC_LIBS is full filename with path of libs that will be statically linked
- STATIC_LIBS= $(GD_STATIC)
-
--EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
-
- RM= /bin/rm -f
-
-@@ -351,59 +351,59 @@
- && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
-
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
-- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
-+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
-
- shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h
-- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
-+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
-
- sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h
-- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
-+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
-
- legend: $(LIBMAP_STATIC) legend.o mapserver.h
-- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
-+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
-
- scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h
-- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
-+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
-
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h
-- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
-+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
-
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
-- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
-+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
-
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
-- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
-+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
-
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
-- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
-+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
-
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
-- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
-+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
-
- sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h
-- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
-+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
-
- tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h
-- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
-+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
-
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
-- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
-+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
-
- testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h
-- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
-+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
-
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
-- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
-+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
-
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h
-- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
-+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
-
- mapscriptvars: Makefile
- touch mapscriptvars
- pwd > mapscriptvars
- echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
- echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
-- echo $(EXE_LDFLAGS) >> mapscriptvars
-+ echo $(EXE_LIBS) >> mapscriptvars
- echo $(STATIC_LIBS) >> mapscriptvars
- grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
-
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
deleted file mode 100644
index 706bae4ce7b..00000000000
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in 2011-05-02 12:10:03.000000000 +0200
-+++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in 2011-05-02 23:43:15.000000000 +0200
-@@ -86,10 +86,10 @@
-
-
- php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
-- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
-+ $(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS)
-
- php_proj.so: $(PHPPROJ_OBJS)
-- $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
-+ $(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS)
-
- %.o: %.c php_mapscript_util.h php_mapscript.h
- $(CC) $(CFLAGS112) -c -o $@ $<
diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
deleted file mode 100644
index e81fd90195f..00000000000
--- a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c
---- mapserver-6.0.1.orig/mapscript/php/image.c 2011-04-05 11:15:06.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/image.c 2015-02-04 14:29:03.164357015 -0500
-@@ -303,10 +303,18 @@
- /* no filename - read stdout */
-
- /* if there is no output buffer active, set the header */
-- if (OG(ob_nesting_level)<=0)
-- {
-- php_header(TSRMLS_C);
-- }
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ if (OG(ob_nesting_level)<=0)
-+ {
-+ php_header(TSRMLS_C);
-+ }
-+ #else
-+ if (php_output_get_level(TSRMLS_C)<=0)
-+ {
-+ php_header(TSRMLS_C);
-+ }
-+ #endif
-
-
- if (MS_RENDERER_PLUGIN(php_image->image->format))
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c 2011-04-05 23:05:02.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/php_mapscript.c 2015-02-04 14:27:52.296567202 -0500
-@@ -899,7 +899,7 @@
-
- }
-
--function_entry mapscript_functions[] = {
-+zend_function_entry mapscript_functions[] = {
- PHP_FE(ms_GetVersion, NULL)
- PHP_FE(ms_GetVersionInt, NULL)
- PHP_FE(ms_newLineObj, NULL)
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c 2011-04-04 13:50:20.000000000 -0400
-+++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c 2015-02-04 14:27:27.477341249 -0500
-@@ -42,7 +42,12 @@
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ #else
-+ object_properties_init(zobj, ce);
-+ #endif
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = &mapscript_std_object_handlers;
- return retval;
-@@ -59,7 +64,12 @@
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ //handle changes in PHP 5.4.x
-+ #if PHP_VERSION_ID < 50399
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+ #else
-+ object_properties_init(zobj, ce);
-+ #endif
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = object_handlers;
- return retval;
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch
new file mode 100644
index 00000000000..6ea6d9296f5
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-OGREscapeSQLParam.patch
@@ -0,0 +1,22 @@
+diff --git a/mapogr.cpp b/mapogr.cpp
+index 1708d1c..217239b 100755
+--- a/mapogr.cpp
++++ b/mapogr.cpp
+@@ -1311,6 +1311,8 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
+ return MS_SUCCESS;
+ }
+
++#endif
++
+ /************************************************************************/
+ /* msOGREscapeSQLParam */
+ /************************************************************************/
+@@ -1337,6 +1339,8 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
+ #endif /* USE_OGR */
+ }
+
++#ifdef USE_OGR
++
+ /**********************************************************************
+ * msOGRTranslateMsExpressionToOGRSQL()
+ *
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
new file mode 100644
index 00000000000..73834571785
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-correct-min-max-calls.patch
@@ -0,0 +1,511 @@
+diff --git a/mapcontour.c b/mapcontour.c
+index ae52fc6..74cf7d1 100644
+--- a/mapcontour.c
++++ b/mapcontour.c
+@@ -345,11 +345,11 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ ury = floor(ury / virtual_grid_step_y) * virtual_grid_step_y - (virtual_grid_step_x*5);
+ lly = ceil(lly / virtual_grid_step_y) * virtual_grid_step_y + (virtual_grid_step_x*5);
+
+- src_xoff = MAX(0,(int) floor(llx+0.5));
+- src_yoff = MAX(0,(int) floor(ury+0.5));
+- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
++ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
++ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
+ GDALGetRasterXSize(clinfo->hOrigDS) - src_xoff);
+- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
+ GDALGetRasterYSize(clinfo->hOrigDS) - src_yoff);
+
+ /* Update the geographic extent (buffer added) */
+@@ -386,8 +386,8 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ } else {
+ src_xoff = 0;
+ src_yoff = 0;
+- dst_xsize = src_xsize = MIN(map->width,src_xsize);
+- dst_ysize = src_ysize = MIN(map->height,src_ysize);
++ dst_xsize = src_xsize = MS_MIN(map->width,src_xsize);
++ dst_ysize = src_ysize = MS_MIN(map->height,src_ysize);
+ copyRect.minx = copyRect.miny = 0;
+ copyRect.maxx = map->width;
+ copyRect.maxy = map->height;
+@@ -436,7 +436,7 @@ static int msContourLayerReadRaster(layerObj *layer, rectObj rect)
+ adfGeoTransform[4] = 0;
+ adfGeoTransform[5] = -dst_cellsize_y;
+
+- clinfo->cellsize = MAX(dst_cellsize_x, dst_cellsize_y);
++ clinfo->cellsize = MS_MAX(dst_cellsize_x, dst_cellsize_y);
+ {
+ char buf[64];
+ sprintf(buf, "%lf", clinfo->cellsize);
+diff --git a/mapdrawgdal.c b/mapdrawgdal.c
+index e843318..f90f2ac 100644
+--- a/mapdrawgdal.c
++++ b/mapdrawgdal.c
+@@ -217,21 +217,21 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ urx = GEO_TRANS(adfInvGeoTransform+0,copyRect.maxx,copyRect.maxy);
+ ury = GEO_TRANS(adfInvGeoTransform+3,copyRect.maxx,copyRect.maxy);
+
+- src_xoff = MAX(0,(int) floor(llx+0.5));
+- src_yoff = MAX(0,(int) floor(ury+0.5));
+- src_xsize = MIN(MAX(0,(int) (urx - llx + 0.5)),
++ src_xoff = MS_MAX(0,(int) floor(llx+0.5));
++ src_yoff = MS_MAX(0,(int) floor(ury+0.5));
++ src_xsize = MS_MIN(MS_MAX(0,(int) (urx - llx + 0.5)),
+ GDALGetRasterXSize(hDS) - src_xoff);
+- src_ysize = MIN(MAX(0,(int) (lly - ury + 0.5)),
++ src_ysize = MS_MIN(MS_MAX(0,(int) (lly - ury + 0.5)),
+ GDALGetRasterYSize(hDS) - src_yoff);
+
+ /* We want very small windows to use at least one source pixel (#4172) */
+ if( src_xsize == 0 && (urx - llx) > 0.0 ) {
+ src_xsize = 1;
+- src_xoff = MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
++ src_xoff = MS_MIN(src_xoff,GDALGetRasterXSize(hDS)-1);
+ }
+ if( src_ysize == 0 && (lly - ury) > 0.0 ) {
+ src_ysize = 1;
+- src_yoff = MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
++ src_yoff = MS_MIN(src_yoff,GDALGetRasterYSize(hDS)-1);
+ }
+
+ if( src_xsize == 0 || src_ysize == 0 ) {
+@@ -251,11 +251,11 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+
+ dst_lrx = (int) ((copyRect.maxx - mapRect.minx) / map->cellsize + 0.5);
+ dst_lry = (int) ((mapRect.maxy - copyRect.miny) / map->cellsize + 0.5);
+- dst_lrx = MAX(0,MIN(image->width,dst_lrx));
+- dst_lry = MAX(0,MIN(image->height,dst_lry));
++ dst_lrx = MS_MAX(0,MS_MIN(image->width,dst_lrx));
++ dst_lry = MS_MAX(0,MS_MIN(image->height,dst_lry));
+
+- dst_xsize = MAX(0,MIN(image->width,dst_lrx - dst_xoff));
+- dst_ysize = MAX(0,MIN(image->height,dst_lry - dst_yoff));
++ dst_xsize = MS_MAX(0,MS_MIN(image->width,dst_lrx - dst_xoff));
++ dst_ysize = MS_MAX(0,MS_MIN(image->height,dst_lry - dst_yoff));
+
+ if( dst_xsize == 0 || dst_ysize == 0 ) {
+ if( layer->debug )
+@@ -290,8 +290,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ else {
+ dst_xoff = src_xoff = 0;
+ dst_yoff = src_yoff = 0;
+- dst_xsize = src_xsize = MIN(image->width,src_xsize);
+- dst_ysize = src_ysize = MIN(image->height,src_ysize);
++ dst_xsize = src_xsize = MS_MIN(image->width,src_xsize);
++ dst_ysize = src_ysize = MS_MIN(image->height,src_ysize);
+ }
+
+ /*
+@@ -533,7 +533,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ return -1;
+ }
+
+- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
+ for(i=0; i < color_count; i++) {
+ colorObj pixel;
+ int colormap_index;
+@@ -598,7 +598,7 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
+ cmap_set = TRUE;
+ #endif
+
+- color_count = MIN(256,GDALGetColorEntryCount(hColorMap));
++ color_count = MS_MIN(256,GDALGetColorEntryCount(hColorMap));
+
+ for(i=0; i < color_count; i++) {
+ GDALColorEntry sEntry;
+@@ -889,8 +889,8 @@ static int ParseDefaultLUT( const char *lut_def, GByte *lut )
+ lut_read++;
+ }
+
+- this_in = MAX(0,MIN(255,this_in));
+- this_out = MAX(0,MIN(255,this_out));
++ this_in = MS_MAX(0,MS_MIN(255,this_in));
++ this_out = MS_MAX(0,MS_MIN(255,this_out));
+
+ /* apply linear values from last in:out to this in:out */
+ for( lut_i = last_in; lut_i <= this_in; lut_i++ ) {
+@@ -1275,8 +1275,8 @@ LoadGDALImages( GDALDatasetH hDS, int band_numbers[4], int band_count,
+ bMinMaxSet = TRUE;
+ }
+
+- dfScaleMin = MIN(dfScaleMin,pafRawData[i]);
+- dfScaleMax = MAX(dfScaleMax,pafRawData[i]);
++ dfScaleMin = MS_MIN(dfScaleMin,pafRawData[i]);
++ dfScaleMax = MS_MAX(dfScaleMax,pafRawData[i]);
+ }
+
+ if( dfScaleMin == dfScaleMax )
+@@ -1768,8 +1768,8 @@ msDrawRasterLayerGDAL_16BitClassification(
+ fDataMin = fDataMax = pafRawData[i];
+ bGotFirstValue = TRUE;
+ } else {
+- fDataMin = MIN(fDataMin,pafRawData[i]);
+- fDataMax = MAX(fDataMax,pafRawData[i]);
++ fDataMin = MS_MIN(fDataMin,pafRawData[i]);
++ fDataMax = MS_MAX(fDataMax,pafRawData[i]);
+ }
+ }
+
+@@ -2018,7 +2018,7 @@ int *msGetGDALBandList( layerObj *layer, void *hDS,
+ /* -------------------------------------------------------------------- */
+ if( CSLFetchNameValue( layer->processing, "BANDS" ) == NULL ) {
+ if( max_bands > 0 )
+- *band_count = MIN(file_bands,max_bands);
++ *band_count = MS_MIN(file_bands,max_bands);
+ else
+ *band_count = file_bands;
+
+diff --git a/maprasterquery.c b/maprasterquery.c
+index 80accfa..06f0ece 100644
+--- a/maprasterquery.c
++++ b/maprasterquery.c
+@@ -330,11 +330,11 @@ static void msRasterQueryAddPixel( layerObj *layer, pointObj *location,
+ /* -------------------------------------------------------------------- */
+ else {
+ if( rlinfo->band_count >= 3 ) {
+- red = (int) MAX(0,MIN(255,values[0]));
+- green = (int) MAX(0,MIN(255,values[1]));
+- blue = (int) MAX(0,MIN(255,values[2]));
++ red = (int) MS_MAX(0,MS_MIN(255,values[0]));
++ green = (int) MS_MAX(0,MS_MIN(255,values[1]));
++ blue = (int) MS_MAX(0,MS_MIN(255,values[2]));
+ } else {
+- red = green = blue = (int) MAX(0,MIN(255,values[0]));
++ red = green = blue = (int) MS_MAX(0,MS_MIN(255,values[0]));
+ }
+ }
+
+@@ -454,35 +454,35 @@ msRasterQueryByRectLow(mapObj *map, layerObj *layer, GDALDatasetH hDS,
+ /* top right */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.maxy);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.maxy);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* bottom left */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.minx, searchrect.miny);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.minx, searchrect.miny);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* bottom right */
+ dfX = GEO_TRANS(adfInvGeoTransform , searchrect.maxx, searchrect.miny);
+ dfY = GEO_TRANS(adfInvGeoTransform+3, searchrect.maxx, searchrect.miny);
+- dfXMin = MIN(dfXMin,dfX);
+- dfXMax = MAX(dfXMax,dfX);
+- dfYMin = MIN(dfYMin,dfY);
+- dfYMax = MAX(dfYMax,dfY);
++ dfXMin = MS_MIN(dfXMin,dfX);
++ dfXMax = MS_MAX(dfXMax,dfX);
++ dfYMin = MS_MIN(dfYMin,dfY);
++ dfYMax = MS_MAX(dfYMax,dfY);
+
+ /* -------------------------------------------------------------------- */
+ /* Trim the rectangle to the area of the file itself, but out */
+ /* to the edges of the touched edge pixels. */
+ /* -------------------------------------------------------------------- */
+- dfXMin = MAX(0.0,MIN(nRXSize,floor(dfXMin)));
+- dfYMin = MAX(0.0,MIN(nRYSize,floor(dfYMin)));
+- dfXMax = MAX(0.0,MIN(nRXSize,ceil(dfXMax)));
+- dfYMax = MAX(0.0,MIN(nRYSize,ceil(dfYMax)));
++ dfXMin = MS_MAX(0.0,MS_MIN(nRXSize,floor(dfXMin)));
++ dfYMin = MS_MAX(0.0,MS_MIN(nRYSize,floor(dfYMin)));
++ dfXMax = MS_MAX(0.0,MS_MIN(nRXSize,ceil(dfXMax)));
++ dfYMax = MS_MAX(0.0,MS_MIN(nRYSize,ceil(dfYMax)));
+
+ /* -------------------------------------------------------------------- */
+ /* Convert to integer offset/size values. */
+diff --git a/mapresample.c b/mapresample.c
+index 26b253e..532b6a8 100644
+--- a/mapresample.c
++++ b/mapresample.c
+@@ -34,8 +34,8 @@
+
+
+ #ifndef MAX
+-# define MIN(a,b) ((a<b) ? a : b)
+-# define MAX(a,b) ((a>b) ? a : b)
++# define MS_MIN(a,b) ((a<b) ? a : b)
++# define MS_MAX(a,b) ((a>b) ? a : b)
+ #endif
+
+ #define SKIP_MASK(x,y) (mask_rb && !*(mask_rb->data.rgba.a+(y)*mask_rb->data.rgba.row_step+(x)*mask_rb->data.rgba.pixel_step))
+@@ -319,7 +319,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int nSrcYSize = psSrcImage->height;
+ int nFailedPoints = 0, nSetPoints = 0;
+ double *padfPixelSum;
+- int bandCount = MAX(4,psSrcImage->format->bands);
++ int bandCount = MS_MAX(4,psSrcImage->format->bands);
+
+ padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
+
+@@ -369,10 +369,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ continue;
+
+ /* Trim in stuff one pixel off the edge */
+- nSrcX = MAX(nSrcX,0);
+- nSrcY = MAX(nSrcY,0);
+- nSrcX2 = MIN(nSrcX2,nSrcXSize-1);
+- nSrcY2 = MIN(nSrcY2,nSrcYSize-1);
++ nSrcX = MS_MAX(nSrcX,0);
++ nSrcY = MS_MAX(nSrcY,0);
++ nSrcX2 = MS_MIN(nSrcX2,nSrcXSize-1);
++ nSrcY2 = MS_MIN(nSrcY2,nSrcYSize-1);
+
+ memset( padfPixelSum, 0, sizeof(double) * bandCount);
+
+@@ -407,10 +407,10 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int dst_rb_off = nDstX * dst_rb->data.rgba.pixel_step + nDstY * dst_rb->data.rgba.row_step;
+ unsigned char red, green, blue, alpha;
+
+- red = (unsigned char) MAX(0,MIN(255,padfPixelSum[0]));
+- green = (unsigned char) MAX(0,MIN(255,padfPixelSum[1]));
+- blue = (unsigned char) MAX(0,MIN(255,padfPixelSum[2]));
+- alpha = (unsigned char)MAX(0,MIN(255,255.5*dfWeightSum));
++ red = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[0]));
++ green = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[1]));
++ blue = (unsigned char) MS_MAX(0,MS_MIN(255,padfPixelSum[2]));
++ alpha = (unsigned char)MS_MAX(0,MS_MIN(255,255.5*dfWeightSum));
+
+ msAlphaBlendPM( red, green, blue, alpha,
+ dst_rb->data.rgba.r + dst_rb_off,
+@@ -436,7 +436,7 @@ msBilinearRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ = (float) padfPixelSum[band];
+ } else if( psSrcImage->format->imagemode == MS_IMAGEMODE_BYTE ) {
+ psDstImage->img.raw_byte[dst_off]
+- = (unsigned char)MAX(0,MIN(255,padfPixelSum[band]));
++ = (unsigned char)MS_MAX(0,MS_MIN(255,padfPixelSum[band]));
+ }
+
+ dst_off += psDstImage->width*psDstImage->height;
+@@ -489,14 +489,14 @@ msAverageSample( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ for( iY = nYMin; iY < nYMax; iY++ ) {
+ double dfYCellMin, dfYCellMax;
+
+- dfYCellMin = MAX(iY,dfYMin);
+- dfYCellMax = MIN(iY+1,dfYMax);
++ dfYCellMin = MS_MAX(iY,dfYMin);
++ dfYCellMax = MS_MIN(iY+1,dfYMax);
+
+ for( iX = nXMin; iX < nXMax; iX++ ) {
+ double dfXCellMin, dfXCellMax, dfWeight;
+
+- dfXCellMin = MAX(iX,dfXMin);
+- dfXCellMax = MIN(iX+1,dfXMax);
++ dfXCellMin = MS_MAX(iX,dfXMin);
++ dfXCellMax = MS_MIN(iX+1,dfXMax);
+
+ dfWeight = (dfXCellMax-dfXCellMin) * (dfYCellMax-dfYCellMin);
+
+@@ -537,7 +537,7 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ int nFailedPoints = 0, nSetPoints = 0;
+ double *padfPixelSum;
+
+- int bandCount = MAX(4,psSrcImage->format->bands);
++ int bandCount = MS_MAX(4,psSrcImage->format->bands);
+
+ padfPixelSum = (double *) msSmallMalloc(sizeof(double) * bandCount);
+
+@@ -573,19 +573,19 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ continue;
+ }
+
+- dfXMin = MIN(MIN(x1[nDstX],x1[nDstX+1]),
+- MIN(x2[nDstX],x2[nDstX+1]));
+- dfYMin = MIN(MIN(y1[nDstX],y1[nDstX+1]),
+- MIN(y2[nDstX],y2[nDstX+1]));
+- dfXMax = MAX(MAX(x1[nDstX],x1[nDstX+1]),
+- MAX(x2[nDstX],x2[nDstX+1]));
+- dfYMax = MAX(MAX(y1[nDstX],y1[nDstX+1]),
+- MAX(y2[nDstX],y2[nDstX+1]));
++ dfXMin = MS_MIN(MS_MIN(x1[nDstX],x1[nDstX+1]),
++ MS_MIN(x2[nDstX],x2[nDstX+1]));
++ dfYMin = MS_MIN(MS_MIN(y1[nDstX],y1[nDstX+1]),
++ MS_MIN(y2[nDstX],y2[nDstX+1]));
++ dfXMax = MS_MAX(MS_MAX(x1[nDstX],x1[nDstX+1]),
++ MS_MAX(x2[nDstX],x2[nDstX+1]));
++ dfYMax = MS_MAX(MS_MAX(y1[nDstX],y1[nDstX+1]),
++ MS_MAX(y2[nDstX],y2[nDstX+1]));
+
+- dfXMin = MIN(MAX(dfXMin,0),psSrcImage->width+1);
+- dfYMin = MIN(MAX(dfYMin,0),psSrcImage->height+1);
+- dfXMax = MIN(MAX(-1,dfXMax),psSrcImage->width);
+- dfYMax = MIN(MAX(-1,dfYMax),psSrcImage->height);
++ dfXMin = MS_MIN(MS_MAX(dfXMin,0),psSrcImage->width+1);
++ dfYMin = MS_MIN(MS_MAX(dfYMin,0),psSrcImage->height+1);
++ dfXMax = MS_MIN(MS_MAX(-1,dfXMax),psSrcImage->width);
++ dfYMax = MS_MIN(MS_MAX(-1,dfYMax),psSrcImage->height);
+
+ memset( padfPixelSum, 0, sizeof(double)*bandCount );
+
+@@ -605,13 +605,13 @@ msAverageRasterResampler( imageObj *psSrcImage, rasterBufferObj *src_rb,
+ unsigned char red, green, blue, alpha;
+
+ red = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[0]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[0]+0.5));
+ green = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[1]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[1]+0.5));
+ blue = (unsigned char)
+- MAX(0,MIN(255,padfPixelSum[2]+0.5));
++ MS_MAX(0,MS_MIN(255,padfPixelSum[2]+0.5));
+ alpha = (unsigned char)
+- MAX(0,MIN(255,255*dfAlpha01+0.5));
++ MS_MAX(0,MS_MIN(255,255*dfAlpha01+0.5));
+
+ RB_MIX_PIXEL(dst_rb,nDstX,nDstY,
+ red, green, blue, alpha );
+@@ -1121,10 +1121,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
+ psSrcExtent->miny = psSrcExtent->maxy = y_out;
+ bOutInit = 1;
+ } else {
+- psSrcExtent->minx = MIN(psSrcExtent->minx, x_out);
+- psSrcExtent->maxx = MAX(psSrcExtent->maxx, x_out);
+- psSrcExtent->miny = MIN(psSrcExtent->miny, y_out);
+- psSrcExtent->maxy = MAX(psSrcExtent->maxy, y_out);
++ psSrcExtent->minx = MS_MIN(psSrcExtent->minx, x_out);
++ psSrcExtent->maxx = MS_MAX(psSrcExtent->maxx, x_out);
++ psSrcExtent->miny = MS_MIN(psSrcExtent->miny, y_out);
++ psSrcExtent->maxy = MS_MAX(psSrcExtent->maxy, y_out);
+ }
+ }
+
+@@ -1141,10 +1141,10 @@ static int msTransformMapToSource( int nDstXSize, int nDstYSize,
+ int nGrowAmountY = (int)
+ (psSrcExtent->maxy - psSrcExtent->miny)/EDGE_STEPS + 1;
+
+- psSrcExtent->minx = MAX(psSrcExtent->minx - nGrowAmountX,0);
+- psSrcExtent->miny = MAX(psSrcExtent->miny - nGrowAmountY,0);
+- psSrcExtent->maxx = MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
+- psSrcExtent->maxy = MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
++ psSrcExtent->minx = MS_MAX(psSrcExtent->minx - nGrowAmountX,0);
++ psSrcExtent->miny = MS_MAX(psSrcExtent->miny - nGrowAmountY,0);
++ psSrcExtent->maxx = MS_MIN(psSrcExtent->maxx + nGrowAmountX,nSrcXSize);
++ psSrcExtent->maxy = MS_MIN(psSrcExtent->maxy + nGrowAmountY,nSrcYSize);
+ }
+
+ return MS_TRUE;
+@@ -1342,10 +1342,10 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
+ sSrcExtent.maxy = ceil (sSrcExtent.maxy+1.0);
+ }
+
+- sSrcExtent.minx = MAX(0,sSrcExtent.minx);
+- sSrcExtent.maxx = MIN(sSrcExtent.maxx, nSrcXSize );
+- sSrcExtent.miny = MAX(sSrcExtent.miny, 0 );
+- sSrcExtent.maxy = MIN(sSrcExtent.maxy, nSrcYSize );
++ sSrcExtent.minx = MS_MAX(0,sSrcExtent.minx);
++ sSrcExtent.maxx = MS_MIN(sSrcExtent.maxx, nSrcXSize );
++ sSrcExtent.miny = MS_MAX(sSrcExtent.miny, 0 );
++ sSrcExtent.maxy = MS_MIN(sSrcExtent.maxy, nSrcYSize );
+
+ if( sSrcExtent.maxx <= sSrcExtent.minx
+ || sSrcExtent.maxy <= sSrcExtent.miny ) {
+@@ -1383,9 +1383,9 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
+ else
+ sDummyMap.cellsize = dfNominalCellSize;
+
+- nLoadImgXSize = MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
++ nLoadImgXSize = MS_MAX(1, (int) (sSrcExtent.maxx - sSrcExtent.minx)
+ * (dfNominalCellSize / sDummyMap.cellsize));
+- nLoadImgYSize = MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
++ nLoadImgYSize = MS_MAX(1, (int) (sSrcExtent.maxy - sSrcExtent.miny)
+ * (dfNominalCellSize / sDummyMap.cellsize));
+
+ /*
+diff --git a/mapstring.c b/mapstring.c
+index ea5b67f..82ee82a 100644
+--- a/mapstring.c
++++ b/mapstring.c
+@@ -135,7 +135,7 @@ char *strrstr(char *string, char *find)
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left). At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
+- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
++ * Returns strlen(src) + MS_MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+ size_t strlcat(char *dst, const char *src, size_t siz)
+diff --git a/mapwcs20.c b/mapwcs20.c
+index 347e9b7..266a07d 100644
+--- a/mapwcs20.c
++++ b/mapwcs20.c
+@@ -4189,8 +4189,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ + (orig_bbox.maxx+1) * cm.geotransform[1]
+ + (orig_bbox.maxy+1) * cm.geotransform[2];
+
+- subsets.minx = MIN(x_1, x_2);
+- subsets.maxx = MAX(x_1, x_2);
++ subsets.minx = MS_MIN(x_1, x_2);
++ subsets.maxx = MS_MAX(x_1, x_2);
+ }
+ if(subsets.miny != -DBL_MAX || subsets.maxy != DBL_MAX) {
+ y_1 = cm.geotransform[3]
+@@ -4201,8 +4201,8 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ + orig_bbox.minx * cm.geotransform[4]
+ + orig_bbox.miny * cm.geotransform[5];
+
+- subsets.miny = MIN(y_1, y_2);
+- subsets.maxy = MAX(y_1, y_2);
++ subsets.miny = MS_MIN(y_1, y_2);
++ subsets.maxy = MS_MAX(y_1, y_2);
+ }
+ } else { /* if crs is not the 'imageCRS' */
+ projectionObj subsetProj;
+@@ -4241,10 +4241,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ }
+
+ /* write combined bounding box */
+- bbox.minx = MAX(subsets.minx, map->extent.minx);
+- bbox.miny = MAX(subsets.miny, map->extent.miny);
+- bbox.maxx = MIN(subsets.maxx, map->extent.maxx);
+- bbox.maxy = MIN(subsets.maxy, map->extent.maxy);
++ bbox.minx = MS_MAX(subsets.minx, map->extent.minx);
++ bbox.miny = MS_MAX(subsets.miny, map->extent.miny);
++ bbox.maxx = MS_MIN(subsets.maxx, map->extent.maxx);
++ bbox.maxy = MS_MIN(subsets.maxy, map->extent.maxy);
+
+ /* check if we are overspecified */
+ if ((params->width != 0 && params->resolutionX != MS_WCS20_UNBOUNDED)
+@@ -4620,10 +4620,10 @@ this request. Check wcs/ows_enable_request settings.", "msWCSGetCoverage20()", p
+ tmpCm.xresolution = map->gt.geotransform[1];
+ tmpCm.yresolution = map->gt.geotransform[5];
+
+- tmpCm.extent.minx = MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
+- tmpCm.extent.miny = MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
+- tmpCm.extent.maxx = MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
+- tmpCm.extent.maxy = MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
++ tmpCm.extent.minx = MS_MIN(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
++ tmpCm.extent.miny = MS_MIN(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
++ tmpCm.extent.maxx = MS_MAX(map->gt.geotransform[0], map->gt.geotransform[0] + map->width * tmpCm.xresolution);
++ tmpCm.extent.maxy = MS_MAX(map->gt.geotransform[3], map->gt.geotransform[3] + map->height * tmpCm.yresolution);
+
+ swapAxes = msWCSSwapAxes20(srs_uri);
+ msFree(srs_uri);
+diff --git a/mapwmslayer.c b/mapwmslayer.c
+index 42a44f1..3e4747d 100644
+--- a/mapwmslayer.c
++++ b/mapwmslayer.c
+@@ -698,7 +698,7 @@ msBuildWMSLayerURL(mapObj *map, layerObj *lp, int nRequestType,
+ else {
+ double cellsize_x = (bbox.maxx-bbox.minx) / bbox_width;
+ double cellsize_y = (bbox.maxy-bbox.miny) / bbox_height;
+- double cellsize = MIN(cellsize_x,cellsize_y);
++ double cellsize = MS_MIN(cellsize_x,cellsize_y);
+
+ msRectIntersect( &bbox, &layer_rect );
+
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
new file mode 100644
index 00000000000..088e37b14c8
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-disabled-ogr.patch
@@ -0,0 +1,56 @@
+From ab2a6129435ca37d02730a6faf85593afa0daf9b Mon Sep 17 00:00:00 2001
+From: Thomas Bonfort <thomas.bonfort@gmail.com>
+Date: Mon, 16 Nov 2015 16:56:02 +0100
+Subject: [PATCH] Fix build issues with OGR disabled
+
+---
+ mapimageio.c | 2 +-
+ mapogcfilter.c | 1 +
+ mapogr.cpp | 2 ++
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/mapimageio.c b/mapimageio.c
+index 771188b..95feda2 100644
+--- a/mapimageio.c
++++ b/mapimageio.c
+@@ -210,7 +210,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
+ /* If the user doesn't provide a value for JPEGMEM, we want to be sure */
+ /* that at least the image size will be used before creating the temporary file */
+ cinfo.mem->max_memory_to_use =
+- MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
++ MS_MAX(cinfo.mem->max_memory_to_use, cinfo.input_components * rb->width * rb->height);
+ }
+ }
+
+diff --git a/mapogcfilter.c b/mapogcfilter.c
+index 50e2e7b..05f017a 100644
+--- a/mapogcfilter.c
++++ b/mapogcfilter.c
+@@ -40,6 +40,7 @@
+ #include "mapowscommon.h"
+ #include "maptime.h"
+ #include "mapows.h"
++#include <ctype.h>
+
+ static int FLTHasUniqueTopLevelDuringFilter(FilterEncodingNode *psFilterNode);
+
+diff --git a/mapogr.cpp b/mapogr.cpp
+index 07acdba..80f032b 100644
+--- a/mapogr.cpp
++++ b/mapogr.cpp
+@@ -1318,6 +1318,7 @@ static int msOGRFileClose(layerObj *layer, msOGRFileInfo *psInfo )
+
+ return MS_SUCCESS;
+ }
++#endif /* USE_OGR */
+
+ /************************************************************************/
+ /* msOGREscapeSQLParam */
+@@ -1345,6 +1346,7 @@ static char *msOGREscapeSQLParam(layerObj *layer, const char *pszString)
+ #endif /* USE_OGR */
+ }
+
++#ifdef USE_OGR
+ /**********************************************************************
+ * msOGRTranslateMsExpressionToOGRSQL()
+ *
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
new file mode 100644
index 00000000000..1fa7710de0b
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-giflib51.patch
@@ -0,0 +1,35 @@
+From 0101157d4edd5d837d17356c66c7d25af7e020ac Mon Sep 17 00:00:00 2001
+From: Sander Jansen <s.jansen@gmail.com>
+Date: Wed, 19 Aug 2015 16:51:13 -0500
+Subject: [PATCH] Fix compilation with gif_lib 5.1
+
+---
+ mapimageio.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/mapimageio.c b/mapimageio.c
+index e6bdcb5..5eed924 100644
+--- a/mapimageio.c
++++ b/mapimageio.c
+@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj *rb)
+
+ } while (recordType != TERMINATE_RECORD_TYPE);
+
++
++#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
++ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
++ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
++ return MS_FAILURE;
++ }
++#else
+ if (DGifCloseFile(image) == GIF_ERROR) {
+ #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+ msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
+@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj *rb)
+ #endif
+ return MS_FAILURE;
+ }
++#endif
+
+ return MS_SUCCESS;
+ }
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
new file mode 100644
index 00000000000..5625746e2dc
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-mapwcs-disabled-libxml2.patch
@@ -0,0 +1,20 @@
+diff --git a/mapwcs20.c b/mapwcs20.c
+index ac2fb89..9560a25 100755
+--- a/mapwcs20.c
++++ b/mapwcs20.c
+@@ -700,6 +700,7 @@ static int msWCSParseScaleExtentString20(char *string, char *outAxis,
+ return MS_SUCCESS;
+ }
+
++#if defined(USE_LIBXML2)
+ /*
+ Utility function to get the first child of a node with a given node name
+ */
+@@ -739,6 +740,7 @@ xmlNodePtr msLibXml2GetFirstChildNs(xmlNodePtr parent, const char *name, xmlNsPt
+ }
+ return NULL;
+ }
++#endif /* defined(USE_LIBXML2) */
+
+ /************************************************************************/
+ /* msWCSParseRequest20_XMLGetCapabilities() */
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
new file mode 100644
index 00000000000..f438bec9f12
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch
@@ -0,0 +1,34 @@
+diff --git a/mapwfs11.c b/mapwfs11.c
+index 20ab164..4dc15fc 100755
+--- a/mapwfs11.c
++++ b/mapwfs11.c
+@@ -29,12 +29,12 @@
+
+ #include "mapserver.h"
+ #include "mapows.h"
++#include "mapowscommon.h"
+
+
+
+ #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
+ #include "maplibxml2.h"
+-#include "mapowscommon.h"
+ #include "mapogcfilter.h"
+
+ /************************************************************************/
+diff --git a/mapwfs20.c b/mapwfs20.c
+index 710d444..cf69ee3 100755
+--- a/mapwfs20.c
++++ b/mapwfs20.c
+@@ -29,10 +29,10 @@
+
+ #include "mapserver.h"
+ #include "mapows.h"
++#include "mapowscommon.h"
+
+ #if defined(USE_WFS_SVR) && defined(USE_LIBXML2)
+ #include "maplibxml2.h"
+-#include "mapowscommon.h"
+ #include "mapogcfilter.h"
+
+ #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX
diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
new file mode 100644
index 00000000000..17016c66e67
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver-7.0.0-sec-format.patch
@@ -0,0 +1,13 @@
+diff --git a/apache/mod_mapserver.c b/apache/mod_mapserver.c
+index 7949ddf..c8dbde6 100644
+--- a/apache/mod_mapserver.c
++++ b/apache/mod_mapserver.c
+@@ -40,7 +40,7 @@ static int
+ msIO_apacheError (void *cbData, void *data, int byteCount)
+ {
+ /* error reporting is done through the log file... */
+- ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, (char*) data);
++ ap_log_error (APLOG_MARK, APLOG_ERR, 0, NULL, "%s", (char*) data);
+ return strlen ((char*) data);
+ }
+
diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
deleted file mode 100644
index 845cad6e3bd..00000000000
--- a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
+++ /dev/null
@@ -1,44 +0,0 @@
---- mapscript/tcl/Makefile.in.orig 2001-10-26 00:56:39.000000000 +0200
-+++ mapscript/tcl/Makefile.in 2008-02-04 11:04:22.000000000 +0100
-@@ -25,7 +25,7 @@
- TCL_LIBS = @TCL_LIBS@
- LIBS = @TCL_LIBS@
- TCL_DBGX = @TCL_DBGX@
--LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib:@MAPSERVERHOME@
-+LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/@libdir@:@TCL_EXEC_PREFIX@/@libdir@/$(PACKAGEDIR):@TCL_PREFIX@/@libdir@:@MAPSERVERHOME@
-
- MAPSERVERHOME = @MAPSERVERHOME@
- MAPSERVERDEFS = @MAPSERVERDEFS@
-@@ -69,14 +69,14 @@
- $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o
-
- install: $(DLTARGET)$(TCL_SHLIB_SUFFIX)
-- -mkdir $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-- cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-+ -mkdir $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
-+ cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
- chmod +x \
-- $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
-- cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-- cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-- cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-- cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
-+ $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
-+ cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
-+ cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
-+ cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
-+ cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
-
-
- useprebuilt:
---- mapscript/mapscript.i 2005-11-22 22:44:48.000000000 +0100
-+++ mapscript/mapscript.i 2006-04-12 23:47:23.000000000 +0200
-@@ -206,7 +206,7 @@
-
- /* Tcl */
- #ifdef SWIGTCL8
--%include "tclmodule.i"
-+/* %include "tclmodule.i" */
- #endif /* SWIGTCL8 */
-
- /*
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
deleted file mode 100644
index 6766c1d2e83..00000000000
--- a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-4 php5-5"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-PYTHON_MODNAME="mapscript.py"
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
-
-RDEPEND="
- !${CATEGORY}/${PN}:${PV}
- dev-libs/expat
- dev-libs/fcgi
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg
- virtual/libiconv
- x11-libs/agg
- bidi? ( dev-libs/fribidi )
- cairo? ( x11-libs/cairo )
- gdal? ( >=sci-libs/gdal-1.8.0 )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-for i in perl python; do
- SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
-done
-DEPEND="${RDEPEND} ${SWIG_DEPEND}"
-unset SWIG_DEPEND
-unset i
-
-need_apache2
-
-S=${WORKDIR}/${MY_P}
-
-_enter_build_dir() {
- [[ -z ${1} ]] && die "Missing path argument"
- local workdir=${1}
- shift
- [[ -z ${1} ]] && die "missing command argument"
-
- echo ">>> Running \"${@}\" in work directory \"${workdir}\""
- pushd "${workdir}" > /dev/null || die "Failed to enter directory"
- ${@} || die
- popd > /dev/null
-}
-
-each_ruby_configure() { ${RUBY} extconf.rb || die ; }
-
-ext-source-r2_src_install() {
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- insinto "${EXT_DIR}"
- newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
- done
- php-ext-source-r2_createinifiles
-}
-
-pkg_setup() {
- webapp_pkg_setup
- use perl && perl_set_version
- use python && python_pkg_setup
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- # unpack A and then copy the php thingies into workdir/php-slot
- php-ext-source-r2_src_unpack
- # HACK: and then remove it and replace by symlink
- for slot in $(php_get_slots); do
- rm -rf "${WORKDIR}/${slot}" || die
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
- "${FILESDIR}/6.0.0_rc1-bool.patch" \
- "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
- "${FILESDIR}/6.1.0-php-5.4.patch"
-
- eautoreconf
-}
-
-src_configure() {
- local myopts
-
- if use gdal && use proj ; then
- myopts+="
- --with-wfs
- --with-wcs
- --with-wfsclient
- --with-wmsclient
- "
- use xml && myopts+=" --with-sos"
- fi
-
- # some scripts require configure time options so place it here
- if use php ; then
- use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
- use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
- fi
-
- # sde is ESRI package that you have to buy first
- # oraclespatial needs oracle server for testing/usage
- # note that some options accept just path, they are not on/off switches!
- econf \
- --without-oraclespatial \
- --without-sde \
- --with-libiconv \
- --with-jpeg \
- --with-gd \
- --with-gif="${EPREFIX}/usr/" \
- --with-wms \
- --with-kml \
- --with-curl-config \
- --with-agg-svg-symbols \
- --with-httpd="${APACHE_BIN}" \
- --with-fastcgi \
- $(use_with opengl ogl) \
- $(use_with opengl ftgl) \
- $(use_with proj) \
- $(use_with threads) \
- $(use_with geos) \
- $(use_with gdal) \
- $(use_with gdal ogr) \
- $(use_with postgis) \
- $(use_with mysql) \
- $(use_with xml xml2-config) \
- $(use_with xslt) \
- $(use_with xslt xml-mapfile) \
- $(use_with bidi fribidi-config) \
- $(use_with cairo) \
- ${myopts}
-
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
-}
-
-src_compile() {
- default
- use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
- #use php && php-ext-source-r2_src_compile # already compiled by the emake all
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
-}
-
-src_install() {
- local step="Installing"
- local extra_dir="fonts tests tests/vera symbols"
- local i
-
- dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
- sortshp tile4ms msencrypt mapserver-config
-
- dodoc INSTALL README HISTORY.TXT
-
- for i in ${extra_dir}; do
- docinto /usr/share/doc/${PF}/${i}
- dodoc -r ${i}/* || die
- done
-
- use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
- use php && ext-source-r2_src_install
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
-
- webapp_src_preinst
- exeinto "${MY_CGIBINDIR}"
- doexe "${S}/mapserv"
- webapp_src_install
-}
-
-pkg_preinst() {
- use perl && perl_set_version
-}
-
-pkg_postinst() {
- webapp_pkg_postinst
- use python && distutils_pkg_postinst
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
-
-pkg_postrm() {
- use python && distutils_pkg_postrm
-}
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
deleted file mode 100644
index 5e981d3c3ea..00000000000
--- a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV/_/-}"
-
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscript"
-PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
-PHP_EXT_SKIP_PHPIZE="no"
-USE_PHP="php5-4 php5-5"
-
-PYTHON_COMPAT=( python2_7 )
-
-#USE_RUBY="ruby18 ruby19"
-#RUBY_OPTIONAL="yes"
-
-WEBAPP_MANUAL_SLOT=yes
-
-inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng
-
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
-HOMEPAGE="http://mapserver.org/"
-SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
-
-REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
-
-RDEPEND="
- !${CATEGORY}/${PN}:${PV}
- dev-libs/expat
- dev-libs/fcgi
- >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
- media-libs/giflib
- net-misc/curl
- virtual/jpeg:=
- virtual/libiconv
- x11-libs/agg
- bidi? ( dev-libs/fribidi )
- cairo? ( x11-libs/cairo )
- gdal? ( >=sci-libs/gdal-1.8.0 )
- geos? ( sci-libs/geos )
- mysql? ( virtual/mysql )
- opengl? (
- media-libs/ftgl
- media-libs/mesa
- )
- perl? ( dev-lang/perl:= )
- postgis? ( dev-db/postgis )
- proj? ( sci-libs/proj net-misc/curl )
- tiff? (
- media-libs/tiff:=
- sci-libs/libgeotiff
- )
- xml? ( dev-libs/libxml2:2 )
- xslt? ( dev-libs/libxslt[crypt] )
-"
-for i in perl python; do
- SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
-done
-DEPEND="${RDEPEND} ${SWIG_DEPEND}"
-unset SWIG_DEPEND
-unset i
-
-need_apache2
-
-S=${WORKDIR}/${MY_P}
-
-_enter_build_dir() {
- [[ -z ${1} ]] && die "Missing path argument"
- local workdir=${1}
- shift
- [[ -z ${1} ]] && die "missing command argument"
-
- echo ">>> Running \"${@}\" in work directory \"${workdir}\""
- pushd "${workdir}" > /dev/null || die "Failed to enter directory"
- ${@} || die
- popd > /dev/null
-}
-
-each_ruby_configure() { ${RUBY} extconf.rb || die ; }
-
-ext-source-r2_src_install() {
- local slot
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- insinto "${EXT_DIR}"
- newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
- done
- php-ext-source-r2_createinifiles
-}
-
-pkg_setup() {
- webapp_pkg_setup
- use perl && perl_set_version
- #use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
- # unpack A and then copy the php thingies into workdir/php-slot
- php-ext-source-r2_src_unpack
- # HACK: and then remove it and replace by symlink
- for slot in $(php_get_slots); do
- rm -rf "${WORKDIR}/${slot}" || die
- ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
- done
-}
-
-src_prepare() {
- epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
- "${FILESDIR}/6.0.0_rc1-bool.patch" \
- "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
- "${FILESDIR}/6.1.0-php-5.4.patch"
-
- eautoreconf
-}
-
-src_configure() {
- local myopts
-
- if use gdal && use proj ; then
- myopts+="
- --with-wfs
- --with-wcs
- --with-wfsclient
- --with-wmsclient
- "
- use xml && myopts+=" --with-sos"
- fi
-
- # some scripts require configure time options so place it here
- if use php ; then
- use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
- use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
- fi
-
- # sde is ESRI package that you have to buy first
- # oraclespatial needs oracle server for testing/usage
- # note that some options accept just path, they are not on/off switches!
- econf \
- --without-oraclespatial \
- --without-sde \
- --with-libiconv \
- --with-jpeg \
- --with-gd \
- --with-gif="${EPREFIX}/usr/" \
- --with-wms \
- --with-kml \
- --with-curl-config \
- --with-agg-svg-symbols \
- --with-httpd="${APACHE_BIN}" \
- --with-fastcgi \
- $(use_with opengl ogl) \
- $(use_with opengl ftgl) \
- $(use_with proj) \
- $(use_with threads) \
- $(use_with geos) \
- $(use_with gdal) \
- $(use_with gdal ogr) \
- $(use_with postgis) \
- $(use_with mysql) \
- $(use_with xml xml2-config) \
- $(use_with xslt) \
- $(use_with xslt xml-mapfile) \
- $(use_with bidi fribidi-config) \
- $(use_with cairo) \
- ${myopts}
-
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
-}
-
-src_compile() {
- default
- use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
- #use php && php-ext-source-r2_src_compile # already compiled by the emake all
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
-}
-
-src_install() {
- local step="Installing"
- local extra_dir="fonts tests tests/vera symbols"
- local i
-
- dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
- sortshp tile4ms msencrypt mapserver-config
-
- dodoc INSTALL README HISTORY.TXT
-
- for i in ${extra_dir}; do
- docinto /usr/share/doc/${PF}/${i}
- dodoc -r ${i}/* || die
- done
-
- use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
- use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
- use php && ext-source-r2_src_install
- #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
-
- webapp_src_preinst
- exeinto "${MY_CGIBINDIR}"
- doexe "${S}/mapserv"
- webapp_src_install
-}
-
-pkg_preinst() {
- use perl && perl_set_version
-}
-
-pkg_prerm() {
- webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-7.0.0.ebuild b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
new file mode 100644
index 00000000000..da2eb5d950e
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-7.0.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-4 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils depend.apache webapp distutils-r1 flag-o-matic perl-module php-ext-source-r2 multilib cmake-utils # ruby-ng
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )
+ xslt? ( xml )"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/fcgi
+ >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
+ net-misc/curl
+ virtual/jpeg:=
+ virtual/libiconv
+ x11-libs/agg
+ bidi? ( dev-libs/fribidi
+ media-libs/harfbuzz )
+ cairo? ( x11-libs/cairo )
+ gdal? ( >=sci-libs/gdal-1.8.0 )
+ geos? ( sci-libs/geos )
+ mysql? ( virtual/mysql )
+ opengl? (
+ media-libs/ftgl
+ media-libs/mesa
+ )
+ perl? ( dev-lang/perl:= )
+ postgis? ( dev-db/postgis )
+ proj? ( sci-libs/proj net-misc/curl )
+ tiff? (
+ media-libs/tiff:=
+ sci-libs/libgeotiff
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xslt? ( dev-libs/libxslt[crypt] )
+"
+DEPEND="${RDEPEND}
+ perl? ( >=dev-lang/swig-2.0 )
+ python? ( >=dev-lang/swig-2.0 )"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}/${P}-giflib51.patch" # see https://github.com/mapserver/mapserver/pull/5144
+ "${FILESDIR}/${P}-disabled-ogr.patch" # see https://github.com/mapserver/mapserver/commit/ab2a6129435ca37d02730a6faf85593afa0daf9b
+ "${FILESDIR}/${P}-correct-min-max-calls.patch" # see https://github.com/mapserver/mapserver/pull/5251
+ "${FILESDIR}/${P}-sec-format.patch" # see https://github.com/mapserver/mapserver/pull/5248
+ "${FILESDIR}/${P}-mapwcs-disabled-libxml2.patch"
+ "${FILESDIR}/${P}-no-applicable-code.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ webapp_pkg_setup
+ use perl && perl_set_version
+ #use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ # unpack A and then copy the php thingies into workdir/php-slot
+ php-ext-source-r2_src_unpack
+ # HACK: and then remove it and replace by symlink
+ for slot in $(php_get_slots); do
+ rm -rf "${WORKDIR}/${slot}" || die
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+ done
+}
+
+src_prepare() {
+ local glibdir="${EPREFIX}/usr/include/glib-2.0"
+ local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+
+ sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+ sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \
+ -i "${S}/CMakeLists.txt" || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DWITH_ORACLESPATIAL=OFF"
+ "-DWITH_SDE=OFF"
+ "-DWITH_APACHE_MODULE=ON"
+ "-DWITH_ICONV=ON"
+ "-DWITH_GD=ON"
+ "-DWITH_GIF=ON"
+ "-DWITH_CURL=ON"
+ "-DWITH_FCGI=ON"
+ "-DWITH_PROJ=$(usex proj ON OFF)"
+ "-DWITH_WMS=$(usex proj ON OFF)"
+ "-DWITH_KML=$(usex xml ON OFF)"
+ "-DWITH_GEOS=$(usex geos ON OFF)"
+ "-DWITH_GDAL=$(usex gdal ON OFF)"
+ "-DWITH_OGR=$(usex gdal ON OFF)"
+ "-DWITH_POSTGIS=$(usex postgis ON OFF)"
+ "-DWITH_MYSQL=$(usex mysql ON OFF)"
+ "-DWITH_LIBXML2=$(usex xml ON OFF)"
+ "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)"
+ "-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+ "-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+ "-DWITH_CAIRO=$(usex cairo ON OFF)"
+ "-DWITH_PHP=$(usex php ON OFF)"
+ "-DWITH_PYTHON=$(usex python ON OFF)"
+ "-DWITH_PERL=$(usex perl ON OFF)"
+ )
+
+ if use gdal && use proj ; then
+ mycmakeargs+=( "-DWITH_WFS=ON"
+ "-DWITH_WCS=ON"
+ "-DWITH_CLIENT_WMS=ON"
+ "-DWITH_CLIENT_WFS=ON"
+ "-DWITH_SOS=$(usex xml ON OFF)"
+ )
+ else
+ mycmakeargs+=( "-DWITH_WFS=OFF"
+ "-DWITH_WCS=OFF"
+ "-DWITH_CLIENT_WMS=OFF"
+ "-DWITH_CLIENT_WFS=OFF"
+ "-DWITH_SOS=OFF"
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ webapp_src_preinst
+ exeinto "${MY_CGIBINDIR}"
+ doexe "${S}_build/mapserv"
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+}
+
+pkg_prerm() {
+ webapp_pkg_prerm
+}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 813f8a071cb..1e86ee91b8a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,3 +2,4 @@ DIST gdal-1.11.1.tar.gz 10731242 SHA256 f46b5944a8cabc8516673f231f466131cdfd2cdc
DIST gdal-1.11.2.tar.gz 10746847 SHA256 66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512 f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da WHIRLPOOL 77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
DIST gdal-2.0.0.tar.gz 11582325 SHA256 53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6 SHA512 74ae9d01a69652c92a16bc91f71b4c8416697d5f7aa137d385f58b7dc63c165c26330464c98891ac66b09475de24fbbff61f506ad1c9ecf64ffe08f1429fbad5 WHIRLPOOL 7d4a27e94e41ea53050ae3b8f1f06720e13626885455897caf6659a88c87bf61c087102963182b580e56a8840e3b57b6fbb8adadde64fd4679d5c37c3aa682c7
DIST gdal-2.0.1.tar.gz 11592723 SHA256 b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab SHA512 b3b22e53b6e4b68911d84260d79ed382625f9d71722759a89f49fdd736d1f1ad183bda99e0f09d3f368fead89b509df58daa35a367473dfd5628855d331efa23 WHIRLPOOL 1b1218d5d6c84e41051475c38b412ebb49511c4a1ae948f56edb5939d9eb9599546b9bd89a3cb6b2517d205723201e77bde64955bb3eb0b5bccfda799d5bffe3
+DIST gdal-2.0.2.tar.gz 11643726 SHA256 db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 SHA512 b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266 WHIRLPOOL 889b35d0c2d972681d30eb33b731498b58951ed64a37d0152b15f8d9c3e414703158498cc6eb1bc75a3cd598a567738e4e937fffa6a55cdff2b6cf87338e25e6
diff --git a/sci-libs/gdal/gdal-2.0.2.ebuild b/sci-libs/gdal/gdal-2.0.2.ebuild
new file mode 100644
index 00000000000..194ebe5a6c7
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.0.2.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils libtool perl-module distutils-r1 python-r1 toolchain-funcs java-pkg-opt-2
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/json-c
+ dev-libs/libpcre
+ dev-libs/libxml2
+ media-libs/tiff:0=
+ sci-libs/libgeotiff
+ sys-libs/zlib[minizip(+)]
+ armadillo? ( sci-libs/armadillo[lapack] )
+ curl? ( net-misc/curl )
+ fits? ( sci-libs/cfitsio )
+ geos? ( >=sci-libs/geos-2.2.1 )
+ gif? ( media-libs/giflib:= )
+ gml? ( >=dev-libs/xerces-c-3 )
+ hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0= )
+ jpeg2k? ( media-libs/jasper )
+ mysql? ( virtual/mysql )
+ netcdf? ( sci-libs/netcdf )
+ odbc? ( dev-db/unixODBC )
+ ogdi? ( sci-libs/ogdi )
+ opencl? ( virtual/opencl )
+ pdf? ( >=app-text/poppler-0.24.3:= )
+ perl? ( dev-lang/perl:= )
+ png? ( media-libs/libpng:0= )
+ postgres? ( >=dev-db/postgresql-8.4:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ spatialite? ( dev-db/spatialite )
+ xls? ( dev-libs/freexl )
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ java? ( >=virtual/jdk-1.6 )
+ perl? ( dev-lang/swig:0 )
+ python? ( dev-lang/swig:0 )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+REQUIRED_USE="
+ spatialite? ( sqlite )
+ mdb? ( java )
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ # fix datadir and docdir placement
+ sed -i \
+ -e "s:@datadir@:@datadir@/gdal:" \
+ -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+ "${S}"/GDALmake.opt.in || die
+
+ # the second sed expression should fix bug 371075
+ sed -i \
+ -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+ -e "s:--prefix=\$(DESTDIR):--prefix=:" \
+ "${S}"/swig/python/GNUmakefile || die
+
+ # -soname is only accepted by GNU ld/ELF
+ [[ ${CHOST} == *-darwin* ]] \
+ && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+ || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+ # Fix spatialite/sqlite include issue
+ sed -i \
+ -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+ ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+
+ # Fix freexl configure check
+ sed -i \
+ -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+ configure.in || die
+
+ sed \
+ -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+ -i configure.in || die
+
+ sed \
+ -e 's:^ar:$(AR):g' \
+ -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+ tc-export AR RANLIB
+
+ eautoreconf
+
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/ \; ||die
+ find "${S}" -type f -maxdepth 1 -exec cp --target="${BUILD_DIR}"/ {} + ||die
+# mkdir -p "${BUILD_DIR}"/swig/python || die
+# mkdir -p "${BUILD_DIR}"/apps || die
+# cp -dpR --target="${BUILD_DIR}"/swig/ \
+# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
+# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
+# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
+# ln -s "${S}"/port "${BUILD_DIR}"/ || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+}
+
+gdal_src_configure() {
+ local myopts=""
+
+ if use java; then
+ myopts+="
+ --with-java=$(java-config --jdk-home 2>/dev/null)
+ $(use_with mdb)"
+ else
+ myopts+=" --without-java --without-mdb"
+ use mdb && ewarn "mdb requires java use enabled. disabling"
+ fi
+
+ if use sqlite; then
+ myopts+=" LIBS=-lsqlite3"
+ fi
+
+ # pcidsk is internal, because there is no such library yet released
+ # also that thing is developed by the gdal people
+ # kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+ # bsb - legal issues
+ # oracle - disabled, i dont have and can't test
+ # ingres - same story as oracle oci
+ # podofo - we use poppler instead they are exclusive for each other
+ # tiff is a hard dep
+ ECONF_SOURCE="${S}" econf \
+ --includedir="${EPREFIX}/usr/include/${PN}" \
+ --disable-static \
+ --enable-shared \
+ --with-expat \
+ --with-geotiff \
+ --with-grib \
+ --with-libtiff \
+ --with-libz="${EPREFIX}/usr/" \
+ --with-ogr \
+ --without-bsb \
+ --without-dods-root \
+ --without-dwgdirect \
+ --without-epsilon \
+ --without-fme \
+ --without-grass \
+ --without-hdf4 \
+ --without-idb \
+ --without-ingres \
+ --without-jp2mrsid \
+ --without-kakadu \
+ --without-libtool \
+ --without-mrsid \
+ --without-msg \
+ --without-oci \
+ --without-pcraster \
+ --without-podofo \
+ --without-sde \
+ $(use_enable debug) \
+ $(use_with armadillo) \
+ $(use_with aux_xml pam) \
+ $(use_with curl) \
+ --without-ecw \
+ $(use_with fits cfitsio) \
+ $(use_with geos) \
+ $(use_with gif) \
+ $(use_with gml xerces) \
+ $(use_with hdf5) \
+ $(use_with jpeg pcidsk) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jasper) \
+ $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+ $(use_with netcdf) \
+ $(use_with odbc) \
+ $(use_with ogdi ogdi "${EPREFIX}"/usr) \
+ $(use_with opencl) \
+ $(use_with pdf poppler) \
+ $(use_with perl) \
+ $(use_with png) \
+ $(use_with postgres pg) \
+ $(use_with python) \
+ $(use_with spatialite) \
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+ $(use_with threads) \
+ $(use_with xls freexl) \
+ ${myopts}
+
+ # mysql-config puts this in (and boy is it a PITA to get it out)
+ if use mysql; then
+ sed -i \
+ -e "s: -rdynamic : :" \
+ GDALmake.opt || die "sed LIBS failed"
+ fi
+
+ if [[ -n $use_python ]]; then
+ # updated for newer swig (must specify the path to input files)
+ sed -i \
+ -e "s: gdal_array.i: ../include/gdal_array.i:" \
+ -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+ swig/python/GNUmakefile || die "sed python makefile failed"
+ sed -i \
+ -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+ swig/python/setup.cfg || die "sed python setup.cfg failed"
+# -e "s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
+ fi
+}
+
+src_configure() {
+ local use_python=""
+
+ gdal_src_configure
+
+ if use python; then
+ use_python="yes"
+ python_foreach_impl run_in_build_dir gdal_src_configure
+ fi
+}
+
+src_compile() {
+ if use perl; then
+ rm "${S}"/swig/perl/*_wrap.cpp
+ emake -C "${S}"/swig/perl generate
+ fi
+
+ default
+
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_configure
+ perl-module_src_compile
+ popd > /dev/null
+ fi
+
+ use doc && emake docs
+
+ compile_python() {
+ rm -f swig/python/*_wrap.cpp
+ emake -C swig/python generate
+ emake -C swig/python build
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ if use perl ; then
+ pushd "${S}"/swig/perl > /dev/null
+ perl-module_src_install
+ popd > /dev/null
+ sed -e 's:BINDINGS = \(.*\) perl:BINDINGS = \1:g' \
+ -i GDALmake.opt || die
+ fi
+
+ default
+
+ use perl && perl_delete_localpod
+
+ dodoc Doxyfile HOWTO-RELEASE NEWS
+
+ use doc && dohtml html/*
+
+ install_python() {
+ emake -C swig/python DESTDIR="${D}" install
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ newdoc swig/python/README.txt README-python.txt
+ insinto /usr/share/${PN}/samples
+ doins swig/python/samples/*
+ python_replicate_script "${ED}"/usr/bin/*py
+ fi
+
+ pushd man/man1 > /dev/null
+ for i in * ; do
+ newman ${i} ${i}
+ done
+ popd > /dev/null
+}
+
+pkg_postinst() {
+ elog "Check available image and data formats after building with"
+ elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 547558d475c..a27b2cbb183 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1 +1,2 @@
DIST libgeotiff-1.4.0.tar.gz 1517881 SHA256 d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b WHIRLPOOL e6ce9c65db229dd95fd8d6296a926bc2efeac8700775f4a29cbcf3b4d218dc2a566141f14e453628253bf596cd4da7c3771a857e6fb90076f46bf32a357fa0fc
+DIST libgeotiff-1.4.1.tar.gz 1674928 SHA256 acfc76ee19b3d41bb9c7e8b780ca55d413893a96c09f3b27bdb9b2573b41fd23 SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628 WHIRLPOOL 047c9be32bfd8735ccb01fa9027674b1c16a67229d68974da5cfdf381c2d824f24c7139f2806bc6b1630ba2d9373191da99f8a0faad4e35cea658d34f14ac9d2
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
index b2dfb6b1050..427d2b188a1 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.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 @@ inherit autotools eutils
MY_P=${P/_rc/RC}
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic (cartographic) information"
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
HOMEPAGE="http://geotiff.osgeo.org/"
SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild
new file mode 100644
index 00000000000..fb3e04a947c
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="http://geotiff.osgeo.org/"
+SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs"
+
+RDEPEND="
+ virtual/jpeg:=
+ >=media-libs/tiff-3.9.1:0
+ sci-libs/proj
+ sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P/RC*/}
+
+DOCS=( README ChangeLog )
+
+src_prepare() {
+ epatch_user
+ sed -i \
+ -e "s:-O3::g" \
+ configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --enable-debug=$(use debug && echo yes || echo no) \
+ --with-jpeg="${EPREFIX}"/usr/ \
+ --with-zip="${EPREFIX}"/usr/
+
+}
+src_compile() {
+ default
+
+ if use doc; then
+ mkdir -p docs/api
+ cp "${FILESDIR}"/Doxyfile Doxyfile
+ doxygen -u Doxyfile || die "updating doxygen config failed"
+ doxygen Doxyfile || die "docs generation failed"
+ fi
+}
+
+src_install() {
+ default
+
+ use doc && dohtml docs/api/*
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ echo
+ ewarn "You should rebuild any packages built against ${PN} by running:"
+ ewarn "# revdep-rebuild"
+ ewarn "or using preserved-rebuild features of portage-2.2:"
+ ewarn "# emerge @preserved-rebuild"
+ echo
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index d0d3b2c86cc..8e5a3159f0b 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,3 +1,5 @@
DIST proj-4.8.0-org_proj4_PJ.h 2960 SHA256 ed16ebaf2806fbd74392939085db17adfdaa71d45e908cda29fbc7dc3e0a613e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c WHIRLPOOL bdff66be09ca619fff5e12a90702db2c85b62b72016dc6805184363a0e5eadd6955225fd8d87a2b5148a0d8035dc88aff6a4cbd33f93869a23be42b4586f40b2
DIST proj-4.8.0.tar.gz 785279 SHA256 2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5 SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76 WHIRLPOOL c4d2ae53441868d489c789b5ecdab63829855604ff00479d08727def41b1891e72bd590fd18b0f51ae9fc3f3f121496fecdd2a860b9376df8181d781ffe57599
+DIST proj-4.9.2-org_proj4_PJ.h 2960 SHA256 ed16ebaf2806fbd74392939085db17adfdaa71d45e908cda29fbc7dc3e0a613e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c WHIRLPOOL bdff66be09ca619fff5e12a90702db2c85b62b72016dc6805184363a0e5eadd6955225fd8d87a2b5148a0d8035dc88aff6a4cbd33f93869a23be42b4586f40b2
+DIST proj-4.9.2.tar.gz 874816 SHA256 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda WHIRLPOOL 51b9f4db2bdf46574d1b571e85c5d8ab462732ad27eb7664a586709afb27f516a4f3b15806bcce480548832d451a7ae297992eed5a2acf74a505be800a386a85
DIST proj-datumgrid-1.5.zip 2250131 SHA256 723c4017d95d7a8abdf3bda4e18d3c15d79b00f9326d453da5fdf13f96c287db SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3 WHIRLPOOL fa0a58628906e108e811062a2f9761009d85b6083506587ddc95aae083dc5a2855174823037bbd63a5702b869c038483ed9a9f64f5a245bedcfd88eda7a026a8
diff --git a/sci-libs/proj/proj-4.9.2.ebuild b/sci-libs/proj/proj-4.9.2.ebuild
new file mode 100644
index 00000000000..56dfbca8630
--- /dev/null
+++ b/sci-libs/proj/proj-4.9.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Proj.4 cartographic projection software"
+HOMEPAGE="http://trac.osgeo.org/proj/"
+SRC_URI="
+ http://download.osgeo.org/proj/${P}.tar.gz
+ http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
+ http://trac.osgeo.org/proj/export/2647/trunk/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="java static-libs"
+
+RDEPEND=""
+DEPEND="
+ app-arch/unzip
+ java? ( >=virtual/jdk-1.5 )"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd "${S}"/nad || die
+ mv README README.NAD || die
+ cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
+ unpack ${PN}-datumgrid-1.5.zip
+}
+
+src_configure() {
+ if use java; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ append-cflags "$(java-pkg_get-jni-cflags)"
+ fi
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with java jni)
+}
+
+src_install() {
+ default
+ cd nad || die
+ dodoc README.{NAD,NADUS}
+ insinto /usr/share/proj
+ insopts -m 755
+ doins test27 test83
+ insopts -m 644
+ doins pj_out27.dist pj_out83.dist
+ prune_libtool_files
+}
diff --git a/sys-apps/dmidecode/dmidecode-3.0.ebuild b/sys-apps/dmidecode/dmidecode-3.0.ebuild
index 4cae2bc805c..b9e41fa5e9c 100644
--- a/sys-apps/dmidecode/dmidecode-3.0.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/mlocate/mlocate-0.26-r1.ebuild b/sys-apps/mlocate/mlocate-0.26-r1.ebuild
index 41bf8dfcceb..a08956719e3 100644
--- a/sys-apps/mlocate/mlocate-0.26-r1.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r1.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$
@@ -11,7 +11,7 @@ SRC_URI="https://fedorahosted.org/releases/m/l/mlocate/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
IUSE="nls selinux"
RDEPEND="!sys-apps/slocate
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index bfba2967771..ab5c354446c 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -2,3 +2,4 @@ DIST partitionmanager-1.1.1.tar.xz 1738132 SHA256 4cf3fa71bd20b06755d36bb9aa7692
DIST partitionmanager-1.2.1.tar.xz 1794200 SHA256 eb5b8b00ab6f0a2c5ef494b1c70441100ff70bf691006c4aa95f39d00b43e4e0 SHA512 9d33847e307df65081966d4aea2b2efeb7e1befe911268c71e678d196bf0fb9160b9812c7df2021dca2a3a4a5e9efffcf435d242b3496e6e7c7b1d89fea15441 WHIRLPOOL 945676c27a5aa80b6551d75c8324ed3d85328fbfea6f2447e0345e0d1a5ba9d45165ce36332c444b3aea5076f80060b47f4568699fc5bb59e18222af0d7a56c7
DIST partitionmanager-2.0.0.tar.xz 1488312 SHA256 26f880c0955797778612223d3cd68345bc47ec4903b4c541dd04e7998d3083c6 SHA512 20537c55004c353a903977a37077752a99a50c6b439699eb4b209c64e704c47de98645f77ab6efdebd70139c8af2226c8e431eb47cd1730a2060b643eb272705 WHIRLPOOL 4ee5b13015730f09aa050369fa5b65c9afa4d41e99711bfb7e6a4a1b9d3643a7d46834b5af5bd32dbd414843407514dc6df690a90fbbf52bc024053e15e8cd0d
DIST partitionmanager-2.0.1.tar.xz 1488868 SHA256 c953ef3875c6c08ad3aeefa6cb4b31659dd681514079fb20432f360d133333e3 SHA512 8a04352d0c2c9856d9a2ae460e6f97ed6407029f9e5d01ca6bbea9b241e3ea652d4a2196c7d5a0c775f45a87b8ede85a8f66c96357e7e50e9f119b417dd539de WHIRLPOOL 67a9ba8ca3b9d16977a25c59f04f4391654cd1b83a532daa301a0f9c2bfdd6880c68117cde7967dac6447581b31c2d3011bfee9d3e67f7dfd074611b1b5db1aa
+DIST partitionmanager-2.0.3.tar.xz 1489116 SHA256 1b0c142c76c0c3af5887bdbf688754b4e6a1ea2ebbadeda6f3a932f50f8c47e8 SHA512 4a3ee0680651b85e09a9013ac024b8b09b622ac04c6e9143fd18279a359461f0540cd96476bda09fc75df15958649e208d09bc3ff329601708906fff9c02d513 WHIRLPOOL 243e8e547cc003e8847b5fd0f784a9fc57e4bd9e94c00d6a96da51efee8db1ac5ef44b1e226a40e9bbc2d6e94f1d1b8dc29443cd6845477fce7df9627e66d8c2
diff --git a/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild b/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild
new file mode 100644
index 00000000000..54cbc1e9ace
--- /dev/null
+++ b/sys-block/partitionmanager/partitionmanager-2.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE utility for management of partitions and file systems"
+HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ sys-apps/util-linux
+ sys-libs/kpmcore
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools kdesu 5.5.2)
+ !sys-block/partitionmanager:0
+"
diff --git a/sys-cluster/swift/swift-2.5.0-r2.ebuild b/sys-cluster/swift/swift-2.5.0-r2.ebuild
index bd35915adfc..00c23580428 100644
--- a/sys-cluster/swift/swift-2.5.0-r2.ebuild
+++ b/sys-cluster/swift/swift-2.5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="proxy account container object test +memcached"
REQUIRED_USE="|| ( proxy account container object )"
diff --git a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
index 33644346fda..02af8261dd6 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="systemd"
RDEPEND=">=sys-fs/lvm2-2.02.45
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index 07c98ee7adf..5fbff7da007 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
src_prepare() {
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
index 211c6f0e66c..3003ed99e68 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild
@@ -38,12 +38,12 @@ then
inherit git-2 bash-completion-r1 eutils
S="${WORKDIR}/${PN}"
SRC_URI="${COMMON_URI}"
- KEYWORDS=""
+ KEYWORDS="hppa ppc64"
else
inherit bash-completion-r1 eutils
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-power/pm-quirks/pm-quirks-20100619.ebuild b/sys-power/pm-quirks/pm-quirks-20100619.ebuild
index 99d6b10884c..95558688355 100644
--- a/sys-power/pm-quirks/pm-quirks-20100619.ebuild
+++ b/sys-power/pm-quirks/pm-quirks-20100619.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
S=${WORKDIR}
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
index a7b19e41fe4..b9d86a9f964 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
vbetool="!video_cards_intel? ( sys-apps/vbetool )"
diff --git a/virtual/python-asyncio/python-asyncio-0.ebuild b/virtual/python-asyncio/python-asyncio-0.ebuild
index 679621c2e34..23af327849a 100644
--- a/virtual/python-asyncio/python-asyncio-0.ebuild
+++ b/virtual/python-asyncio/python-asyncio-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-backports_abc/python-backports_abc-0.ebuild b/virtual/python-backports_abc/python-backports_abc-0.ebuild
index 0ecf790b4a2..2e96a6874eb 100644
--- a/virtual/python-backports_abc/python-backports_abc-0.ebuild
+++ b/virtual/python-backports_abc/python-backports_abc-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-dnspython/python-dnspython-1.ebuild b/virtual/python-dnspython/python-dnspython-1.ebuild
index 4feee3de493..ba32937f46a 100644
--- a/virtual/python-dnspython/python-dnspython-1.ebuild
+++ b/virtual/python-dnspython/python-dnspython-1.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-futures/python-futures-0.ebuild b/virtual/python-futures/python-futures-0.ebuild
index 11c2dc27fe7..72cefc9dcaf 100644
--- a/virtual/python-futures/python-futures-0.ebuild
+++ b/virtual/python-futures/python-futures-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/python-greenlet/python-greenlet-1.0.ebuild b/virtual/python-greenlet/python-greenlet-1.0.ebuild
index e3c7bde520b..7801571f843 100644
--- a/virtual/python-greenlet/python-greenlet-1.0.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="amd64 arm -hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 -hppa ~mips ppc ppc64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/virtual/python-singledispatch/python-singledispatch-0.ebuild b/virtual/python-singledispatch/python-singledispatch-0.ebuild
index b589cbb265e..ec4e1d9457a 100644
--- a/virtual/python-singledispatch/python-singledispatch-0.ebuild
+++ b/virtual/python-singledispatch/python-singledispatch-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
IUSE=""
RDEPEND="$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)"
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
index 9bc2893dfbc..442e3c1834f 100644
--- a/virtual/w3m/w3m-0.ebuild
+++ b/virtual/w3m/w3m-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=""
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index dd6428b6365..6030a1652de 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,4 @@
DIST opera-beta_35.0.2066.35_amd64.deb 45196244 SHA256 fffa77b114ce8434d4b48987042f26a919e319a40ad61250af891e6119fa9d0e SHA512 c75798d17f59aff11e5e58f21d5606f9d92b1136bcddc901662f5adba1ddc400729a653c12e39d2cf7754e741834f46f82ba44c39220371c037c73964e72d539 WHIRLPOOL f6b8b7133d701a60baca44f93160e4d67bbe65aa45643fed6b84e337926582b784e488e4287806dd88b03dbd46abd673eefa9d880ef71e5d775b81d4732697d7
+DIST opera-beta_36.0.2130.21_amd64.deb 47382256 SHA256 3ac3a2a9b8f6d69ad1de88859405115acb83269447697f758b6e713ba647a766 SHA512 2de58ea2f48c17007abd945bb8f7dc4f0552a2ddf9136707f8c3fadcaa7be02ead018108f34e1e6886c50e2d6698f4038cc13b5ed1a15ae721cc111e571701d2 WHIRLPOOL abf6a9d6b25c530f74daeeff2136af7556e0b7a701b0780d38b87ba5addc801eaaae14abe5373243ed344e984ec8c558a945c887cdcaa64d0bb0096910b19cd4
+DIST opera-beta_36.0.2130.21_i386.deb 48429050 SHA256 7f799a406689bba3ccfc34f632257c2f3632e857872d5de835f356b5dc0f9da0 SHA512 5c92180cd9416586fa811c620e4a985de6fe7072c0f2677e6d48c7fbd44665ec11b93f20d689811febc135899487a30ab03f241f4bf714052575f6987750bdc9 WHIRLPOOL 80c22311d869ab033f784756ad702e45a4d44101ba0d7199e5c533bc3b85d85df009683a98ad37e921394567186bdfd6c6244bbbf80d7f3e05bb5bb8830d3c84
DIST opera-beta_36.0.2130.2_amd64.deb 46519260 SHA256 ce314768010d605e1a365dabea5b8cd02c0c9bd33abca6e94515f8ff39299295 SHA512 c5502bbbacbd501408b0502d656053ef429cd1e25124438fb68e1615c8a7f367b7efe6d56124d8c8a2d8a702215523027d739fe40bad74e9196a618f02dfacba WHIRLPOOL abfa182bb930fa853f5df3a9d484c305bf7be5bb0ae695470d8b66aa18c74fbafe6408d98699a68417870c53b025b87d6de3712fbad9860ca399f732284216a6
diff --git a/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild b/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild
new file mode 100644
index 00000000000..bfeded8ebfc
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-36.0.2130.21.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+ af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
+ hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
+ sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
+"
+inherit chromium multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+ amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+ x86? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ net-print/cups
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libnotify
+ x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ case ${ARCH} in
+ amd64)
+ mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+ rm -r usr/lib || die
+ ;;
+ x86)
+ mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+ ;;
+ esac
+
+ rm usr/bin/${PN} || die
+
+ rm usr/share/doc/${PN}/copyright || die
+ mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+ pushd "${OPERA_HOME}/localization" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ sed -i \
+ -e 's|^TargetEnvironment|X-&|g' \
+ usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+ fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9d05e936075..9a17289b021 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,3 +2,5 @@ DIST vivaldi-1.0.390.3_p1-amd64.deb 44041614 SHA256 18e976f4a500ca069ac85520562f
DIST vivaldi-1.0.390.3_p1-i386.deb 44459070 SHA256 9fb5a5e468a04021d01f28ad08ac8df5c61edf7f0e01b02e73e7b57b2d1dd5c8 SHA512 56782ea9767a7e44872548ee8a4aa5d3f5a6073bd2ae533b175a4943b6c7c73b353a42aca9b239a9af52825df6cb83842ee5267e7a9177d1c5202ef8a4c1808e WHIRLPOOL 0272db44cbab2af8b37f4fffde1ad026cf9ba5686522a77f509c7a0b745d7d632e472a2a77a488b58edb4e1eef1e38d087e7586902035d839cf4982c11cb076f
DIST vivaldi-1.0.403.15_p1-amd64.deb 43941722 SHA256 757553335e53334d378c67775221447b350214638e368a7c8a7bf3fcc3fa43d5 SHA512 96ab3eb2bcbbf51f3c5c730774e0f08c642a90fe89c34ad559bcad85f0a9efb1c24e2dfdf6ff82f06a981a6fe733f46033311ecbcdf72d2a358b7d1dd709e350 WHIRLPOOL 056cdc318f3e0cd6df59e0421d820a9b80f3fe2eec47e71cb5bc3a15ac239d4ff53417be51558c6fda0b37dfb2c5841b1025bd9f2c82f485c3d017725d728c55
DIST vivaldi-1.0.403.15_p1-i386.deb 44476594 SHA256 d0e108dd6d0f1405864239e2d15121fa1d8b7607bccc662b9517f9300aec8fa4 SHA512 9ba36227087f2c5935e9a7fecf5c0dcd659204e413ea70cfa1d27273e828badad41f4f9f97bbc78610406ff259f32535aeaf17e6e2e63849dd55d582a7c14110 WHIRLPOOL 1307a85fbca3f5b08c0ca46923f38e3d1ebda309f6f4f161ff13bd748e606c071f43c5a284aadab183345dc5fd5bc29245a9fb5b7d7196cf8dc9e363a1a47142
+DIST vivaldi-1.0.403.17_p1-amd64.deb 44005668 SHA256 18a6b14f9340b00b61e4e1433a3fd4a91a0e42490d69cf38332385dfd0911191 SHA512 9646c0bf48f52ac1d9bd3ce54f4c12bad7731625cf50b47610b05d85fb12deeeeda2c0b148a002c8dbdf5880fb6dc7a82475f137fe4aaeaac04a7a0c9fd22565 WHIRLPOOL 6381a2e1d5cee119ade5c8364b83fa195397aa497e912f8236a6c831aae975cfb8a2ad785be602278df8e542dbaf324267ed0e8ada8295f7ae3a77343977f077
+DIST vivaldi-1.0.403.17_p1-i386.deb 44537126 SHA256 30833b37178e57c061b63d85c63858329b2a67db68b4d3cb6e843780972d3f97 SHA512 3b7c03d8b6926cc5bf696ca2aeb19aa13b41b84487730c45f823303cac2704a1ccb8170479c4b0d9c08190c2b5adcb13391225f401f86d58b0d38ca3d20db5d5 WHIRLPOOL cc65888ceeb6caa57302172315750f9cac6788dadcb7a3bf835dcb9b6f29ac5ddfa7b4acd0b2a0ff68be64baf380d574222fd37c47f391c7974a64b71926ff4a
diff --git a/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild
new file mode 100644
index 00000000000..f985379c7cb
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.403.17_p1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium eutils multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/"
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/openssl-1.0.1:0
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-snapshot"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|@LIBDIR@|$(get_libdir)|g" \
+ opt/vivaldi-snapshot/vivaldi-snapshot || die
+
+ sed -i \
+ -e 's|vivaldi-snapshot|vivaldi|g' \
+ usr/share/applications/${PN}-snapshot.desktop \
+ usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+
+ mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+
+ rm \
+ _gpgbuilder \
+ etc/cron.daily/${PN}-snapshot \
+ usr/bin/${PN}-snapshot \
+ || die
+ rmdir \
+ etc/cron.daily/ \
+ etc/ \
+ || die
+
+ local c d
+ for d in 16 22 24 32 48 64 128 256; do
+ mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+ cp \
+ ${VIVALDI_HOME}/product_logo_${d}.png \
+ usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
+ done
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
+}
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
index fa04611a64b..cedf1797ce2 100644
--- a/www-client/w3m/w3m-0.5.3-r5.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
LICENSE="w3m"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="X fbcon gpm gtk imlib lynxkeymap migemo nls nntp ssl unicode vanilla xface linguas_ja"
# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
diff --git a/www-servers/tornado/tornado-4.3.ebuild b/www-servers/tornado/tornado-4.3.ebuild
index 6fb16e09e0f..1ab2319af80 100644
--- a/www-servers/tornado/tornado-4.3.ebuild
+++ b/www-servers/tornado/tornado-4.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND="
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 00a5f8f6d5a..cb65733d4a8 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,4 +1,4 @@
DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b
-DIST xf86-input-libinput-0.15.0.tar.bz2 314205 SHA256 28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41 SHA512 f9c9f5f09537cd4830bd17720135102a9b02454e0acc4a80230ddd066c39a106c91260f7774da364760fd4f3b59b8ba9ab6abc83ad49ae6e9dad1609b9b25cf4 WHIRLPOOL 3dad70a7ce44dd8812d4dd1ebdcf7325c521b5dce4763c87bdd89962df577a4d9b9cf457ca7d72cc987554034636429d2f047b8a7cf257bd79b2c233e56f3925
DIST xf86-input-libinput-0.16.0.tar.bz2 340816 SHA256 fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49 SHA512 6b1243a29d94e6b26e92da04ce9d308d0957c46fcacb16711f5037f351bb48e9e80070a7e8d4f7e934698d4b394df982c81df489a8bb8b8f6021e2c99c0b0c19 WHIRLPOOL e0b13a91c54d9823ff03ea4fe67ce48abe744c9bb3929c81286794e8edb5211668237d75d578c64df22bc1b286a97cba2e5769c6cb7b96aff0611c9c7107eacc
+DIST xf86-input-libinput-0.17.0.tar.bz2 341722 SHA256 2a378a25da46a875b6699ada29332290798e37df708ab2f2e4b0915ef1fbbab2 SHA512 738d4937f25dcb432bd664a204cbd4c66f38bd3385040ec56bc1949842d7099491d4ad96f2ba68342119046ed3d94ac562568f228c6a38686ba6cc86e9256f4d WHIRLPOOL ad45e800c223fd26edc1f2fcfe1c6895655b50a3b1c53a75e1221b8b3f7448a6c724b080bf18299c237581fcbedf5e0a9e1f5e0c69e475703f7de79da2bc94c8
DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.17.0.ebuild
index a59a6b472a2..f87e480f668 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.15.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.17.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$
@@ -11,7 +11,7 @@ DESCRIPTION="X.org input driver based on libinput"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-libs/libinput-1.1.0:0="
+RDEPEND=">=dev-libs/libinput-1.2.0:0="
DEPEND="${RDEPEND}"
DOCS=( "README.md" "conf/90-libinput.conf" )
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index b88cabaa8bc..c1246d90111 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,5 +1,5 @@
DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
DIST xf86-video-intel-2.99.917.tar.bz2 2259040 SHA256 00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 SHA512 cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f WHIRLPOOL b26f1b303a27825120e1036f15493119e8869ebae74a2663204fe1ee63cf9fc217e593c469d6c33151a73c9ea6e9df88d0e3a0bb74ece5109b51593785fd4d7d
-DIST xf86-video-intel-2.99.917_p20160213.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205
DIST xf86-video-intel-2.99.917_p20160218.tar.xz 933036 SHA256 0c0b67ef52d02080f1361bde45b7bd4f901e6d64028e1a768223d63769f72616 SHA512 b762afdde5ef8eaf0e310985fbfd0c192f7463b3114507e3ed7edb16c99bbcf28e4c439d257d59d937c5b1e9f240d512a1025ebd23a0984160a8339df3a30995 WHIRLPOOL 723474bba515f222f2aa5392fc9dc8dc6d3cf548f6ffd1b0396f9c78b148588424da703fe9ade5730bd33f99ce10f4de77738e6a7d46212f1425ab2e82faa205
+DIST xf86-video-intel-2.99.917_p20160224.tar.xz 933972 SHA256 7406ef1646be39d1130f76f8d60d29a9278d0561f1fcb8b6bfe0851533755e2b SHA512 a0d78ec9db62447c1851fc24952b02a0c0ac063b229053ab6c11cde7fee4e81c3ae7b9ae93d0d9e2171c3dfe986312f6cb433208362b5b5c7dac65e8b1984391 WHIRLPOOL 497225db28fba4c5a92934d6ec92095061819876b3fbfca0987c76a9dbe786a78666dc470dad9a901356e2c380d0f1eb7ee4ee44c68e8e31a55e2544a1408fdb
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160224.ebuild
index 8ebdc86a853..b13f3a0c89a 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160213.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160224.ebuild
@@ -5,13 +5,14 @@
EAPI=5
XORG_DRI=dri
+XORG_EAUTORECONF=yes
inherit linux-info xorg-2
DESCRIPTION="X.Org driver for Intel cards"
KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug dri3 +sna +udev uxa xvmc"
-COMMIT_ID="636b52913cac10e691834a699cff10fb94d395fa"
+IUSE="debug +dri3 +sna +udev uxa xvmc"
+COMMIT_ID="d1672806a5222f00dcc2eb24ccddd03f727f71bc"
SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
S=${WORKDIR}/${COMMIT_ID}
@@ -39,16 +40,11 @@ RDEPEND="x11-libs/libXext
)
"
DEPEND="${RDEPEND}
- x11-misc/util-macros
>=x11-proto/dri2proto-2.6
x11-proto/dri3proto
x11-proto/presentproto
x11-proto/resourceproto"
-src_prepare() {
- eautoreconf
-}
-
src_configure() {
XORG_CONFIGURE_OPTIONS=(
$(use_enable debug)
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
index c300ea72576..3d03f3c7064 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 3d29b4ce30c..fc01b70a3a4 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,2 +1,3 @@
DIST shared-mime-info-1.4.tar.xz 537916 SHA256 bbc0bd023f497dfd75e1ca73441cbbb5a63617d9e14f2790b868361cc055b5b1 SHA512 ac643a5360c1e4811b2df8e3c52434e5ee48f8e62a01ede3fb0895d30721b58b5b26c0edc43f779576ff899bd1a8b181699a08dbbb1e956394555f6ca983a582 WHIRLPOOL 32cb301cd54140b83af8c321b7ebc571b87b07ca86bfc68e6760e4dd3551188a092a96087042b13f1278c11cd88c261879fc816d0c2efcbee473211d929194bf
DIST shared-mime-info-1.5.tar.xz 559040 SHA256 d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180 SHA512 8a97c8fa5a60eede056a42c36d9f8d015bf2788feca4630397ef71ba2cfe29ad469fb1669c368674edd4661af6b2f6823377cc27525f44c61788533c0c28e22a WHIRLPOOL 157dfc0f3a6aacde8ca734217f9a3b2e8baa9bc0254a2024716136215624e642b25537216f79c9a95ba55ee70dff872eb746cb3e0e07cb31a8a190d7d5bf6b7b
+DIST shared-mime-info-1.6.tar.xz 557240 SHA256 b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c SHA512 01c57759d363a2f0513cda94de5eb236f3d56683630a1be12278d9043d6184cf5f04a25b9cdca76b72fe42590542dfd41ae39f4e9bcd9cb239c200e9079a5840 WHIRLPOOL d8c1a5cee530eb919d3f65c1c90fe3f443c4adee5f9e0cc4ed850866625776c532fac5d48c38607e23af516b98800a5016e35e6364ccb1ff7f30f2644fc16f6e
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
new file mode 100644
index 00000000000..90fa1149150
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-libs/glib-2
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog HACKING NEWS README )
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ export ac_cv_func_fdatasync=no #487504
+
+ econf \
+ $(use_enable test default-make-check) \
+ --disable-update-mimedb
+}
+
+src_compile() {
+ # FIXME: 0.91 fails with -j9 every second time like:
+ # update_mime_database-update-mime-database.o: file not recognized: File truncated
+ # collect2: ld returned 1 exit status
+ emake -j1
+}
+
+src_install() {
+ default
+
+ # in prefix, install an env.d entry such that prefix patch is used/added
+ if use prefix; then
+ echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+ doenvd "${T}"/50mimeinfo
+ fi
+}
+
+pkg_postinst() {
+ use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ fdo-mime_mime_database_update
+}
diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 55ce781aa91..578e246bcbd 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -5,22 +5,50 @@
<email>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
- <longdescription>
- Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp.
+ <longdescription lang="en">
+ Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in
+ Common Lisp.
- If you're tired of flipping through themes like channel-surfing, and going from one perfect-except-for-just-one-thing
- window manager to another even-more-broken-in-some-other-way then perhaps Stumpwm can help.
+ If you're tired of flipping through themes like channel-surfing, and going
+ from one perfect-except-for-just-one-thing window manager to another
+ even-more-broken-in-some-other-way then perhaps Stumpwm can help.
- Stumpwm attempts to be customizable yet visually minimal. There are no window decorations, no icons, and no buttons.
- It does have various hooks to attach your personal customizations, and variables to tweak.
+ Stumpwm attempts to be customizable yet visually minimal. There are no
+ window decorations, no icons, and no buttons.
+ It does have various hooks to attach your personal customizations, and
+ variables to tweak.
- * Hack the good hack
- * debug your good hack
- * customize your window manager
+ * Hack the good hack
+ * debug your good hack
+ * customize your window manager
- while it's running. That's right. With a 100% Common Lisp window manager there's no stopping the hacks. Just re-eval and GO!
+ while it's running. That's right. With a 100% Common Lisp window manager
+ there's no stopping the hacks. Just re-eval and GO!
+ </longdescription>
+ <longdescription lang="es">
+ Stumpwm es un gestor de ventanas estilo mosaico gestionado por teclado
+ escrito completamente en Common Lisp.
+
+ Si está cansado de cambiar de temas como navegación por canales y vagar
+ de un gestor de ventanas perfecto excepto por esa pequeña característica
+ a otro incluso más roto de alguna otra forma, entonces quizá Stumpwm
+ pueda ser de ayuda.
+
+ Stumpwm persigue ser personalizable a la vez que mínimo. No hay
+ decoración en las ventanas, ni iconos ni botones.
+ Dispone de varios enganches para realizar nuestras propias configuraciones
+ personales y variables que podemos ajustar a nuestras necesidades para:
+
+ * Cacharrear de forma correcta
+ * Depurar nuestro propio cacharreo
+ * Personalizar nuestro gestor de ventanas
+
+ mientras está corriendo. Eso está bien. Con un gestor de ventanas escrito
+ al 100% en Common Lisp no hay forma de detener el cacharreo. ¡Simplemente
+ reevalúe y CONTINÚE!
</longdescription>
<use>
+ <flag name="contrib">Install contrib modules</flag>
<flag name="doc">Include documentation</flag>
<flag name="emacs">Add support for GNU Emacs</flag>
<flag name="clisp">Use CLISP for the runtime</flag>
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
index e275cdcf8f1..00a90c7d1db 100644
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+++ b/x11-wm/stumpwm/stumpwm-0.9.9.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,14 +6,14 @@ EAPI=5
inherit common-lisp-3 eutils elisp-common autotools
-DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
HOMEPAGE="http://www.nongnu.org/stumpwm/"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs clisp ecl +sbcl"
+IUSE="contrib doc emacs clisp ecl +sbcl"
RESTRICT="strip mirror"
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
doc? ( virtual/texi2dvi )"
SITEFILE=70${PN}-gentoo.el
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
+CONTRIBDIR="${CLPKGDIR}/contrib"
get_lisp() {
local lisp
@@ -48,20 +50,37 @@ do_doc() {
docinto examples ; dodoc sample-stumpwmrc.lisp
}
+do_contrib() {
+ emake install-modules
+ rm -r "${D}${CONTRIBDIR}"/.git* || die
+}
+
src_prepare() {
+ # Fix ASDF dir
+ sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die
# Upstream didn't change the version before packaging
- sed -i "${S}/${PN}.asd" -e 's/:version "0.9.8"/:version "0.9.9"/' || die
+ sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die
# Bug 534592. Does not build with asdf:oos, using require to load the package
- sed -i "${S}/load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
+ sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
+ if use contrib ; then
+ # Fix contrib directory
+ sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die
+ sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die
+ sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die
+ fi
eautoreconf
}
src_configure() {
- econf --with-lisp=$(get_lisp sbcl clisp ecl)
+ local moduleconfig
+
+ use contrib && moduleconfig="--with-module-dir=${CLSOURCEROOT}/${CLPACKAGE}/contrib"
+ econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}"
}
src_compile() {
emake -j1
+ echo "HOLa"
}
src_install() {
@@ -72,6 +91,7 @@ src_install() {
common-lisp-install-sources *.lisp
common-lisp-install-asdf ${PN}.asd
use doc && do_doc
+ use contrib && do_contrib
}
pkg_postinst() {
diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild
index cf73b6f3923..cec821a91ec 100644
--- a/x11-wm/stumpwm/stumpwm-9999.ebuild
+++ b/x11-wm/stumpwm/stumpwm-9999.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit autotools common-lisp-3 git-2
-DESCRIPTION="Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in Common Lisp."
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
HOMEPAGE="http://www.nongnu.org/stumpwm/index.html"
EGIT_REPO_URI="git://github.com/stumpwm/stumpwm"
@@ -33,6 +33,8 @@ do_doc() {
}
src_prepare() {
+ # Fix ASDF dir
+ sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die
eautoreconf
}