From b7234f84875c075f7f1fb8a8f79541145484c49a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 25 Mar 2016 17:05:27 +0300 Subject: [PATCH] Sync with portage [Fri Mar 25 17:05:27 MSK 2016]. --- app-admin/puppet-agent/Manifest | 6 +- .../puppet-agent/puppet-agent-1.3.4.ebuild | 99 --- ...1.3.2.ebuild => puppet-agent-1.4.1.ebuild} | 4 +- app-admin/puppet/Manifest | 2 +- ...uppet-4.4.0.ebuild => puppet-4.4.1.ebuild} | 0 app-admin/puppetserver/Manifest | 1 + .../puppetserver/puppetserver-2.3.1.ebuild | 107 +++ app-arch/innoextract/Manifest | 1 + app-arch/innoextract/innoextract-1.6.ebuild | 36 + app-arch/unrar/unrar-5.3.11.ebuild | 2 +- .../ganeti-2.15-noded-must-run-as-root.patch | 50 ++ app-emulation/ganeti/ganeti-2.15.2-r1.ebuild | 310 +++++++ app-emulation/qemu-init-scripts/Manifest | 1 + app-emulation/qemu-init-scripts/metadata.xml | 12 + .../qemu-init-scripts-0.3.0.ebuild | 39 + app-emulation/qemu/qemu-2.5.0-r1.ebuild | 661 -------------- app-i18n/fcitx-qt5/Manifest | 1 + app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild | 44 + app-i18n/fcitx-qt5/fcitx-qt5-9999.ebuild | 40 + .../files/fcitx-qt5-1.0.5-ucs4.patch | 86 ++ app-i18n/fcitx/Manifest | 1 + app-i18n/fcitx/fcitx-4.2.9.1.ebuild | 147 ++++ app-i18n/fcitx/fcitx-9999.ebuild | 142 ++++ .../fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch | 95 +++ .../fcitx/files/fcitx-4.2.9.1-tray_icon.patch | 145 ++++ app-i18n/fcitx/metadata.xml | 19 +- app-i18n/kcm-fcitx/Manifest | 1 + app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild | 4 +- app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild | 45 +- app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild | 48 ++ app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild | 61 ++ app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild | 61 ++ app-text/asciidoc/asciidoc-8.6.9-r3.ebuild | 81 ++ app-text/bdf2psf/bdf2psf-1.104.ebuild | 2 +- dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild | 2 +- dev-java/hoteqn/hoteqn-4.0.0.ebuild | 33 - dev-java/jsr67/Manifest | 1 - dev-java/jsr67/jsr67-1.3-r1.ebuild | 2 +- dev-java/jsr67/jsr67-1.3.ebuild | 30 - dev-lang/ekopath/Manifest | 1 + .../ekopath-6.0.728_p20160324-r1.ebuild | 63 ++ .../ekopath-6.0.728_p20160324-r100.ebuild | 74 ++ dev-lang/moarvm/Manifest | 1 + dev-lang/moarvm/moarvm-2016.03.ebuild | 31 + dev-lang/nqp/Manifest | 1 + dev-lang/nqp/nqp-2016.03.ebuild | 64 ++ dev-lang/php/Manifest | 4 - dev-lang/php/php-5.5.31.ebuild | 784 ----------------- dev-lang/php/php-5.5.32.ebuild | 784 ----------------- dev-lang/php/php-5.6.17.ebuild | 787 ----------------- dev-lang/php/php-5.6.18.ebuild | 804 ------------------ dev-lang/rakudo/Manifest | 1 + dev-lang/rakudo/rakudo-2016.03.ebuild | 36 + dev-lang/rust-bin/metadata.xml | 6 +- dev-lang/rust/metadata.xml | 2 +- dev-libs/glib/Manifest | 1 + dev-libs/glib/glib-2.48.0.ebuild | 292 +++++++ dev-libs/libbsd/Manifest | 1 - dev-libs/libbsd/libbsd-0.7.0.ebuild | 40 - dev-libs/libgaminggear/Manifest | 2 +- ...0.1.ebuild => libgaminggear-0.11.2.ebuild} | 0 dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild | 2 +- dev-lisp/asdf/Manifest | 1 + dev-lisp/asdf/asdf-3.1.7.ebuild | 50 ++ dev-lisp/uiop/Manifest | 1 + dev-lisp/uiop/uiop-3.1.7.ebuild | 28 + dev-python/alembic/alembic-0.8.5.ebuild | 4 +- dev-python/amqplib/amqplib-1.0.2-r1.ebuild | 4 +- dev-python/anyjson/anyjson-0.3.3-r1.ebuild | 2 +- dev-python/cachetools/cachetools-1.1.5.ebuild | 2 +- .../couchdb-python-1.0.1.ebuild | 2 +- dev-python/debtcollector/Manifest | 1 + .../debtcollector/debtcollector-1.3.0.ebuild | 70 ++ dev-python/doc8/doc8-0.6.0.ebuild | 2 +- dev-python/dogpile-cache/Manifest | 1 + .../dogpile-cache/dogpile-cache-0.5.7.ebuild | 37 + .../dogpile-core/dogpile-core-0.4.1.ebuild | 2 +- dev-python/eventlet/eventlet-0.18.4.ebuild | 6 +- dev-python/fasteners/fasteners-0.13.0.ebuild | 2 +- dev-python/futurist/Manifest | 1 + dev-python/futurist/futurist-0.13.0.ebuild | 28 + dev-python/httpretty/httpretty-0.8.6.ebuild | 4 +- dev-python/keystoneauth/Manifest | 1 + .../keystoneauth/keystoneauth-2.3.0.ebuild | 28 + dev-python/keystoneauth/metadata.xml | 11 + dev-python/keystonemiddleware/Manifest | 1 + .../keystonemiddleware-4.3.0.ebuild | 86 ++ dev-python/kombu/kombu-3.0.34.ebuild | 4 +- dev-python/monotonic/Manifest | 1 + dev-python/monotonic/monotonic-1.0.ebuild | 21 + dev-python/oslo-cache/Manifest | 1 + dev-python/oslo-cache/metadata.xml | 11 + dev-python/oslo-cache/oslo-cache-1.5.0.ebuild | 40 + dev-python/oslo-concurrency/Manifest | 1 + .../oslo-concurrency-3.6.0.ebuild | 59 ++ dev-python/oslo-config/Manifest | 1 + .../oslo-config/oslo-config-3.9.0.ebuild | 74 ++ dev-python/oslo-db/Manifest | 1 + dev-python/oslo-db/oslo-db-4.6.0.ebuild | 56 ++ dev-python/oslo-i18n/Manifest | 1 + dev-python/oslo-i18n/oslo-i18n-3.4.0.ebuild | 63 ++ dev-python/oslo-log/Manifest | 1 + dev-python/oslo-log/oslo-log-3.2.0.ebuild | 62 ++ dev-python/oslo-messaging/Manifest | 1 + .../oslo-messaging-4.5.1.ebuild | 55 ++ dev-python/oslo-middleware/Manifest | 1 + .../oslo-middleware-3.7.0.ebuild | 57 ++ .../oslo-policy/oslo-policy-0.12.0.ebuild | 2 +- dev-python/oslo-service/Manifest | 1 + .../oslo-service/oslo-service-1.7.0.ebuild | 63 ++ dev-python/oslo-utils/Manifest | 1 + dev-python/oslo-utils/oslo-utils-3.7.0.ebuild | 95 +++ dev-python/paste/paste-2.0.2.ebuild | 2 +- .../pastedeploy/pastedeploy-1.5.2.ebuild | 2 +- dev-python/pika-pool/Manifest | 1 + dev-python/pika-pool/metadata.xml | 11 + dev-python/pika-pool/pika-pool-0.1.3.ebuild | 21 + dev-python/pika/pika-0.10.0.ebuild | 4 +- dev-python/positional/Manifest | 1 + dev-python/positional/metadata.xml | 11 + dev-python/positional/positional-1.0.1.ebuild | 21 + dev-python/py-amqp/py-amqp-1.4.9.ebuild | 2 +- dev-python/pycadf/pycadf-1.1.0.ebuild | 2 +- dev-python/pysaml2/pysaml2-3.0.0.ebuild | 2 +- .../python-editor/python-editor-0.4.ebuild | 2 +- .../python-memcached-1.57.ebuild | 2 +- .../python-sqlparse-0.1.18.ebuild | 2 +- dev-python/reno/reno-1.2.0.ebuild | 4 +- .../repoze-lru/repoze-lru-0.6-r1.ebuild | 2 +- dev-python/repoze-who/repoze-who-2.2.ebuild | 2 +- .../restructuredtext-lint-0.12.2.ebuild | 2 +- dev-python/routes/routes-2.2.ebuild | 2 +- .../sphinxcontrib-issuetracker-0.11-r1.ebuild | 4 +- .../sqlalchemy-migrate-0.10.0.ebuild | 2 +- dev-python/stevedore/stevedore-1.12.0.ebuild | 2 +- dev-ruby/cliver/cliver-0.3.2.ebuild | 4 +- dev-ruby/hiera/Manifest | 1 + dev-ruby/hiera/hiera-3.1.1.ebuild | 33 + dev-ruby/jwt/Manifest | 2 +- .../{jwt-1.5.2.ebuild => jwt-1.5.4.ebuild} | 6 +- dev-ruby/open4/Manifest | 1 - dev-ruby/open4/open4-1.3.3.ebuild | 37 - dev-ruby/open4/open4-1.3.4.ebuild | 4 +- dev-ruby/paint/Manifest | 1 - dev-ruby/paint/paint-1.0.0.ebuild | 22 - dev-util/gdbus-codegen/Manifest | 1 + .../gdbus-codegen/gdbus-codegen-2.48.0.ebuild | 47 + dev-util/gtk-doc-am/Manifest | 1 + dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild | 46 + dev-util/gtk-doc/Manifest | 1 + dev-util/gtk-doc/gtk-doc-1.25.ebuild | 110 +++ dev-util/meld/Manifest | 1 - dev-util/meld/meld-3.14.1.ebuild | 38 - ...s-0_pre131024-filter-invalid-unicode.patch | 11 + dev-vcs/gitstats/gitstats-0_pre131024.ebuild | 3 +- eclass/bitcoincore.eclass | 2 +- eclass/mozcoreconf-v3.eclass | 2 +- eclass/mysql-multilib-r1.eclass | 1 + games-strategy/widelands/Manifest | 1 + .../files/widelands-0.18-cxxflags.patch | 12 + .../widelands/widelands-0.18.ebuild | 64 ++ licenses/LIBAEC | 37 - mail-client/thunderbird/Manifest | 57 ++ .../thunderbird/thunderbird-38.7.1.ebuild | 378 ++++++++ media-fonts/unifont/unifont-8.0.01.ebuild | 2 +- media-gfx/valentina/valentina-9999.ebuild | 2 +- media-sound/drumstick/Manifest | 2 - media-sound/drumstick/drumstick-1.0.0.ebuild | 75 -- media-sound/drumstick/drumstick-1.0.1.ebuild | 75 -- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../app-admin/{puppet-4.4.0 => puppet-4.4.1} | 2 +- .../md5-cache/app-admin/puppet-agent-1.3.4 | 14 - ...{puppet-agent-1.3.2 => puppet-agent-1.4.1} | 6 +- .../md5-cache/app-admin/puppetserver-2.3.1 | 13 + metadata/md5-cache/app-arch/innoextract-1.6 | 13 + metadata/md5-cache/app-arch/unrar-5.3.11 | 4 +- .../md5-cache/app-emulation/ganeti-2.15.2-r1 | 14 + .../md5-cache/app-emulation/qemu-2.5.0-r1 | 14 - .../app-emulation/qemu-init-scripts-0.3.0 | 10 + metadata/md5-cache/app-i18n/fcitx-4.2.9.1 | 14 + metadata/md5-cache/app-i18n/fcitx-9999 | 12 + metadata/md5-cache/app-i18n/fcitx-qt5-1.0.5 | 12 + metadata/md5-cache/app-i18n/fcitx-qt5-9999 | 10 + metadata/md5-cache/app-i18n/kcm-fcitx-0.4.2 | 4 +- metadata/md5-cache/app-i18n/kcm-fcitx-0.4.3 | 20 +- .../md5-cache/app-i18n/kcm-fcitx-0.4.9999 | 11 + metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3 | 12 + metadata/md5-cache/app-i18n/kcm-fcitx-9999 | 10 + metadata/md5-cache/app-text/asciidoc-8.6.9-r3 | 14 + metadata/md5-cache/app-text/bdf2psf-1.104 | 4 +- metadata/md5-cache/dev-db/mariadb-10.0.23 | 2 +- metadata/md5-cache/dev-db/mariadb-10.0.24 | 2 +- metadata/md5-cache/dev-db/mariadb-10.1.10 | 2 +- metadata/md5-cache/dev-db/mariadb-10.1.11 | 2 +- metadata/md5-cache/dev-db/mariadb-10.1.12 | 2 +- metadata/md5-cache/dev-db/mysql-5.6.28 | 2 +- metadata/md5-cache/dev-db/mysql-5.6.29 | 2 +- .../dev-db/percona-server-5.6.28.76.1 | 2 +- .../dev-db/percona-server-5.6.29.76.2 | 2 +- metadata/md5-cache/dev-java/hoteqn-4.0.0 | 13 - metadata/md5-cache/dev-java/hoteqn-4.0.0-r1 | 4 +- metadata/md5-cache/dev-java/jsr67-1.3 | 13 - metadata/md5-cache/dev-java/jsr67-1.3-r1 | 4 +- .../dev-lang/ekopath-6.0.728_p20160324-r1 | 13 + .../dev-lang/ekopath-6.0.728_p20160324-r100 | 13 + metadata/md5-cache/dev-lang/moarvm-2016.03 | 13 + metadata/md5-cache/dev-lang/nqp-2016.03 | 15 + metadata/md5-cache/dev-lang/php-5.5.31 | 14 - metadata/md5-cache/dev-lang/php-5.5.32 | 14 - metadata/md5-cache/dev-lang/php-5.6.17 | 14 - metadata/md5-cache/dev-lang/php-5.6.18 | 14 - metadata/md5-cache/dev-lang/rakudo-2016.03 | 12 + metadata/md5-cache/dev-libs/glib-2.48.0 | 15 + metadata/md5-cache/dev-libs/libbsd-0.7.0 | 11 - ...gaminggear-0.10.1 => libgaminggear-0.11.2} | 2 +- metadata/md5-cache/dev-libs/libgcrypt-1.5.5 | 4 +- metadata/md5-cache/dev-lisp/asdf-3.1.7 | 13 + metadata/md5-cache/dev-lisp/uiop-3.1.7 | 11 + metadata/md5-cache/dev-python/alembic-0.8.5 | 12 +- .../md5-cache/dev-python/amqplib-1.0.2-r1 | 12 +- .../md5-cache/dev-python/anyjson-0.3.3-r1 | 10 +- .../md5-cache/dev-python/cachetools-1.1.5 | 10 +- .../md5-cache/dev-python/couchdb-python-1.0.1 | 10 +- .../md5-cache/dev-python/debtcollector-1.3.0 | 14 + metadata/md5-cache/dev-python/doc8-0.6.0 | 10 +- .../md5-cache/dev-python/dogpile-cache-0.5.7 | 14 + .../md5-cache/dev-python/dogpile-core-0.4.1 | 10 +- metadata/md5-cache/dev-python/eventlet-0.18.4 | 12 +- .../md5-cache/dev-python/fasteners-0.13.0 | 10 +- metadata/md5-cache/dev-python/futurist-0.13.0 | 14 + metadata/md5-cache/dev-python/httpretty-0.8.6 | 12 +- .../md5-cache/dev-python/keystoneauth-2.3.0 | 14 + .../dev-python/keystonemiddleware-4.3.0 | 14 + metadata/md5-cache/dev-python/kombu-3.0.34 | 12 +- metadata/md5-cache/dev-python/monotonic-1.0 | 14 + .../md5-cache/dev-python/oslo-cache-1.5.0 | 14 + .../dev-python/oslo-concurrency-3.6.0 | 14 + .../md5-cache/dev-python/oslo-config-3.9.0 | 14 + metadata/md5-cache/dev-python/oslo-db-4.6.0 | 14 + metadata/md5-cache/dev-python/oslo-i18n-3.4.0 | 14 + metadata/md5-cache/dev-python/oslo-log-3.2.0 | 14 + .../md5-cache/dev-python/oslo-messaging-4.5.1 | 14 + .../dev-python/oslo-middleware-3.7.0 | 14 + .../md5-cache/dev-python/oslo-policy-0.12.0 | 10 +- .../md5-cache/dev-python/oslo-service-1.7.0 | 14 + .../md5-cache/dev-python/oslo-utils-3.7.0 | 14 + metadata/md5-cache/dev-python/paste-2.0.2 | 10 +- .../md5-cache/dev-python/pastedeploy-1.5.2 | 10 +- metadata/md5-cache/dev-python/pika-0.10.0 | 12 +- metadata/md5-cache/dev-python/pika-pool-0.1.3 | 14 + .../md5-cache/dev-python/positional-1.0.1 | 14 + metadata/md5-cache/dev-python/py-amqp-1.4.9 | 10 +- metadata/md5-cache/dev-python/pycadf-1.1.0 | 10 +- metadata/md5-cache/dev-python/pysaml2-3.0.0 | 10 +- .../md5-cache/dev-python/python-editor-0.4 | 10 +- .../dev-python/python-memcached-1.57 | 10 +- .../dev-python/python-sqlparse-0.1.18 | 10 +- metadata/md5-cache/dev-python/reno-1.2.0 | 12 +- .../md5-cache/dev-python/repoze-lru-0.6-r1 | 10 +- metadata/md5-cache/dev-python/repoze-who-2.2 | 10 +- .../dev-python/restructuredtext-lint-0.12.2 | 10 +- metadata/md5-cache/dev-python/routes-2.2 | 10 +- .../sphinxcontrib-issuetracker-0.11-r1 | 12 +- .../dev-python/sqlalchemy-migrate-0.10.0 | 10 +- .../md5-cache/dev-python/stevedore-1.12.0 | 4 +- metadata/md5-cache/dev-ruby/cliver-0.3.2 | 10 +- metadata/md5-cache/dev-ruby/hiera-3.1.1 | 14 + .../dev-ruby/{jwt-1.5.2 => jwt-1.5.4} | 4 +- metadata/md5-cache/dev-ruby/open4-1.3.3 | 14 - metadata/md5-cache/dev-ruby/open4-1.3.4 | 10 +- metadata/md5-cache/dev-ruby/paint-1.0.0 | 14 - metadata/md5-cache/dev-util/bitcoin-tx-0.10.0 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-0.10.1 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-0.11.0 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-0.11.1 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-0.11.2 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-0.12.0 | 2 +- metadata/md5-cache/dev-util/bitcoin-tx-9999 | 2 +- .../md5-cache/dev-util/gdbus-codegen-2.48.0 | 15 + metadata/md5-cache/dev-util/gtk-doc-1.25 | 14 + metadata/md5-cache/dev-util/gtk-doc-am-1.25 | 13 + metadata/md5-cache/dev-util/meld-3.14.1 | 14 - .../md5-cache/dev-vcs/gitstats-0_pre131024 | 2 +- .../md5-cache/games-strategy/widelands-0.18 | 12 + .../md5-cache/mail-client/thunderbird-31.8.0 | 4 +- .../md5-cache/mail-client/thunderbird-38.5.0 | 4 +- .../md5-cache/mail-client/thunderbird-38.6.0 | 4 +- .../md5-cache/mail-client/thunderbird-38.7.0 | 4 +- .../md5-cache/mail-client/thunderbird-38.7.1 | 15 + metadata/md5-cache/media-fonts/unifont-8.0.01 | 4 +- metadata/md5-cache/media-gfx/valentina-9999 | 3 +- .../md5-cache/media-sound/drumstick-1.0.0 | 13 - .../md5-cache/media-sound/drumstick-1.0.1 | 13 - metadata/md5-cache/net-fs/samba-4.4.0 | 6 +- metadata/md5-cache/net-im/dianara-1.3.3 | 12 + .../net-libs/libbitcoinconsensus-0.10.0 | 2 +- .../net-libs/libbitcoinconsensus-0.10.1 | 2 +- .../net-libs/libbitcoinconsensus-0.11.0 | 2 +- .../net-libs/libbitcoinconsensus-0.11.1 | 2 +- .../net-libs/libbitcoinconsensus-0.11.2 | 2 +- .../net-libs/libbitcoinconsensus-0.12.0 | 2 +- .../net-libs/libbitcoinconsensus-9999 | 2 +- metadata/md5-cache/net-misc/curl-7.48.0 | 2 +- metadata/md5-cache/net-misc/i2pd-2.5.0-r3 | 2 +- .../net-misc/{i2pd-2.5.1-r1 => i2pd-2.5.1-r2} | 6 +- .../md5-cache/net-misc/pyhoca-gui-0.5.0.6 | 14 + .../{strongswan-5.3.4-r1 => strongswan-5.4.0} | 4 +- .../md5-cache/net-misc/x2goclient-4.0.5.1 | 13 + .../md5-cache/net-nntp/nzbget-17.0_pre1660 | 13 + .../net-p2p/airdcpp-webclient-0.16.5 | 14 - .../md5-cache/net-p2p/airdcpp-webclient-1.0.2 | 14 + metadata/md5-cache/net-p2p/bitcoin-cli-0.10.2 | 2 +- metadata/md5-cache/net-p2p/bitcoin-cli-0.11.0 | 2 +- metadata/md5-cache/net-p2p/bitcoin-cli-0.11.1 | 2 +- metadata/md5-cache/net-p2p/bitcoin-cli-0.11.2 | 2 +- metadata/md5-cache/net-p2p/bitcoin-cli-0.12.0 | 2 +- metadata/md5-cache/net-p2p/bitcoin-cli-9999 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-0.10.2 | 2 +- .../md5-cache/net-p2p/bitcoin-qt-0.10.2-r1 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-0.11.0 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-0.11.1 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-0.11.2 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-0.12.0 | 2 +- metadata/md5-cache/net-p2p/bitcoin-qt-9999 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.10.2 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.10.2-r1 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.11.0 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.11.1 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.11.2 | 2 +- metadata/md5-cache/net-p2p/bitcoind-0.12.0 | 4 +- metadata/md5-cache/net-p2p/bitcoind-9999 | 4 +- metadata/md5-cache/net-print/cups-9999 | 2 +- .../md5-cache/net-print/cups-filters-1.8.2-r1 | 2 +- .../sci-libs/{geos-3.5.0-r1 => geos-3.5.0-r2} | 2 +- metadata/md5-cache/sci-libs/io_lib-1.14.7 | 14 + metadata/md5-cache/sci-libs/libaec-0.3.2 | 4 +- metadata/md5-cache/sys-apps/duc-1.4.1 | 14 - metadata/md5-cache/sys-apps/duc-1.4.1-r1 | 14 + metadata/md5-cache/sys-apps/duc-9999 | 10 +- metadata/md5-cache/sys-apps/findutils-4.6.0 | 4 +- metadata/md5-cache/sys-apps/iproute2-4.4.0 | 4 +- ...exec-tools-2.0.9-r1 => kexec-tools-2.0.12} | 4 +- metadata/md5-cache/sys-apps/kexec-tools-2.0.8 | 14 - metadata/md5-cache/sys-apps/kexec-tools-2.0.9 | 14 - metadata/md5-cache/sys-apps/kexec-tools-9999 | 4 +- .../md5-cache/sys-apps/roccat-tools-3.4.0 | 14 - .../md5-cache/sys-apps/roccat-tools-3.5.0 | 14 - .../md5-cache/sys-apps/roccat-tools-3.5.0-r1 | 14 - ...{roccat-tools-3.6.1 => roccat-tools-3.9.0} | 6 +- .../md5-cache/sys-auth/keystone-2016.1.9999 | 12 + metadata/md5-cache/sys-auth/skey-1.1.5-r10 | 4 +- ...rdcpp-webui-0.16.2 => airdcpp-webui-1.0.3} | 4 +- .../www-client/chromium-49.0.2623.108 | 15 + .../www-client/chromium-50.0.2661.37 | 15 + metadata/md5-cache/www-client/firefox-38.7.0 | 4 +- metadata/md5-cache/www-client/firefox-38.7.1 | 4 +- metadata/md5-cache/www-client/firefox-45.0.1 | 4 +- ...3.87_p1 => google-chrome-49.0.2623.108_p1} | 2 +- metadata/md5-cache/www-client/seamonkey-2.38 | 4 +- metadata/md5-cache/www-client/seamonkey-2.39 | 4 +- metadata/md5-cache/www-client/seamonkey-2.40 | 4 +- ...=> chrome-binary-plugins-49.0.2623.108_p1} | 2 +- ...rivers-364.12 => nvidia-drivers-364.12-r1} | 2 +- metadata/md5-cache/x11-libs/motif-2.3.5 | 2 +- metadata/md5-cache/x11-misc/dmenu-4.5-r3 | 13 - metadata/md5-cache/x11-misc/dmenu-4.5-r4 | 13 - metadata/md5-cache/x11-misc/dmenu-4.6 | 4 +- metadata/md5-cache/x11-wm/lumina-0.8.8_p1 | 12 + metadata/md5-cache/x11-wm/lumina-9999 | 10 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-fs/samba/samba-4.4.0.ebuild | 4 +- net-im/dianara/Manifest | 1 + net-im/dianara/dianara-1.3.3.ebuild | 55 ++ net-misc/curl/curl-7.48.0.ebuild | 3 +- .../curl/files/curl-7.48.0-libressl.patch | 27 + ...i2pd-2.5.0-fix_installed_components.patch} | 0 ...i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch | 9 + .../i2pd-2.5.1-fix_installed_components.patch | 30 + net-misc/i2pd/files/i2pd-2.5.1.confd | 9 + net-misc/i2pd/files/i2pd-2.5.1.initd | 26 + ...{i2pd-2.4.0.service => i2pd-2.5.1.service} | 2 +- net-misc/i2pd/files/i2pd.conf | 4 - net-misc/i2pd/i2pd-2.5.0-r3.ebuild | 2 +- ...d-2.5.1-r1.ebuild => i2pd-2.5.1-r2.ebuild} | 22 +- net-misc/pyhoca-gui/Manifest | 1 + net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild | 35 + net-misc/strongswan/Manifest | 1 + ...fail-with-EINTR-if-an-unblocked-sign.patch | 218 ----- ....3.4-r1.ebuild => strongswan-5.4.0.ebuild} | 2 - net-misc/x2goclient/Manifest | 1 + net-misc/x2goclient/x2goclient-4.0.5.1.ebuild | 81 ++ net-nntp/nzbget/Manifest | 1 + ...zbget-17.0_pre1660-add-missing-macro.patch | 583 +++++++++++++ net-nntp/nzbget/metadata.xml | 1 + net-nntp/nzbget/nzbget-17.0_pre1660.ebuild | 126 +++ net-p2p/airdcpp-webclient/Manifest | 2 +- ....ebuild => airdcpp-webclient-1.0.2.ebuild} | 35 +- net-p2p/bitcoind/bitcoind-0.12.0.ebuild | 2 +- net-p2p/bitcoind/bitcoind-9999.ebuild | 2 +- .../cups-filters/cups-filters-1.8.2-r1.ebuild | 1 + ...s-filters-1.8.2-configure-PKG_CONFIG.patch | 107 +++ net-print/cups/cups-9999.ebuild | 2 +- profiles/base/package.use.mask | 4 + profiles/desc/input_devices.desc | 2 + profiles/license_groups | 4 +- profiles/package.mask | 22 + profiles/releases/13.0/package.mask | 6 +- profiles/updates/1Q-2016 | 1 + profiles/use.local.desc | 22 +- ...s-3.5.0-r1.ebuild => geos-3.5.0-r2.ebuild} | 50 +- sci-libs/io_lib/Manifest | 1 + sci-libs/io_lib/io_lib-1.14.7.ebuild | 36 + sci-libs/libaec/libaec-0.3.2.ebuild | 2 +- .../{duc-1.4.1.ebuild => duc-1.4.1-r1.ebuild} | 19 +- sys-apps/duc/duc-9999.ebuild | 19 +- sys-apps/findutils/findutils-4.6.0.ebuild | 2 +- sys-apps/iproute2/iproute2-4.4.0.ebuild | 2 +- sys-apps/kexec-tools/Manifest | 2 +- sys-apps/kexec-tools/files/kexec.conf-9999 | 18 - sys-apps/kexec-tools/files/kexec.init-2.0.12 | 175 ++++ sys-apps/kexec-tools/files/kexec.init-2.0.4 | 144 ---- sys-apps/kexec-tools/files/kexec.init-9999 | 165 ---- ....9-r1.ebuild => kexec-tools-2.0.12.ebuild} | 18 +- sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild | 75 -- sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild | 75 -- sys-apps/kexec-tools/kexec-tools-9999.ebuild | 23 +- sys-apps/roccat-tools/Manifest | 4 +- sys-apps/roccat-tools/metadata.xml | 2 - .../roccat-tools/roccat-tools-3.4.0.ebuild | 92 -- .../roccat-tools/roccat-tools-3.5.0-r1.ebuild | 101 --- .../roccat-tools/roccat-tools-3.5.0.ebuild | 92 -- ...3.6.1.ebuild => roccat-tools-3.9.0.ebuild} | 2 + sys-auth/keystone/keystone-2016.1.9999.ebuild | 146 ++++ sys-auth/skey/skey-1.1.5-r10.ebuild | 2 +- www-apps/airdcpp-webui/Manifest | 2 +- ...16.2.ebuild => airdcpp-webui-1.0.3.ebuild} | 0 www-client/chromium/Manifest | 2 + .../chromium/chromium-49.0.2623.108.ebuild | 698 +++++++++++++++ .../chromium/chromium-50.0.2661.37.ebuild | 695 +++++++++++++++ .../files/chromium-system-jinja-r8.patch | 47 + www-client/google-chrome/Manifest | 2 +- ... => google-chrome-49.0.2623.108_p1.ebuild} | 0 www-plugins/chrome-binary-plugins/Manifest | 2 +- ...me-binary-plugins-49.0.2623.108_p1.ebuild} | 0 .../files/nvidia-drivers-364.12-pax.patch | 398 +++++++++ x11-drivers/nvidia-drivers/metadata.xml | 5 +- ...ebuild => nvidia-drivers-364.12-r1.ebuild} | 7 +- x11-libs/motif/motif-2.3.5.ebuild | 3 + x11-misc/dmenu/Manifest | 1 - x11-misc/dmenu/dmenu-4.5-r3.ebuild | 59 -- x11-misc/dmenu/dmenu-4.5-r4.ebuild | 59 -- x11-misc/dmenu/dmenu-4.6.ebuild | 2 +- x11-misc/dmenu/files/dmenu-4.5-xft-2.patch | 410 --------- x11-misc/dmenu/files/dmenu-4.5-xft-3.patch | 412 --------- x11-misc/dmenu/metadata.xml | 3 - x11-wm/lumina/Manifest | 1 + x11-wm/lumina/lumina-0.8.8_p1.ebuild | 47 + x11-wm/lumina/lumina-9999.ebuild | 46 + x11-wm/lumina/metadata.xml | 28 + 463 files changed, 8691 insertions(+), 7065 deletions(-) delete mode 100644 app-admin/puppet-agent/puppet-agent-1.3.4.ebuild rename app-admin/puppet-agent/{puppet-agent-1.3.2.ebuild => puppet-agent-1.4.1.ebuild} (97%) rename app-admin/puppet/{puppet-4.4.0.ebuild => puppet-4.4.1.ebuild} (100%) create mode 100644 app-admin/puppetserver/puppetserver-2.3.1.ebuild create mode 100644 app-arch/innoextract/innoextract-1.6.ebuild create mode 100644 app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch create mode 100644 app-emulation/ganeti/ganeti-2.15.2-r1.ebuild create mode 100644 app-emulation/qemu-init-scripts/Manifest create mode 100644 app-emulation/qemu-init-scripts/metadata.xml create mode 100644 app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild delete mode 100644 app-emulation/qemu/qemu-2.5.0-r1.ebuild create mode 100644 app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild create mode 100644 app-i18n/fcitx-qt5/fcitx-qt5-9999.ebuild create mode 100644 app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch create mode 100644 app-i18n/fcitx/fcitx-4.2.9.1.ebuild create mode 100644 app-i18n/fcitx/fcitx-9999.ebuild create mode 100644 app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch create mode 100644 app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch create mode 100644 app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild create mode 100644 app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild create mode 100644 app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild create mode 100644 app-text/asciidoc/asciidoc-8.6.9-r3.ebuild delete mode 100644 dev-java/hoteqn/hoteqn-4.0.0.ebuild delete mode 100644 dev-java/jsr67/jsr67-1.3.ebuild create mode 100644 dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild create mode 100644 dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild create mode 100644 dev-lang/moarvm/moarvm-2016.03.ebuild create mode 100644 dev-lang/nqp/nqp-2016.03.ebuild delete mode 100644 dev-lang/php/php-5.5.31.ebuild delete mode 100644 dev-lang/php/php-5.5.32.ebuild delete mode 100644 dev-lang/php/php-5.6.17.ebuild delete mode 100644 dev-lang/php/php-5.6.18.ebuild create mode 100644 dev-lang/rakudo/rakudo-2016.03.ebuild create mode 100644 dev-libs/glib/glib-2.48.0.ebuild delete mode 100644 dev-libs/libbsd/libbsd-0.7.0.ebuild rename dev-libs/libgaminggear/{libgaminggear-0.10.1.ebuild => libgaminggear-0.11.2.ebuild} (100%) create mode 100644 dev-lisp/asdf/asdf-3.1.7.ebuild create mode 100644 dev-lisp/uiop/uiop-3.1.7.ebuild create mode 100644 dev-python/debtcollector/debtcollector-1.3.0.ebuild create mode 100644 dev-python/dogpile-cache/dogpile-cache-0.5.7.ebuild create mode 100644 dev-python/futurist/futurist-0.13.0.ebuild create mode 100644 dev-python/keystoneauth/Manifest create mode 100644 dev-python/keystoneauth/keystoneauth-2.3.0.ebuild create mode 100644 dev-python/keystoneauth/metadata.xml create mode 100644 dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild create mode 100644 dev-python/monotonic/monotonic-1.0.ebuild create mode 100644 dev-python/oslo-cache/Manifest create mode 100644 dev-python/oslo-cache/metadata.xml create mode 100644 dev-python/oslo-cache/oslo-cache-1.5.0.ebuild create mode 100644 dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild create mode 100644 dev-python/oslo-config/oslo-config-3.9.0.ebuild create mode 100644 dev-python/oslo-db/oslo-db-4.6.0.ebuild create mode 100644 dev-python/oslo-i18n/oslo-i18n-3.4.0.ebuild create mode 100644 dev-python/oslo-log/oslo-log-3.2.0.ebuild create mode 100644 dev-python/oslo-messaging/oslo-messaging-4.5.1.ebuild create mode 100644 dev-python/oslo-middleware/oslo-middleware-3.7.0.ebuild create mode 100644 dev-python/oslo-service/oslo-service-1.7.0.ebuild create mode 100644 dev-python/oslo-utils/oslo-utils-3.7.0.ebuild create mode 100644 dev-python/pika-pool/Manifest create mode 100644 dev-python/pika-pool/metadata.xml create mode 100644 dev-python/pika-pool/pika-pool-0.1.3.ebuild create mode 100644 dev-python/positional/Manifest create mode 100644 dev-python/positional/metadata.xml create mode 100644 dev-python/positional/positional-1.0.1.ebuild create mode 100644 dev-ruby/hiera/hiera-3.1.1.ebuild rename dev-ruby/jwt/{jwt-1.5.2.ebuild => jwt-1.5.4.ebuild} (79%) delete mode 100644 dev-ruby/open4/open4-1.3.3.ebuild delete mode 100644 dev-ruby/paint/paint-1.0.0.ebuild create mode 100644 dev-util/gdbus-codegen/gdbus-codegen-2.48.0.ebuild create mode 100644 dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild create mode 100644 dev-util/gtk-doc/gtk-doc-1.25.ebuild delete mode 100644 dev-util/meld/meld-3.14.1.ebuild create mode 100644 dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch create mode 100644 games-strategy/widelands/files/widelands-0.18-cxxflags.patch create mode 100644 games-strategy/widelands/widelands-0.18.ebuild delete mode 100644 licenses/LIBAEC create mode 100644 mail-client/thunderbird/thunderbird-38.7.1.ebuild delete mode 100644 media-sound/drumstick/drumstick-1.0.0.ebuild delete mode 100644 media-sound/drumstick/drumstick-1.0.1.ebuild rename metadata/md5-cache/app-admin/{puppet-4.4.0 => puppet-4.4.1} (99%) delete mode 100644 metadata/md5-cache/app-admin/puppet-agent-1.3.4 rename metadata/md5-cache/app-admin/{puppet-agent-1.3.2 => puppet-agent-1.4.1} (87%) create mode 100644 metadata/md5-cache/app-admin/puppetserver-2.3.1 create mode 100644 metadata/md5-cache/app-arch/innoextract-1.6 create mode 100644 metadata/md5-cache/app-emulation/ganeti-2.15.2-r1 delete mode 100644 metadata/md5-cache/app-emulation/qemu-2.5.0-r1 create mode 100644 metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0 create mode 100644 metadata/md5-cache/app-i18n/fcitx-4.2.9.1 create mode 100644 metadata/md5-cache/app-i18n/fcitx-9999 create mode 100644 metadata/md5-cache/app-i18n/fcitx-qt5-1.0.5 create mode 100644 metadata/md5-cache/app-i18n/fcitx-qt5-9999 create mode 100644 metadata/md5-cache/app-i18n/kcm-fcitx-0.4.9999 create mode 100644 metadata/md5-cache/app-i18n/kcm-fcitx-0.5.3 create mode 100644 metadata/md5-cache/app-i18n/kcm-fcitx-9999 create mode 100644 metadata/md5-cache/app-text/asciidoc-8.6.9-r3 delete mode 100644 metadata/md5-cache/dev-java/hoteqn-4.0.0 delete mode 100644 metadata/md5-cache/dev-java/jsr67-1.3 create mode 100644 metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r1 create mode 100644 metadata/md5-cache/dev-lang/ekopath-6.0.728_p20160324-r100 create mode 100644 metadata/md5-cache/dev-lang/moarvm-2016.03 create mode 100644 metadata/md5-cache/dev-lang/nqp-2016.03 delete mode 100644 metadata/md5-cache/dev-lang/php-5.5.31 delete mode 100644 metadata/md5-cache/dev-lang/php-5.5.32 delete mode 100644 metadata/md5-cache/dev-lang/php-5.6.17 delete mode 100644 metadata/md5-cache/dev-lang/php-5.6.18 create mode 100644 metadata/md5-cache/dev-lang/rakudo-2016.03 create mode 100644 metadata/md5-cache/dev-libs/glib-2.48.0 delete mode 100644 metadata/md5-cache/dev-libs/libbsd-0.7.0 rename metadata/md5-cache/dev-libs/{libgaminggear-0.10.1 => libgaminggear-0.11.2} (93%) create mode 100644 metadata/md5-cache/dev-lisp/asdf-3.1.7 create mode 100644 metadata/md5-cache/dev-lisp/uiop-3.1.7 create mode 100644 metadata/md5-cache/dev-python/debtcollector-1.3.0 create mode 100644 metadata/md5-cache/dev-python/dogpile-cache-0.5.7 create mode 100644 metadata/md5-cache/dev-python/futurist-0.13.0 create mode 100644 metadata/md5-cache/dev-python/keystoneauth-2.3.0 create mode 100644 metadata/md5-cache/dev-python/keystonemiddleware-4.3.0 create mode 100644 metadata/md5-cache/dev-python/monotonic-1.0 create mode 100644 metadata/md5-cache/dev-python/oslo-cache-1.5.0 create mode 100644 metadata/md5-cache/dev-python/oslo-concurrency-3.6.0 create mode 100644 metadata/md5-cache/dev-python/oslo-config-3.9.0 create mode 100644 metadata/md5-cache/dev-python/oslo-db-4.6.0 create mode 100644 metadata/md5-cache/dev-python/oslo-i18n-3.4.0 create mode 100644 metadata/md5-cache/dev-python/oslo-log-3.2.0 create mode 100644 metadata/md5-cache/dev-python/oslo-messaging-4.5.1 create mode 100644 metadata/md5-cache/dev-python/oslo-middleware-3.7.0 create mode 100644 metadata/md5-cache/dev-python/oslo-service-1.7.0 create mode 100644 metadata/md5-cache/dev-python/oslo-utils-3.7.0 create mode 100644 metadata/md5-cache/dev-python/pika-pool-0.1.3 create mode 100644 metadata/md5-cache/dev-python/positional-1.0.1 create mode 100644 metadata/md5-cache/dev-ruby/hiera-3.1.1 rename metadata/md5-cache/dev-ruby/{jwt-1.5.2 => jwt-1.5.4} (94%) delete mode 100644 metadata/md5-cache/dev-ruby/open4-1.3.3 delete mode 100644 metadata/md5-cache/dev-ruby/paint-1.0.0 create mode 100644 metadata/md5-cache/dev-util/gdbus-codegen-2.48.0 create mode 100644 metadata/md5-cache/dev-util/gtk-doc-1.25 create mode 100644 metadata/md5-cache/dev-util/gtk-doc-am-1.25 delete mode 100644 metadata/md5-cache/dev-util/meld-3.14.1 create mode 100644 metadata/md5-cache/games-strategy/widelands-0.18 create mode 100644 metadata/md5-cache/mail-client/thunderbird-38.7.1 delete mode 100644 metadata/md5-cache/media-sound/drumstick-1.0.0 delete mode 100644 metadata/md5-cache/media-sound/drumstick-1.0.1 create mode 100644 metadata/md5-cache/net-im/dianara-1.3.3 rename metadata/md5-cache/net-misc/{i2pd-2.5.1-r1 => i2pd-2.5.1-r2} (77%) create mode 100644 metadata/md5-cache/net-misc/pyhoca-gui-0.5.0.6 rename metadata/md5-cache/net-misc/{strongswan-5.3.4-r1 => strongswan-5.4.0} (95%) create mode 100644 metadata/md5-cache/net-misc/x2goclient-4.0.5.1 create mode 100644 metadata/md5-cache/net-nntp/nzbget-17.0_pre1660 delete mode 100644 metadata/md5-cache/net-p2p/airdcpp-webclient-0.16.5 create mode 100644 metadata/md5-cache/net-p2p/airdcpp-webclient-1.0.2 rename metadata/md5-cache/sci-libs/{geos-3.5.0-r1 => geos-3.5.0-r2} (98%) create mode 100644 metadata/md5-cache/sci-libs/io_lib-1.14.7 delete mode 100644 metadata/md5-cache/sys-apps/duc-1.4.1 create mode 100644 metadata/md5-cache/sys-apps/duc-1.4.1-r1 rename metadata/md5-cache/sys-apps/{kexec-tools-2.0.9-r1 => kexec-tools-2.0.12} (94%) delete mode 100644 metadata/md5-cache/sys-apps/kexec-tools-2.0.8 delete mode 100644 metadata/md5-cache/sys-apps/kexec-tools-2.0.9 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-3.4.0 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-3.5.0 delete mode 100644 metadata/md5-cache/sys-apps/roccat-tools-3.5.0-r1 rename metadata/md5-cache/sys-apps/{roccat-tools-3.6.1 => roccat-tools-3.9.0} (67%) create mode 100644 metadata/md5-cache/sys-auth/keystone-2016.1.9999 rename metadata/md5-cache/www-apps/{airdcpp-webui-0.16.2 => airdcpp-webui-1.0.3} (83%) create mode 100644 metadata/md5-cache/www-client/chromium-49.0.2623.108 create mode 100644 metadata/md5-cache/www-client/chromium-50.0.2661.37 rename metadata/md5-cache/www-client/{google-chrome-49.0.2623.87_p1 => google-chrome-49.0.2623.108_p1} (97%) rename metadata/md5-cache/www-plugins/{chrome-binary-plugins-49.0.2623.87_p1 => chrome-binary-plugins-49.0.2623.108_p1} (89%) rename metadata/md5-cache/x11-drivers/{nvidia-drivers-364.12 => nvidia-drivers-364.12-r1} (98%) delete mode 100644 metadata/md5-cache/x11-misc/dmenu-4.5-r3 delete mode 100644 metadata/md5-cache/x11-misc/dmenu-4.5-r4 create mode 100644 metadata/md5-cache/x11-wm/lumina-0.8.8_p1 create mode 100644 metadata/md5-cache/x11-wm/lumina-9999 create mode 100644 net-im/dianara/dianara-1.3.3.ebuild create mode 100644 net-misc/curl/files/curl-7.48.0-libressl.patch rename net-misc/i2pd/files/{i2pd-2.4.0-fix_installed_components.patch => i2pd-2.5.0-fix_installed_components.patch} (100%) create mode 100644 net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch create mode 100644 net-misc/i2pd/files/i2pd-2.5.1-fix_installed_components.patch create mode 100644 net-misc/i2pd/files/i2pd-2.5.1.confd create mode 100644 net-misc/i2pd/files/i2pd-2.5.1.initd rename net-misc/i2pd/files/{i2pd-2.4.0.service => i2pd-2.5.1.service} (68%) delete mode 100644 net-misc/i2pd/files/i2pd.conf rename net-misc/i2pd/{i2pd-2.5.1-r1.ebuild => i2pd-2.5.1-r2.ebuild} (80%) create mode 100644 net-misc/pyhoca-gui/pyhoca-gui-0.5.0.6.ebuild delete mode 100644 net-misc/strongswan/files/0001-sigwaitinfo-may-fail-with-EINTR-if-an-unblocked-sign.patch rename net-misc/strongswan/{strongswan-5.3.4-r1.ebuild => strongswan-5.4.0.ebuild} (99%) create mode 100644 net-misc/x2goclient/x2goclient-4.0.5.1.ebuild create mode 100644 net-nntp/nzbget/files/nzbget-17.0_pre1660-add-missing-macro.patch create mode 100644 net-nntp/nzbget/nzbget-17.0_pre1660.ebuild rename net-p2p/airdcpp-webclient/{airdcpp-webclient-0.16.5.ebuild => airdcpp-webclient-1.0.2.ebuild} (65%) create mode 100644 net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch rename sci-libs/geos/{geos-3.5.0-r1.ebuild => geos-3.5.0-r2.ebuild} (66%) create mode 100644 sci-libs/io_lib/io_lib-1.14.7.ebuild rename sys-apps/duc/{duc-1.4.1.ebuild => duc-1.4.1-r1.ebuild} (85%) delete mode 100644 sys-apps/kexec-tools/files/kexec.conf-9999 create mode 100755 sys-apps/kexec-tools/files/kexec.init-2.0.12 delete mode 100644 sys-apps/kexec-tools/files/kexec.init-2.0.4 delete mode 100644 sys-apps/kexec-tools/files/kexec.init-9999 rename sys-apps/kexec-tools/{kexec-tools-2.0.9-r1.ebuild => kexec-tools-2.0.12.ebuild} (79%) delete mode 100644 sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild delete mode 100644 sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-3.4.0.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-3.5.0-r1.ebuild delete mode 100644 sys-apps/roccat-tools/roccat-tools-3.5.0.ebuild rename sys-apps/roccat-tools/{roccat-tools-3.6.1.ebuild => roccat-tools-3.9.0.ebuild} (97%) create mode 100644 sys-auth/keystone/keystone-2016.1.9999.ebuild rename www-apps/airdcpp-webui/{airdcpp-webui-0.16.2.ebuild => airdcpp-webui-1.0.3.ebuild} (100%) create mode 100644 www-client/chromium/chromium-49.0.2623.108.ebuild create mode 100644 www-client/chromium/chromium-50.0.2661.37.ebuild create mode 100644 www-client/chromium/files/chromium-system-jinja-r8.patch rename www-client/google-chrome/{google-chrome-49.0.2623.87_p1.ebuild => google-chrome-49.0.2623.108_p1.ebuild} (100%) rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-49.0.2623.87_p1.ebuild => chrome-binary-plugins-49.0.2623.108_p1.ebuild} (100%) create mode 100644 x11-drivers/nvidia-drivers/files/nvidia-drivers-364.12-pax.patch rename x11-drivers/nvidia-drivers/{nvidia-drivers-364.12.ebuild => nvidia-drivers-364.12-r1.ebuild} (98%) delete mode 100644 x11-misc/dmenu/dmenu-4.5-r3.ebuild delete mode 100644 x11-misc/dmenu/dmenu-4.5-r4.ebuild delete mode 100644 x11-misc/dmenu/files/dmenu-4.5-xft-2.patch delete mode 100644 x11-misc/dmenu/files/dmenu-4.5-xft-3.patch create mode 100644 x11-wm/lumina/Manifest create mode 100644 x11-wm/lumina/lumina-0.8.8_p1.ebuild create mode 100644 x11-wm/lumina/lumina-9999.ebuild create mode 100644 x11-wm/lumina/metadata.xml diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 229bf5cc84d0..b3f023abb717 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,8 +1,6 @@ -DIST puppet-agent_1.3.2-1wheezy_amd64.deb 18316012 SHA256 9d36e5d2902e8ffa9cb19a51c0df26bfe9e15fa28daaff8fc7724185df460ae6 SHA512 d63a52a9e5cf6a0cb1438715ed3f1c8edddaf4c21335aac80771b283c577151519bfbf73028c3d6af702d03372220964b052c4b45190f838a0a7e5ade247923a WHIRLPOOL 789b9316dc0edf701da9ef73c6034501b261e71db86c29db2d4f737719a3d37a53ef71f5eb43d8b7c5d2ff465d44ab59f4f744a39ed20b6a7600624e5ef4b993 -DIST puppet-agent_1.3.2-1wheezy_i386.deb 18248404 SHA256 7e6570f592a712c342c192643cacfb74ca103efea26191cb8b8baa0f359b0fca SHA512 66a092cd7579af5aff89e3c45897c2f3d036fc2fb6e35be3492bdfb273d33c356e4d5ff53362d303eead6b3c53aeef9e82da1371b3555c94f67f11a65f0f5b6d WHIRLPOOL 8cf9f5ddad6815511f2c09d76e66d456aa15c68af0485dfda86a081fa3f6ecbdeeaf4815838c2f6113a65890532164bbba1fb12fb9607c5d1fa8c95d4df14217 -DIST puppet-agent_1.3.4-1wheezy_amd64.deb 20088688 SHA256 d98026bc27d680c6d674889ddf76aab3da0f9122be3aaccfd4794c5193bf58af SHA512 1a11a7df1545c405f0cbcf6fa2b12a12d6f2091068706cc2be614b2aac4c2d1b8f92f8d6bb9721b5c9b7a30f27d087b585c4d9e41e9c966f526977bff1e39a91 WHIRLPOOL 619a00bdd175ad518a00c04410a09ed9502d768878f64810d434ef45bd41b2f0d695ea9fddb01a27b31989a90e47554b6a7577842f2762872601425b6801809f -DIST puppet-agent_1.3.4-1wheezy_i386.deb 19864590 SHA256 7eaf2264fc0ce048fd1fc604f384df8d601e8571e9f92fb1432bc2be73a24874 SHA512 2640a6b0daaa2a9c913a9411a7eb56914bb127610d2bf56100f9029dc94727f3c42df7c858924b22fc5ad03a9151d98a136c0c6d369501f3e38a9c179333d2ff WHIRLPOOL 88dbebd7c5217d7efc85c877bc1977c574e17ca544a59424b805cebcad637ed5762ebe37c13d82dc01cebcd1ef1259383143adff7a748c82241124b2007d5513 DIST puppet-agent_1.3.6-1wheezy_amd64.deb 20097384 SHA256 47f04c848eff486660ba5ab4cc6c9340193ae0f9d703e0aba6094ccc7d15ec4f SHA512 a079f66bd0ff0b9535e037712ff4306ec16cc5303e1a19016a7ebb2d19f39eea1d91d758996d37e6d848cd0c1d8f047bcfad64550647de99de248071626a0845 WHIRLPOOL 42013e4abf062548b0349db3ebd628bfd887877462b3f24dbd47058bda59828c0f13f2f3bb8a7aace5d835faf3be0fbbaeb097c55c665aa71eec6d78881d71b7 DIST puppet-agent_1.3.6-1wheezy_i386.deb 19873296 SHA256 aaf16cffcf33070eda0979025b72c87d1528bf017f65dadc333defe623190065 SHA512 4d6390c6f9fd3464029ae8bde02e5f7536de7ecb701bc50a7a4a24f50102fcd542448729259148bb62343ed44e4e5b41ced670aed7a8aa3897fa2f7729fff9db WHIRLPOOL 17f7231cd5c546aa8a104aadec07457abebb71cccc1f8f718e7e0e5544b46502979b3079e1d3931f58d3d2d4232eb2ac82e5ee2c49c0ed54e280ef515575b45f DIST puppet-agent_1.4.0-1wheezy_amd64.deb 21367140 SHA256 322f3db0e1c2cebe675f6162411eecc9aec4e6a9d20daba4416ad914a7d562f0 SHA512 9d40ca518dfe5086f9fb738c971fed06b6f634f2069a0a10ae4ea4c1595db6c7122323dcbe1f871faed114acd1a3405146fb834fce964312391159b6e66edae5 WHIRLPOOL cf5f1649083e3224cffa5c1b16164e8cdb2a7fdc4756b97e12dfd6857e74e5923e04282d885ac963ef4fc386843e1014c489346836798eec1db5ed70d187a15e DIST puppet-agent_1.4.0-1wheezy_i386.deb 21107662 SHA256 88adf39e5fd7dba87f497c348797207df1f3192228d8601de9cbd155d481c31f SHA512 6651bb55b7ab4db5ce738dfa8ff555d385c7ea5c3806e5e3a961afaf58fc8923e44264bbd33b920871a84ebaa8b7003374a269467fe13454f7f498c18ba3afec WHIRLPOOL bffdcf7cffc6bf6dcce925728ac032c2fd7e2e19641eef200b60b5ec3fd1e0b87b44a6fd43c001cec0b69d96f050243252a0a954240568344ddcdb481010a700 +DIST puppet-agent_1.4.1-1wheezy_amd64.deb 21371032 SHA256 bc73ca0bf9bf753f70c261f0884a19c94cf0d0f337d370af9e2424f563eed7f9 SHA512 5c99cbc1637992630152d8d5f9922ee38e78147cca04ef030ff0232bf729e5dddd607cc0f318a09e52bfb29d991ff7f111b564d8e173240cc1b0f039f34ad69b WHIRLPOOL c41bfad01fef8329b3ed599c1f5bc98b6e306bb7d0c2cd4ad85a2d3ddb97797828d794c3b0eeaab6650a80c2ba07b644e29ea914c494711be31abf8582e9f13f +DIST puppet-agent_1.4.1-1wheezy_i386.deb 21109088 SHA256 a6ef8820dc6a96522da30bc9cac992a61e87d8c29a3908849455d8eb0ffeb725 SHA512 f9a62e8d71af1a466cc3ad2fcece79d300251dd936d97e2360580452de9f964b18316643e488b1dbe3ebd610cb58a6f19e5f70534a1cb42a016cc5719cd7b016 WHIRLPOOL 02d45b9260f71eeb94d7a7aa2da0a2491db6ab0d31bfc8afe37b5086d87503a090b850965ab2a339e7ac58c24aa277b985bec19b7d728e24ac7fe336fa5512cd diff --git a/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild deleted file mode 100644 index 2fb3b341c4cb..000000000000 --- a/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/" -SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy" -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - sys-apps/dmidecode - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -QA_PREBUILT=" - /opt/puppetlabs/puppet - /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/engines/* - /opt/puppetlabs/puppet/lib/virt-what/* - /opt/puppetlabs/puppet/lib/* - /opt/puppetlabs/puppet/bin/*" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit "${FILESDIR}/puppet.service" - systemd_dounit "${FILESDIR}/mcollective.service" - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym /opt/puppetlabs/bin/facter /usr/bin/facter - dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym /opt/puppetlabs/bin/mco /usr/bin/mco - dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.4.1.ebuild similarity index 97% rename from app-admin/puppet-agent/puppet-agent-1.3.2.ebuild rename to app-admin/puppet-agent/puppet-agent-1.4.1.ebuild index 2fb3b341c4cb..b449a7ad7524 100644 --- a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild +++ b/app-admin/puppet-agent/puppet-agent-1.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="puppetdb selinux" RESTRICT="strip" diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index e1421361cd62..a87fa8a294ed 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -9,4 +9,4 @@ DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf05423384 DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8 DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd DIST puppet-4.2.2.tar.gz 2550591 SHA256 2d34cda2c65c885ba16e6644edd7733d55e6a0e1011a1f0f7fe80b411affc348 SHA512 63fdbce7839fe1638c22129d22bf2aeef29838adceb6c53aaaf54acc7c9d2957ed559e3625a13dfa1f35b556791de0232868f5ecdc439be95b0b64bea097d217 WHIRLPOOL e2f579efbfc3fbab35ee3a23f40a396b0326484c935eaacead503848abc8406fe705701a2ab7eaf28e070feedef7ac4467d4bbf3412f5999091c809c88550c4c -DIST puppet-4.4.0.tar.gz 2672781 SHA256 489931ec65273764ab506a1cbd4c3189997098a9c9c4791bf019e81c572ca5c8 SHA512 cf9309db57ea06689eb9233624479e87249ef8cd9736a6426efd78227916bd7bd741bd019bab29694f660d7f0b31c1c8d69d7f9307e63d5df2bad6e3c2c19f47 WHIRLPOOL 49fddc4acfa284fbfc7a1d5b38864fc86614f599955033f638e78bb3a7abe11c6363e8f6f1129267e16074cd151ec7b632d75c9f7237615530c0c58b6a3282fe +DIST puppet-4.4.1.tar.gz 2675495 SHA256 a8b15fc035acd56711fdc6160cfbcae455f9f2708ed49ee8c937d93aa7d1c291 SHA512 d9ba703dc0544c5feddbd6c8f28eddba330cc1906e010cf3fc703541ed2d8595262dac56dbdd3ade49d652e3f55942115494928dc40bfe07df4d1b558577787c WHIRLPOOL 11fb2df07ac621cc4a28bcc83e89cd815e609467a0e7d86e15220963b3c907ae1ba772ff313a8ec7a578c0a7299b95625f311d3cb0ef6936e3fcde9bebd28f79 diff --git a/app-admin/puppet/puppet-4.4.0.ebuild b/app-admin/puppet/puppet-4.4.1.ebuild similarity index 100% rename from app-admin/puppet/puppet-4.4.0.ebuild rename to app-admin/puppet/puppet-4.4.1.ebuild diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index b67b37950974..423abbe97eb4 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,2 +1,3 @@ DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c DIST puppetserver-2.3.0.tar.gz 33655096 SHA256 b8bb77ae4684a57a00b8fd41782034718e3d53e09fe3bb6470b4aef2e3da15a4 SHA512 364d9af1eb138db814b45310f9c0bc67976a0a1a3d1d36ddf6cbb547ab85088e5efc0149dfbb1cd662966b61aef9d95709d4b9c7ffe615ede8b7a8ff35b0deff WHIRLPOOL 77c4a245bcb8125b8c8d4e50994c3ff05233a6337a98f60e7d0d8fbe1e0ea4635fffca8de755bbe9c10a5c3f4d6c41b77eaf10d967fd6b82209907ff6464ae85 +DIST puppetserver-2.3.1.tar.gz 33667638 SHA256 25e0d27339c2e8313cb083503e5790e4f7f1c5c3b29a67b73a35a3aca2f513d9 SHA512 584d41864ec588d46aee81f43d0f6aeee50456d8cb789624d0ba1e000d7b42dec2d14373a93cb0230d63bc0758f0150591ea4754794b18d14d1ec25b1d172722 WHIRLPOOL 8c82fa01cd352325837eacd9952a2b3e299492da2034f5607cf269073df09f1e999ce219358f5c462328ec33d9378704ad8ac91cd92fa20d680be6e327a13cda diff --git a/app-admin/puppetserver/puppetserver-2.3.1.ebuild b/app-admin/puppetserver/puppetserver-2.3.1.ebuild new file mode 100644 index 000000000000..ec9a5316151d --- /dev/null +++ b/app-admin/puppetserver/puppetserver-2.3.1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib systemd user + +DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents." +HOMEPAGE="http://docs.puppetlabs.com/puppetserver/" +SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="puppetdb" +# will need the same keywords as puppet +KEYWORDS="~amd64 ~x86" + +RDEPEND+=" + >=virtual/jdk-1.7.0 + app-admin/puppet-agent[puppetdb?]" +DEPEND+="" + +pkg_setup() { + enewgroup puppet + enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet" +} + +src_prepare() { + sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die + sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die + sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' install.sh || die + sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die + sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die + sed -i 's/var\/run/run/g' install.sh || die +} + +src_compile() { + einfo "not compiling" +} + +src_install() { + insinto /opt/puppetlabs/server/apps/puppetserver + insopts -m0774 + doins ext/ezbake-functions.sh + insopts -m0644 + doins ext/ezbake.manifest + doins puppet-server-release.jar + insinto /etc/puppetlabs/puppetserver + doins ext/config/logback.xml + doins ext/config/bootstrap.cfg + doins ext/config/request-logging.xml + insinto /etc/puppetlabs/puppetserver/conf.d + doins ext/config/conf.d/puppetserver.conf + doins ext/config/conf.d/auth.conf + doins ext/config/conf.d/global.conf + doins ext/config/conf.d/web-routes.conf + doins ext/config/conf.d/webserver.conf + insopts -m0755 + insinto /opt/puppetlabs/server/apps/puppetserver/scripts + doins install.sh + insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps + doins ext/cli/irb + doins ext/cli/foreground + doins ext/cli/gem + doins ext/cli/ruby + insinto /opt/puppetlabs/server/apps/puppetserver/bin + doins ext/bin/puppetserver + insopts -m0644 + dodir /opt/puppetlabs/server/bin + dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver + dodir /opt/puppetlabs/bin + dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver + dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver + # other sys stuff + dodir /etc/puppetlabs/code + # needed for systemd + dodir /var/log/puppetlabs/puppetserver + dodir /etc/puppetlabs/puppet/ssl + fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl + fperms -R 771 /etc/puppetlabs/puppet/ssl + # init type tasks + newconfd ext/default puppetserver + newinitd "${FILESDIR}/puppetserver.initd" puppetserver + # systemd type things + insinto /etc/systemd/system/puppetserver.service.d/ + newins ext/default gentoo.conf + systemd_dounit ext/redhat/puppetserver.service + # misc + insinto /etc/logrotate.d + newins ext/puppetserver.logrotate.conf puppetserver + # cleanup + dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems + fowners -R puppet:puppet /opt/puppetlabs/server/data + fperms -R 775 /opt/puppetlabs/server/data/puppetserver + fperms -R 700 /var/log/puppetlabs/puppetserver +} + +pkg_postinst() { + elog "to install you may want to run the following:" + elog + elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver" + elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver" + elog "puppet config set --section master rundir /run/puppetlabs/puppetserver" + elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid" + elog "puppet config set --section master codedir /etc/puppetlabs/code" +} diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest index 943b5e9eb7c8..84247107db2e 100644 --- a/app-arch/innoextract/Manifest +++ b/app-arch/innoextract/Manifest @@ -1,2 +1,3 @@ DIST innoextract-1.4.tar.gz 151230 SHA256 5a494b5ae1e41043574096761d31695ed8b1d39dfe64895306d0d92623901cc9 SHA512 60700ef05ff50e3409b92571ebfc7342c0eadc8add5d1262f7e7740e1a14cfd186a8a9ac0ecab85f01ae50f21edb48f49ba9428369131f7cd46c4b07214838ea WHIRLPOOL 26b38b5c8fbc5c1f79c3d2b3f9cabbe439140ee174d31926ee6c1507815417dbab02632f2aaaf8681c2755ba6907f0a67ef91f2672deab9b2bdef16e3bd323fa DIST innoextract-1.5.tar.gz 179582 SHA256 f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf SHA512 759c319c1f0737b9120ed4613bcab4bebcbb28749d9bbfa46ccb7b4f7640352b4ef01a03ed142c61f67188a83635d4e03e7b0708b913e1f47c09e5189bb56dd6 WHIRLPOOL d9601659b50836b69cdb74f287a4c8abfd489f47da619d8c95b6613b01f9ad85c53efa34b8fcdd1c3fe975325d351e1ea843dc3ce4b745ca8c383b6ff44b6489 +DIST innoextract-1.6.tar.gz 183380 SHA256 66463f145fffd4d5883c6b3e2f7b2c2837d6f07095810114e514233a88c1033e SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62 WHIRLPOOL 5cf9a732d2754a09475576d7cc4c40dcf9406425afba02247f074f66719c4b79953869eaa206e9c082ac8476e9c7874acb208a082189e669cf38943ae233f8f5 diff --git a/app-arch/innoextract/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild new file mode 100644 index 000000000000..1cab8b4a9e0b --- /dev/null +++ b/app-arch/innoextract/innoextract-1.6.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="A tool to unpack installers created by Inno Setup" +HOMEPAGE="http://constexpr.org/innoextract/" +SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug +iconv +lzma" + +RDEPEND=" + dev-libs/boost:= + iconv? ( virtual/libiconv ) + lzma? ( app-arch/xz-utils )" +DEPEND="${RDEPEND}" + +DOCS=( README.md CHANGELOG ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_use lzma LZMA) + $(cmake-utils_use debug DEBUG) + -DSET_OPTIMIZATION_FLAGS=OFF + -DSTRICT_USE=ON + -DWITH_CONV=$(usex iconv iconv builtin) + ) + + cmake-utils_src_configure +} diff --git a/app-arch/unrar/unrar-5.3.11.ebuild b/app-arch/unrar/unrar-5.3.11.ebuild index 0165d18a72f3..c3f2ff65a235 100644 --- a/app-arch/unrar/unrar-5.3.11.ebuild +++ b/app-arch/unrar/unrar-5.3.11.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz" LICENSE="unRAR" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" diff --git a/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch b/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch new file mode 100644 index 000000000000..22413e3e2ea5 --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15-noded-must-run-as-root.patch @@ -0,0 +1,50 @@ +diff --git a/configure.ac b/configure.ac +index 9b5d06f..d099bd2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -343,8 +343,8 @@ AC_ARG_WITH([user-prefix], + user_wconfd="${withval}masterd"; + user_kvmd="$user_default"; + user_luxid="${withval}masterd"; +- user_noded="$user_default"; +- user_mond="$user_default"], ++ user_noded="root"; ++ user_mond="root"], + [user_masterd="$user_default"; + user_metad="$user_default"; + user_rapi="$user_default"; +@@ -352,8 +352,8 @@ AC_ARG_WITH([user-prefix], + user_wconfd="$user_default"; + user_kvmd="$user_default"; + user_luxid="$user_default"; +- user_noded="$user_default"; +- user_mond="$user_default"]) ++ user_noded="root"; ++ user_mond="root"]) + AC_SUBST(MASTERD_USER, $user_masterd) + AC_SUBST(METAD_USER, $user_metad) + AC_SUBST(RAPI_USER, $user_rapi) +@@ -379,9 +379,9 @@ AC_ARG_WITH([group-prefix], + group_luxid="${withval}luxid"; + group_masterd="${withval}masterd"; + group_metad="$group_default"; +- group_noded="$group_default"; ++ group_noded="root"; + group_daemons="${withval}daemons"; +- group_mond="$group_default"], ++ group_mond="root"], + [group_rapi="$group_default"; + group_admin="$group_default"; + group_confd="$group_default"; +@@ -390,9 +390,9 @@ AC_ARG_WITH([group-prefix], + group_luxid="$group_default"; + group_masterd="$group_default"; + group_metad="$group_default"; +- group_noded="$group_default"; ++ group_noded="root"; + group_daemons="$group_default"; +- group_mond="$group_default"]) ++ group_mond="root"]) + AC_SUBST(RAPI_GROUP, $group_rapi) + AC_SUBST(ADMIN_GROUP, $group_admin) + AC_SUBST(CONFD_GROUP, $group_confd) diff --git a/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild new file mode 100644 index 000000000000..b220af79bc45 --- /dev/null +++ b/app-emulation/ganeti/ganeti-2.15.2-r1.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=(python2_7) +PYTHON_REQ_USE="ipv6(+)?" + +inherit eutils user autotools bash-completion-r1 python-single-r1 versionator + +MY_PV="${PV/_rc/~rc}" +MY_PV="${MY_PV/_beta/~beta}" +MY_P="${PN}-${MY_PV}" +SERIES="$(get_version_component_range 1-2)" + +if [[ ${PV} =~ [9]{4,} ]] ; then + EGIT_REPO_URI="git://git.ganeti.org/ganeti.git" + inherit git-2 + KEYWORDS="" + GIT_DEPEND="dev-python/docutils + dev-python/sphinx[${PYTHON_USEDEP}] + media-gfx/graphviz + media-fonts/urw-fonts" +else + SRC_URI="http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Ganeti is a virtual server management software tool" +HOMEPAGE="http://www.ganeti.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen" +REQUIRED_USE="|| ( kvm xen lxc ) test? ( ipv6 ) ${PYTHON_REQUIRED_USE}" + +USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" +GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" + +DOC_DEPEND="dev-python/sphinx[${PYTHON_USEDEP}] + media-fonts/urw-fonts + media-gfx/graphviz" + +DEPEND=" + dev-libs/openssl:0 + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/ipaddr[${PYTHON_USEDEP}] + dev-python/bitarray[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + net-analyzer/arping + net-analyzer/fping + net-misc/bridge-utils + net-misc/curl[ssl] + net-misc/openssh + net-misc/socat + sys-apps/iproute2 + sys-fs/lvm2 + >=sys-apps/baselayout-2.0 + dev-lang/ghc + dev-haskell/cabal:0= + dev-haskell/cabal-install:0= + >=dev-haskell/mtl-2.1.1:0= + >=dev-haskell/old-time-1.1.0.0:0= + >=dev-haskell/random-1.0.1.1:0= + haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) + >=dev-haskell/transformers-0.3.0.0:0= + + >=dev-haskell/attoparsec-0.10.1.1:0= + =dev-haskell/base64-bytestring-1.0.0.1:0= + =dev-haskell/crypto-4.2.4:0= + =dev-haskell/curl-1.3.7:0= + =dev-haskell/hinotify-0.3.2:0= + =dev-haskell/hslogger-1.1.4:0= + =dev-haskell/json-0.5:0= + =dev-haskell/lens-3.10:0= + =dev-haskell/lifted-base-0.2.0.3:0= + =dev-haskell/monad-control-0.3.1.3:0= + =dev-haskell/network-2.3.0.13:0= + =dev-haskell/parallel-3.2.0.2:3= + =dev-haskell/temporary-1.1.2.3:0= + =dev-haskell/regex-pcre-0.94.2:0= + =dev-haskell/transformers-base-0.4.1:0= + =dev-haskell/utf8-string-0.3.7:0= + =dev-haskell/zlib-0.5.3.3:0= + =dev-haskell/psqueue-1.1:0= + =dev-haskell/snap-core-0.8.1:0= + =dev-haskell/snap-server-0.8.1:0= + =dev-haskell/case-insensitive-0.4.0.1 + + dev-haskell/vector:0= + =app-emulation/xen-3.0 ) + kvm? ( + dev-python/psutil + app-emulation/qemu + ) + lxc? ( app-emulation/lxc ) + drbd? ( + || ( + "${testfile}" + done + + # take the sledgehammer approach to bug #526270 + grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' + + [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh + rm autotools/missing + eautoreconf +} + +src_configure () { + # this is kind of a hack to work around the removal of the qemu-kvm wrapper + local kvm_arch + + if use amd64; then + kvm_arch=x86_64 + elif use x86; then + kvm_arch=i386 + elif use kvm; then + die "Could not determine qemu system to use for kvm" + fi + + econf --localstatedir=/var \ + --sharedstatedir=/var \ + --disable-symlinks \ + --docdir=/usr/share/doc/${P} \ + --with-ssh-initscript=/etc/init.d/sshd \ + --with-export-dir=/var/lib/ganeti-storage/export \ + --with-os-search-path=/usr/share/${PN}/os \ + $(use_enable test haskell-tests) \ + $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ + $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ + $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ + $(use_enable syslog) \ + $(use_enable monitoring) \ + $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ + $(usex haskell-daemons "--enable-confd=haskell" '' '' '') +} + +src_install () { + emake V=1 DESTDIR="${D}" install || die "emake install failed" + + newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} + newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} + + if use kvm; then + newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff + newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff + fi + + # ganeti installs it's own docs in a generic location + rm -rf "${D}"/{usr/share/doc/${PN},run} + + sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion + newbashcomp doc/examples/bash_completion gnt-instance + bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ + h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ + gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} + + dodoc INSTALL UPGRADE NEWS README doc/*.rst + dohtml -r doc/html/* doc/css/*.css + + docinto examples + dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf + + docinto examples/hooks + dodoc doc/examples/hooks/{ipsec,ethers} + + insinto /etc/cron.d + newins doc/examples/ganeti.cron ${PN} + + insinto /etc/logrotate.d + newins doc/examples/ganeti.logrotate ${PN} + + # need to dodir rather than keepdir here (bug #552482) + dodir /var/lib/${PN} + + keepdir /var/log/${PN}/ + keepdir /usr/share/${PN}/${SERIES}/os/ + keepdir /var/lib/ganeti-storage/{export,file,shared}/ + + dosym ${SERIES} "/usr/share/${PN}/default" + dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" + + python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} +} + +pkg_postinst() { + if use multiple-users; then + elog "You have enable multiple user support, the users for this must" + elog "be created. You can use the provided tool for this, which is" + elog "located at:" + elog " /usr/$(get_libdir)/${PN}/tools/users-setup" + fi +} + +src_test () { + PATH="${S}/scripts:${S}/src:${PATH}" \ + TMPDIR="/tmp" \ + GANETI_MASTER="$(hostname -f)" \ + emake check || die "emake check failed" +} diff --git a/app-emulation/qemu-init-scripts/Manifest b/app-emulation/qemu-init-scripts/Manifest new file mode 100644 index 000000000000..99cbf936c83e --- /dev/null +++ b/app-emulation/qemu-init-scripts/Manifest @@ -0,0 +1 @@ +DIST qemu-init-scripts-0.3.0.tar.xz 4584 SHA256 c2deb393bac7690b6ea7118ee21f414c1a115c7e9b932ebd3282969bedaa4447 SHA512 49427572ce0636400ad3e389ed143fa9b1d637a7a89649cd5e265e409d3d745babe28f6af8cac3d9a249a8d5cc6554b321c0613f35824d604dcd814a44033c51 WHIRLPOOL 9752dab9172f1b26cdad6e5d1e29b5272878ce8c357fd1cba182afa98dd9c4d746ac57def8fac24a6ff9bb5c53ff3b7fe81495133bd6381a835d29659a6b68b8 diff --git a/app-emulation/qemu-init-scripts/metadata.xml b/app-emulation/qemu-init-scripts/metadata.xml new file mode 100644 index 000000000000..e5001f234976 --- /dev/null +++ b/app-emulation/qemu-init-scripts/metadata.xml @@ -0,0 +1,12 @@ + + + + + dolsen@gentoo.org + Brian Dolbec + + + rafaelmartins@gentoo.org + Rafael Martins + + diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild new file mode 100644 index 000000000000..6e07fc73e79d --- /dev/null +++ b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Kvm and qemu init scripts" +HOMEPAGE="https://gitweb.gentoo.org/proj/kvm-tools.git/" + +SRC_URI="http://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.xz" +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-emulation/qemu + || ( net-misc/socat net-analyzer/netcat6 )" + +S="${PORTAGE_BUILDDIR}/work/${PN}" + +src_prepare() { + epatch_user +} + +src_install() { + newinitd "${S}/"qemu-init-script qemu + newconfd "${S}/"qemu-conf.example qemu.conf.example + newsbin "${S}/"qtap-manipulate qtap-manipulate + dosym qemu /etc/init.d/kvm +} + +pkg_postinst() { + elog "For bridging networking systems, you need these run time utilities:" + elog " net-misc/bridge-utils" + elog " sys-apps/usermode-utilities" + elog "" + elog "We will be updating these scripts to use" + elog "iptables exclusively in the future" +} diff --git a/app-emulation/qemu/qemu-2.5.0-r1.ebuild b/app-emulation/qemu/qemu-2.5.0-r1.ebuild deleted file mode 100644 index 53d8132780b4..000000000000 --- a/app-emulation/qemu/qemu-2.5.0-r1.ebuild +++ /dev/null @@ -1,661 +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 ) -PYTHON_REQ_USE="ncurses,readline" - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo pax-utils - -BACKPORTS= - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - inherit git-2 - SRC_URI="" -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 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" -IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \ -gnutls gtk gtk2 infiniband iscsi +jpeg \ -kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs -+png pulseaudio python \ -rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu -static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \ -virgl virtfs +vnc vte xattr xen xfs" - -COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips -mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32 -x86_64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-softmmu static-user ) - static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 ) - virtfs? ( xattr ) - vte? ( gtk )" - -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the extranl library. -# -# Older versions of gnutls are supported, but it's simpler to just require -# the latest versions. This is also why we require nettle. -COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - xattr? ( sys-apps/attr[static-libs(+)] )" -SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( app-accessibility/brltty[static-libs(+)] ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle[static-libs(+)] - >=net-libs/gnutls-3.0[static-libs(+)] - ) - gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.90 ) - ) - ) - infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( sys-libs/ncurses:0=[static-libs(+)] ) - nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gles2] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) - ) - seccomp? ( - arm? ( >=sys-libs/libseccomp-2.2.3[static-libs(+)] ) - 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? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" -USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" -X86_FIRMWARE_DEPEND=" - >=sys-firmware/ipxe-1.0.0_p20130624 - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.8.2 - ~sys-firmware/sgabios-0.1_pre8 - ~sys-firmware/vgabios-0.7a - ) - !pin-upstream-blobs? ( - sys-firmware/seabios - sys-firmware/sgabios - sys-firmware/vgabios - )" -CDEPEND=" - !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) ) - !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xen? ( app-emulation/xen-tools:= )" -DEPEND="${CDEPEND} - dev-lang/perl - =dev-lang/python-2* - sys-apps/texinfo - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) - static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) ) - static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-qemu ) -" - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PREBUILT=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or32 - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure -you have the kernel module loaded before running kvm. The easiest way to -ensure that the kernel module is loaded is to load it on boot.\n -For AMD CPUs the module is called 'kvm-amd'\n -For Intel CPUs the module is called 'kvm-intel'\n -Please review /etc/conf.d/modules for how to load these\n\n -Make sure your user is in the 'kvm' group\n -Just run 'gpasswd -a kvm', then have re-login." - -qemu_support_kvm() { - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \ - use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \ - use qemu_softmmu_targets_s390x; then - return 0 - fi - - return 1 -} - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -pkg_setup() { - enewgroup kvm 78 -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - # Cheap hack to disable gettext .mo generation. - use nls || rm -f po/*.po - - epatch "${FILESDIR}"/qemu-2.5.0-cflags.patch - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ - epatch - - epatch "${FILESDIR}"/${P}-CVE-2015-8567.patch #567868 - epatch "${FILESDIR}"/${P}-CVE-2015-8558.patch #568246 - epatch "${FILESDIR}"/${P}-CVE-2015-8701.patch #570110 - epatch "${FILESDIR}"/${P}-CVE-2015-8743.patch #570988 - epatch "${FILESDIR}"/${P}-CVE-2016-1568.patch #571566 - - # Fix ld and objcopy being called directly - tc-export AR LD OBJCOPY - - # Verbose builds - MAKEOPTS+=" V=1" - - epatch_user -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - local static_flag="static-${buildtype}" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF}/html - --disable-bsd-user - --disable-guest-agent - --disable-strip - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - --enable-docs - $(use_enable tci tcg-interpreter) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets as the default configure - # options will autoprobe and try to link in a bunch of unused junk. - conf_softmmu() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_softmmu accessibility brlapi) - $(conf_softmmu aio linux-aio) - $(conf_softmmu bluetooth bluez) - $(conf_softmmu caps cap-ng) - $(conf_softmmu curl) - $(conf_softmmu fdt) - $(conf_softmmu glusterfs) - $(conf_softmmu gnutls) - $(conf_softmmu gnutls nettle) - $(conf_softmmu gtk) - $(conf_softmmu infiniband rdma) - $(conf_softmmu iscsi libiscsi) - $(conf_softmmu jpeg vnc-jpeg) - $(conf_softmmu kernel_linux kvm) - $(conf_softmmu lzo) - $(conf_softmmu ncurses curses) - $(conf_softmmu nfs libnfs) - $(conf_softmmu numa) - $(conf_softmmu opengl) - $(conf_softmmu png vnc-png) - $(conf_softmmu rbd) - $(conf_softmmu sasl vnc-sasl) - $(conf_softmmu sdl) - $(conf_softmmu seccomp) - $(conf_softmmu smartcard) - $(conf_softmmu snappy) - $(conf_softmmu spice) - $(conf_softmmu ssh libssh2) - $(conf_softmmu usb libusb) - $(conf_softmmu usbredir usb-redir) - $(conf_softmmu uuid) - $(conf_softmmu vde) - $(conf_softmmu vhost-net) - $(conf_softmmu virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_softmmu vnc) - $(conf_softmmu vte) - $(conf_softmmu xen) - $(conf_softmmu xen xen-pci-passthrough) - $(conf_softmmu xfs xfsctl) - ) - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - ;; - softmmu) - # audio options - local audio_opts="oss" - use alsa && audio_opts="alsa,${audio_opts}" - use sdl && audio_opts="sdl,${audio_opts}" - use pulseaudio && audio_opts="pa,${audio_opts}" - - conf_opts+=( - --disable-linux-user - --enable-system - --with-system-pixman - --audio-drv-list="${audio_opts}" - ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - ) - static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - gcc-specs-pie && conf_opts+=( --enable-pie ) - fi - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - if [[ -z ${softmmu_targets}${user_targets} ]]; then - cd "${S}/tools-build" - default - fi -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake -j1 check - emake -j1 check-report.html - fi -} - -qemu_python_install() { - python_domodule "${S}/scripts/qmp/qmp.py" - - python_doscript "${S}/scripts/kvm/kvm_stat" - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets - newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dohtml check-report.html - - if use kernel_linux; then - udev_dorules "${FILESDIR}"/65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - if [[ -z ${softmmu_targets}${user_targets} ]]; then - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - fi - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}" - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - # Remove the docdir placed qmp-commands.txt - mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - dodoc docs/qmp-*.txt - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - fi - - # Remove vgabios since we're using the vgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin - dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - qemu_support_kvm && readme.gentoo_create_doc -} - -pkg_postinst() { - if qemu_support_kvm; then - readme.gentoo_print_elog - fi - - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/vgabios)" -} diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest index 9fe4f27a0583..c7fa740ac5f3 100644 --- a/app-i18n/fcitx-qt5/Manifest +++ b/app-i18n/fcitx-qt5/Manifest @@ -1,2 +1,3 @@ DIST fcitx-qt5-1.0.2.tar.xz 53324 SHA256 b8073f07d9384878c616f6d2cea44fc739a3b5731b95b10b3133e0914d49f66d SHA512 f7075d5334e29fd00c54563182c9cc4027011503aa14d577aa2fb75eb8558c385d91c939f1f21e51850c9c64fc5c396aad5b32fdcc8ddd99c46ec74bd577255d WHIRLPOOL 35ae384cf13fdfdb86c34b7dbefbbe780a2c20ac220868824e25a0ba4368581c19d45cbc9447e1c2dd3236b0758ee9e4311dab1f348a524ca2d002d0b43c760c DIST fcitx-qt5-1.0.4.tar.xz 53552 SHA256 b42a428008d9bf3a5d9140d63c9a475386480d598bb9ce3b78fad43879a50d1c SHA512 f5a2d3ed30bbbb8da3687dc12dd5be3038242ba40e6bef48483931aacfd9f200db9d24d0df03cb93058eedb3941ef6ecb92d874040eb60742f60a44beda77868 WHIRLPOOL c1dcf45eed09625721c175b1b09724f1f9934cb8cb3413df811009815d4231d2758c54a7b346cb29910c0ce156eb9906136d471359566eb288438cc1f5466710 +DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild new file mode 100644 index 000000000000..8e71460e0ae1 --- /dev/null +++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5" +fi + +DESCRIPTION="Fcitx input method module for Qt 5" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# Private headers of dev-qt/qtgui:5 used. +RDEPEND=">=app-i18n/fcitx-4.2.8 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + virtual/libintl + x11-libs/libxkbcommon" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-ucs4.patch" +) + +DOCS=() diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-9999.ebuild new file mode 100644 index 000000000000..6af0341cebba --- /dev/null +++ b/app-i18n/fcitx-qt5/fcitx-qt5-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5" +fi + +DESCRIPTION="Fcitx input method module for Qt 5" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="" +IUSE="" + +# Private headers of dev-qt/qtgui:5 used. +RDEPEND=">=app-i18n/fcitx-4.2.8 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + virtual/libintl + x11-libs/libxkbcommon" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig" + +DOCS=() diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch new file mode 100644 index 000000000000..c237d101d599 --- /dev/null +++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch @@ -0,0 +1,86 @@ +https://github.com/fcitx/fcitx-qt5/commit/31ecc9f2f9c8eb77082044944bbb6740d35ae7c3 +https://github.com/fcitx/fcitx-qt5/commit/8fc110e6125d85d3c50112bc20a6ed36395b2b21 + +--- platforminputcontext/qfcitxplatforminputcontext.cpp ++++ platforminputcontext/qfcitxplatforminputcontext.cpp +@@ -254,6 +254,12 @@ + anchor = var2.toInt(); + else + anchor = cursor; ++ ++ // adjust it to real character size ++ QVector tempUCS4 = text.leftRef(cursor).toUcs4(); ++ cursor = tempUCS4.size(); ++ tempUCS4 = text.leftRef(anchor).toUcs4(); ++ anchor = tempUCS4.size(); + if (data.surroundingText != text) { + data.surroundingText = text; + proxy->SetSurroundingText(text, cursor, anchor); +@@ -388,6 +394,7 @@ + delete data.proxy; + } + data.proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this); ++ data.proxy->setProperty("icData", qVariantFromValue(static_cast(&data))); + connect(data.proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString))); + connect(data.proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int))); + connect(data.proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int))); +@@ -480,15 +487,56 @@ + update(Qt::ImCursorRectangle); + } + +-void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint nchar) ++void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint _nchar) + { + QObject *input = qApp->focusObject(); + if (!input) + return; + + QInputMethodEvent event; +- event.setCommitString("", offset, nchar); +- QCoreApplication::sendEvent(input, &event); ++ ++ FcitxQtInputContextProxy *proxy = qobject_cast(sender()); ++ if (!proxy) { ++ return; ++ } ++ ++ FcitxQtICData *data = static_cast(proxy->property("icData").value()); ++ QVector ucsText = data->surroundingText.toUcs4(); ++ ++ int cursor = data->surroundingCursor; ++ // make nchar signed so we are safer ++ int nchar = _nchar; ++ // Qt's reconvert semantics is different from gtk's. It doesn't count the current ++ // selection. Discard selection from nchar. ++ if (data->surroundingAnchor < data->surroundingCursor) { ++ nchar -= data->surroundingCursor - data->surroundingAnchor; ++ offset += data->surroundingCursor - data->surroundingAnchor; ++ cursor = data->surroundingAnchor; ++ } else if (data->surroundingAnchor > data->surroundingCursor) { ++ nchar -= data->surroundingAnchor - data->surroundingCursor; ++ cursor = data->surroundingCursor; ++ } ++ ++ // validates ++ if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) { ++ // order matters ++ QVector replacedChars = ucsText.mid(cursor + offset, nchar); ++ nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size(); ++ ++ int start, len; ++ if (offset >= 0) { ++ start = cursor; ++ len = offset; ++ } else { ++ start = cursor; ++ len = -offset; ++ } ++ ++ QVector prefixedChars = ucsText.mid(start, len); ++ offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1); ++ event.setCommitString("", offset, nchar); ++ QCoreApplication::sendEvent(input, &event); ++ } + } + + void QFcitxPlatformInputContext::forwardKey(uint keyval, uint state, int type) diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index e40ae26e3aea..8e7d3bfbbd2c 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,4 +1,5 @@ DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956abbcc949512cc79d4ee24cfc9dbb5 SHA512 e5d8eb55f644250197e69315ad02b9f6bc84e697b23c20c01a731f98ce8b1a16d764a58b1e1047d45b8decb6be33144707c2a52fc427e6338d8b8186cd4da074 WHIRLPOOL e344bc92a84940d3c885d1ae87a2fc83c95d6cb0f0e95eed76078e996c4a00df82a0c09c4540771f628928db1716f90d50d04469f2c0f2d5c17b5048fbf2d482 DIST fcitx-4.2.8.5_dict.tar.xz 8696468 SHA256 fe3d6f57805fc61130f8254f19a86fe3baa0f405406414ca2e94bcf86d3d1b72 SHA512 ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe WHIRLPOOL 0a394d5aaa53819bbab66b32e7ae5896187bc45fad146c7eef4ab75640e5c6670cf811bec87e482bb3516b30e1ce28f2cefa91c10838092f9329b1101b5c70db DIST fcitx-4.2.8.6_dict.tar.xz 8694328 SHA256 91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 SHA512 822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4 WHIRLPOOL df24b3b6bbe18a8498732b27817caef6c28278bddd6acfbe49edd9a63d8f33b09ba93ff0bd144e1c1d3b9b9c8079a35a8a047ebf9b361b4f173ec9b23138042e +DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d DIST fcitx-4.2.9_dict.tar.xz 8675292 SHA256 3a935b7098fe573b126f8e393d93bccc6d4e4e9988830430fa9b1c87876bfc6c SHA512 4bad2efc283858bf9af7f7f283f7beefb210aa361ff034464ff97ea0e536f084c99d876f3595a5375114b68cd51714bd0b5c622a53efc57154a4e629fd416093 WHIRLPOOL 520a6f41a68fd5dbd4b00eb5de5ed2aea0801adc9dd64449e36c442311c9c85bdd28f1d5f79917e99b7fff2f8372bed9bb780fdda7d6d16cf528e5c1a6a0914f diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild new file mode 100644 index 000000000000..caa01d5e7891 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils gnome2-utils multilib xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx" +fi + +DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" +fi + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" +REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )" + +RDEPEND="virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xml? ( x11-libs/libxkbfile ) + ) + cairo? ( + dev-libs/glib:2 + x11-libs/cairo[X] + x11-libs/libXext + pango? ( x11-libs/pango ) + !pango? ( media-libs/fontconfig ) + ) + dbus? ( sys-apps/dbus ) + enchant? ( app-text/enchant ) + gtk2? ( + dev-libs/glib:2 + x11-libs/gtk+:2 + ) + gtk3? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + introspection? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + xml? ( + app-text/iso-codes + dev-libs/libxml2 + )" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig" + +DOCS=(AUTHORS ChangeLog THANKS) + +PATCHES=( + "${FILESDIR}/${P}-tray_icon.patch" + "${FILESDIR}/${P}-qt-4_ucs4.patch" +) + +src_prepare() { + # https://github.com/fcitx/fcitx/issues/250 + sed \ + -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ + -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ + -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \ + -i CMakeLists.txt + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo) + -DENABLE_DBUS=$(usex dbus) + -DENABLE_DEBUG=$(usex debug) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_GETTEXT=$(usex nls) + -DENABLE_GIR=$(usex introspection) + -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3) + -DENABLE_LIBXML2=$(usex xml) + -DENABLE_LUA=$(usex lua) + -DENABLE_OPENCC=$(usex opencc) + -DENABLE_PANGO=$(usex pango) + -DENABLE_QT=$(usex qt4) + -DENABLE_QT_GUI=$(usex qt4) + -DENABLE_QT_IM_MODULE=$(usex qt4) + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi) + -DENABLE_STATIC=$(usex static-libs) + -DENABLE_TABLE=$(usex table) + -DENABLE_TEST=$(usex test) + -DENABLE_X11=$(usex X) + -DENABLE_XDGAUTOSTART=$(usex autostart) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + rm -r "${ED}usr/share/doc/${PN}" +} + +pkg_preinst() { + gnome2_icon_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_pkg_postinst + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_pkg_postrm + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild new file mode 100644 index 000000000000..caba9c8d3826 --- /dev/null +++ b/app-i18n/fcitx/fcitx-9999.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils gnome2-utils multilib xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx" +fi + +DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" +fi + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="" +IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml" +REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )" + +RDEPEND="virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xml? ( x11-libs/libxkbfile ) + ) + cairo? ( + dev-libs/glib:2 + x11-libs/cairo[X] + x11-libs/libXext + pango? ( x11-libs/pango ) + !pango? ( media-libs/fontconfig ) + ) + dbus? ( sys-apps/dbus ) + enchant? ( app-text/enchant ) + gtk2? ( + dev-libs/glib:2 + x11-libs/gtk+:2 + ) + gtk3? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + introspection? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + ) + xml? ( + app-text/iso-codes + dev-libs/libxml2 + )" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig" + +DOCS=(AUTHORS ChangeLog THANKS) + +src_prepare() { + # https://github.com/fcitx/fcitx/issues/250 + sed \ + -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ + -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ + -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \ + -i CMakeLists.txt + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo) + -DENABLE_DBUS=$(usex dbus) + -DENABLE_DEBUG=$(usex debug) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_GETTEXT=$(usex nls) + -DENABLE_GIR=$(usex introspection) + -DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3) + -DENABLE_LIBXML2=$(usex xml) + -DENABLE_LUA=$(usex lua) + -DENABLE_OPENCC=$(usex opencc) + -DENABLE_PANGO=$(usex pango) + -DENABLE_QT=$(usex qt4) + -DENABLE_QT_GUI=$(usex qt4) + -DENABLE_QT_IM_MODULE=$(usex qt4) + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi) + -DENABLE_STATIC=$(usex static-libs) + -DENABLE_TABLE=$(usex table) + -DENABLE_TEST=$(usex test) + -DENABLE_X11=$(usex X) + -DENABLE_XDGAUTOSTART=$(usex autostart) + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + rm -r "${ED}usr/share/doc/${PN}" +} + +pkg_preinst() { + gnome2_icon_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_pkg_postinst + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_pkg_postrm + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch new file mode 100644 index 000000000000..2e114b087f25 --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch @@ -0,0 +1,95 @@ +https://github.com/fcitx/fcitx/commit/14faccfbb0d87e06c25d182ae842808d18be3dc7 +https://github.com/fcitx/fcitx/commit/216a09e3ec056f272eebfbe82809b803d86012cb + +--- src/frontend/qt/qfcitxinputcontext.cpp ++++ src/frontend/qt/qfcitxinputcontext.cpp +@@ -232,6 +232,20 @@ + anchor = var2.toInt(); + else + anchor = cursor; ++ ++ // adjust it to real character size ++ // QTBUG-25536; ++ QVector tempUCS4 = text.leftRef(cursor).toUcs4(); ++ while (!tempUCS4.empty() && tempUCS4.last() == 0) { ++ tempUCS4.pop_back(); ++ } ++ cursor = tempUCS4.size(); ++ tempUCS4 = text.leftRef(anchor).toUcs4(); ++ while (!tempUCS4.empty() && tempUCS4.last() == 0) { ++ tempUCS4.pop_back(); ++ } ++ anchor = tempUCS4.size(); ++ + if (data->surroundingText != text) { + data->surroundingText = text; + proxy->SetSurroundingText(text, cursor, anchor); +@@ -581,6 +595,7 @@ + delete data->proxy; + } + data->proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this); ++ data->proxy->setProperty("icData", qVariantFromValue(static_cast(data))); + connect(data->proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString))); + connect(data->proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int))); + connect(data->proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int))); +@@ -680,11 +695,57 @@ + sendEvent(event); + } + +-void QFcitxInputContext::deleteSurroundingText(int offset, uint nchar) ++void QFcitxInputContext::deleteSurroundingText(int offset, uint _nchar) + { + QInputMethodEvent event; +- event.setCommitString("", offset, nchar); +- sendEvent(event); ++ ++ FcitxQtInputContextProxy *proxy = qobject_cast(sender()); ++ if (!proxy) { ++ return; ++ } ++ ++ FcitxQtICData *data = static_cast(proxy->property("icData").value()); ++ QVector ucsText = data->surroundingText.toUcs4(); ++ ++ // QTBUG-25536 ++ while (!ucsText.empty() && ucsText.last() == 0) { ++ ucsText.pop_back(); ++ } ++ ++ int cursor = data->surroundingCursor; ++ // make nchar signed so we are safer ++ int nchar = _nchar; ++ // Qt's reconvert semantics is different from gtk's. It doesn't count the current ++ // selection. Discard selection from nchar. ++ if (data->surroundingAnchor < data->surroundingCursor) { ++ nchar -= data->surroundingCursor - data->surroundingAnchor; ++ offset += data->surroundingCursor - data->surroundingAnchor; ++ cursor = data->surroundingAnchor; ++ } else if (data->surroundingAnchor > data->surroundingCursor) { ++ nchar -= data->surroundingAnchor - data->surroundingCursor; ++ cursor = data->surroundingCursor; ++ } ++ ++ // validates ++ if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) { ++ // order matters ++ QVector replacedChars = ucsText.mid(cursor + offset, nchar); ++ nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size(); ++ ++ int start, len; ++ if (offset >= 0) { ++ start = cursor; ++ len = offset; ++ } else { ++ start = cursor; ++ len = -offset; ++ } ++ ++ QVector prefixedChars = ucsText.mid(start, len); ++ offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1); ++ event.setCommitString("", offset, nchar); ++ sendEvent(event); ++ } + } + + void QFcitxInputContext::forwardKey(uint keyval, uint state, int type) diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch new file mode 100644 index 000000000000..4f04f5ea423d --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch @@ -0,0 +1,145 @@ +https://github.com/fcitx/fcitx/issues/241 +https://github.com/fcitx/fcitx/commit/c737618fffa84bfe5a6caf55cee9b9288a791bbf +https://github.com/fcitx/fcitx/commit/353683e29be4ef26409b9a05e0cb647a5180fa8c +https://github.com/fcitx/fcitx/commit/fe2732db27a1c2e183400ceeb3283559e10a4ca8 +https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b + +--- src/module/notificationitem/notificationitem.c ++++ src/module/notificationitem/notificationitem.c +@@ -565,8 +565,17 @@ + + boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data) + { +- if (!callback || notificationitem->callback) ++ if (!callback) + return false; ++ ++ if (notificationitem->callback == callback) { ++ return true; ++ } ++ ++ if (notificationitem->callback) { ++ return false; ++ } ++ + if (notificationitem->serviceName) { + FcitxLog(ERROR, "This should not happen, please report bug."); + return false; +--- src/ui/classic/TrayWindow.c ++++ src/ui/classic/TrayWindow.c +@@ -48,7 +48,7 @@ + Display *dpy = classicui->dpy; + int iScreen = classicui->iScreen; + char strWindowName[] = "Fcitx Tray Window"; +- if (!classicui->bUseTrayIcon || classicui->isSuspend) ++ if (!classicui->bUseTrayIcon || classicui->isSuspend || classicui->notificationItemAvailable) + return; + + if (trayWindow->window == None && trayWindow->dockWindow != None) { +@@ -61,12 +61,12 @@ + wsa.colormap = colormap; + wsa.background_pixel = 0; + wsa.border_pixel = 0; +- trayWindow->window = XCreateWindow(dpy, p, -1, -1, 1, 1, ++ trayWindow->window = XCreateWindow(dpy, p, -1, -1, 22, 22, + 0, vi->depth, InputOutput, vi->visual, + CWBackPixmap | CWBackPixel | CWBorderPixel | CWColormap, &wsa); + } else { + trayWindow->window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), +- -1, -1, 1, 1, 0, ++ -1, -1, 22, 22, 0, + BlackPixel(dpy, DefaultScreen(dpy)), + WhitePixel(dpy, DefaultScreen(dpy))); + XSetWindowBackgroundPixmap(dpy, trayWindow->window, ParentRelative); +@@ -74,6 +74,7 @@ + if (trayWindow->window == (Window) NULL) + return; + ++ trayWindow->size = 22; + XSizeHints size_hints; + size_hints.flags = PWinGravity | PBaseSize; + size_hints.base_width = trayWindow->size; +@@ -161,7 +162,7 @@ + png_surface = image->image; + + c = cairo_create(trayWindow->cs); +- cairo_set_source_rgba(c, 0, 0, 0, 0); ++ cairo_set_source_rgba(c, 1, 1, 1, 0); + cairo_set_operator(c, CAIRO_OPERATOR_SOURCE); + cairo_paint(c); + +@@ -226,8 +227,6 @@ + if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER] + && event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION] + && trayWindow->dockWindow == None) { +- if (classicui->notificationItemAvailable) +- return true; + trayWindow->dockWindow = event->xclient.data.l[2]; + TrayWindowRelease(trayWindow); + TrayWindowInit(trayWindow); +@@ -245,6 +244,7 @@ + int size = event->xconfigure.height; + if (size != trayWindow->size) { + trayWindow->size = size; ++ XResizeWindow(dpy, trayWindow->window, size, size); + XSizeHints size_hints; + size_hints.flags = PWinGravity | PBaseSize; + size_hints.base_width = trayWindow->size; +@@ -286,6 +286,14 @@ + return true; + } + break; ++ case PropertyNotify: ++ if (event->xproperty.atom == trayWindow->atoms[ATOM_VISUAL] && ++ event->xproperty.window == trayWindow->dockWindow) { ++ TrayWindowRelease(trayWindow); ++ TrayWindowInit(trayWindow); ++ return true; ++ } ++ break; + } + return false; + } +--- src/ui/classic/classicui.c ++++ src/ui/classic/classicui.c +@@ -168,7 +168,7 @@ + void ClassicUIDelayedInitTray(void* arg) { + FcitxClassicUI* classicui = (FcitxClassicUI*) arg; + // FcitxLog(INFO, "yeah we delayed!"); +- if (!classicui->bUseTrayIcon) ++ if (!classicui->bUseTrayIcon || classicui->isSuspend) + return; + /* + * if this return false, something wrong happened and callback +@@ -187,7 +187,7 @@ + { + FcitxClassicUI* classicui = (FcitxClassicUI*) arg; + classicui->trayTimeout = 0; +- if (!classicui->bUseTrayIcon) ++ if (!classicui->bUseTrayIcon || classicui->isSuspend) + return; + + if (!classicui->trayWindow->bTrayMapped) { +--- src/ui/classic/tray.c ++++ src/ui/classic/tray.c +@@ -106,8 +106,9 @@ + + XWindowAttributes attr; + XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attr); +- if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) { +- XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | StructureNotifyMask); // for MANAGER selection ++ int neededMask = StructureNotifyMask; ++ if ((attr.your_event_mask & neededMask) != neededMask) { ++ XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | neededMask); // for MANAGER selection + } + return True; + } +@@ -123,7 +124,7 @@ + Display* dpy = tray->owner->dpy; + + if (tray->dockWindow != None) { +- XSelectInput(dpy, tray->dockWindow, StructureNotifyMask); ++ XSelectInput(dpy, tray->dockWindow, PropertyChangeMask | StructureNotifyMask); + TraySendOpcode(tray, SYSTEM_TRAY_REQUEST_DOCK, tray->window, 0, 0); + tray->bTrayMapped = True; + return 1; diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml index ca0544829480..7cec1e2e1bf0 100644 --- a/app-i18n/fcitx/metadata.xml +++ b/app-i18n/fcitx/metadata.xml @@ -10,15 +10,16 @@ Cjk - Enable xdg-compatible autostart of fcitx - Use app-text/enchant for text prediction - Enable GObject Introspection - Install GTK2 IM module - Install GTK3 IM module - Enable OpenCC for Chinese Transform + Enable XDG-compatible autostart of Fcitx + Enable Enchant backend (using app-text/enchant) for spelling hinting + Enable support for GObject Introspection + Install input method module for GTK+ 2 + Install input method module for GTK+ 2 + Install input method module for GTK+ 3 + Enable OpenCC engine (using app-i18n/opencc) for converter between Simplified Chinese and Traditional Chinese Enable support for x11-libs/pango - Install Qt4 IM module - Enable Key Snooper for GTK app - Enable Table IM + Install input method module for Qt 4 + Enable key snooper for GTK+ applications + Install table input methods for Simplified Chinese diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest index 14a52e6efa76..53d4952ef0b0 100644 --- a/app-i18n/kcm-fcitx/Manifest +++ b/app-i18n/kcm-fcitx/Manifest @@ -2,3 +2,4 @@ DIST kcm-fcitx-0.4.2.tar.xz 63796 SHA256 f681c1a4172b74a63c36094f860eff4ea778422 DIST kcm-fcitx-0.4.3.tar.xz 56864 SHA256 b7e9ad4569c0940f9654d58de1f13281fcbcab56febbd346951edcfa0a86e208 SHA512 d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713 WHIRLPOOL 04aec049436a120362d02ba900a0d8639feb359b4cc6b99a871c7ffa8d9660270c321828b8660c718890a7f0ea308ea584711ed712762aab712fe8d7e72a205a DIST kcm-fcitx-0.5.0.tar.xz 55964 SHA256 079b309aea4b354d081d45d3dde6d754b24717eb7653344055633453cb328b33 SHA512 219b962c4b6f1763b389dc20d22a671d960a884f5c3f0faddbd4919b61dd6d93e600cbf440b15bc42f63cb383ed5ca65e657fa835c520196c8bd9d64a160baa3 WHIRLPOOL df9db7b5198130409986c4805a7771b6df4bd44d532071499ec6eb522af7bfdd9d576fbdf3664720e47a02a57e35409c69fff962152423ac59bab71d8c1e0947 DIST kcm-fcitx-0.5.2.tar.xz 55936 SHA256 348b7afd18670c0879e616d6e097c2d8b033d1a7f5abbc3b75876953bd67f504 SHA512 9418001ad92ada2e7c48c426b24b6babebb3e41510c9ff2aac01e25f84f79cd02a3e413267a31feb677beca51070a4ca55f5d64bd103ddd9ab7853f207370882 WHIRLPOOL 8ca8032ea4b50228ea33189d7afac160cc04882c2ac7403de8cb244b39feddfb89019b4ab4a6caf67b2a9d40c2a9b97cdee0832c5beec4c108b67bc35f0b5923 +DIST kcm-fcitx-0.5.3.tar.xz 57488 SHA256 f2de5fa4e31a96fea059e4d390c6f1d6fdc98af572c19a0e84cf6181da7c2935 SHA512 19d172cbf1d2a13f289b64b67488ddc5ba83a9d26503438045271c85df3775715614951652dc6f8da52a3b9d692d6e2138a760fc51d1e7f0f8bb0bd467265496 WHIRLPOOL 7be5cfb389bfcf5f451b5619c0818afeaa7b88199375b2f5d85bdcc21b1259008a3653f1cd26e33689a9f18130bc53269dceb20fca5b64aaa8f619e06f2d413e diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild index f0acd58ebe42..4d940c791f5e 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.2.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.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$ @@ -10,7 +10,7 @@ HOMEPAGE="http://fcitx-im.org/" SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz" LICENSE="GPL-3" -SLOT="0" +SLOT="4" KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild index 24407d44be69..ce2cd5087715 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild @@ -1,21 +1,48 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit kde4-base +EAPI="5" + +inherit cmake-utils xdg + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx" + EGIT_BRANCH="kde4" +fi DESCRIPTION="KDE configuration module for Fcitx" -HOMEPAGE="http://fcitx-im.org/" -SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi -LICENSE="GPL-3" -SLOT="0" +LICENSE="GPL-2+" +SLOT="4" KEYWORDS="amd64 ~ppc ppc64 ~x86" -IUSE="" +IUSE="minimal" -RDEPEND=">=app-i18n/fcitx-4.2.8[qt4] +RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4] + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + kde-base/kdelibs:4 + virtual/libintl + x11-libs/libX11 x11-libs/libxkbfile" DEPEND="${RDEPEND} + dev-util/automoc sys-devel/gettext virtual/pkgconfig" + +src_prepare() { + if use minimal; then + cmake_comment_add_subdirectory po + fi + + cmake-utils_src_prepare +} diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild new file mode 100644 index 000000000000..27997fbf0af6 --- /dev/null +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.9999.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils xdg + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx" + EGIT_BRANCH="kde4" +fi + +DESCRIPTION="KDE configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="4" +KEYWORDS="" +IUSE="minimal" + +RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4] + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + kde-base/kdelibs:4 + virtual/libintl + x11-libs/libX11 + x11-libs/libxkbfile" +DEPEND="${RDEPEND} + dev-util/automoc + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + if use minimal; then + cmake_comment_add_subdirectory po + fi + + cmake-utils_src_prepare +} diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild new file mode 100644 index 000000000000..1efe5746103d --- /dev/null +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx" +fi + +DESCRIPTION="KDE configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=app-i18n/fcitx-4.2.8[dbus] + app-i18n/fcitx-qt5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcmutils:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kitemviews:5 + kde-frameworks/knewstuff:5 + kde-frameworks/kwidgetsaddons:5 + virtual/libintl + !${CATEGORY}/${PN}:4[-minimal(-)]" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + # x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5. + sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + ) + + cmake-utils_src_configure +} diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild new file mode 100644 index 000000000000..a3c393ecbca9 --- /dev/null +++ b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx" +fi + +DESCRIPTION="KDE configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="" +IUSE="" + +RDEPEND=">=app-i18n/fcitx-4.2.8[dbus] + app-i18n/fcitx-qt5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + kde-frameworks/kcmutils:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kitemviews:5 + kde-frameworks/knewstuff:5 + kde-frameworks/kwidgetsaddons:5 + virtual/libintl + !${CATEGORY}/${PN}:4[-minimal(-)]" +DEPEND="${RDEPEND} + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + # x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5. + sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + ) + + cmake-utils_src_configure +} diff --git a/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild new file mode 100644 index 000000000000..6a5304d3309a --- /dev/null +++ b/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 pypy ) +inherit readme.gentoo-r1 python-single-r1 + +DESCRIPTION="AsciiDoc is a plain text human readable/writable document format" +HOMEPAGE="http://asciidoc.org/" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples graphviz highlight test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75 + dev-libs/libxslt + graphviz? ( media-gfx/graphviz ) + app-text/docbook-xml-dtd:4.5 + highlight? ( || ( dev-util/source-highlight \ + dev-python/pygments[${PYTHON_USEDEP}] \ + app-text/highlight ) + ) + ${PYTHON_DEPS} +" +DEPEND="test? ( dev-util/source-highlight + media-sound/lilypond + media-gfx/imagemagick + dev-texlive/texlive-latex + app-text/dvipng + media-gfx/graphviz + ${PYTHON_DEPS} ) +" + +DOC_CONTENTS=" +If you are going to use a2x, please also look at a2x(1) under +REQUISITES for a list of runtime dependencies. +" + +src_prepare() { + # Only needed for prefix - harmless (does nothing) otherwise + sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \ + "${S}/asciidoc.py" || die +} + +src_configure() { + econf --sysconfdir="${EPREFIX}"/usr/share +} + +src_install() { + emake DESTDIR="${D}" install + + python_fix_shebang "${ED}"/usr/bin/*.py + + readme.gentoo_create_doc + dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \ + dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt + + # Below results in some files being installed twice in different locations, but they are in the right place, + # uncompressed, and there won't be any broken links. See bug #483336. + if use examples; then + cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die + docompress -x /usr/share/doc/${PF}/examples + fi +} + +src_test() { + cd tests || die + local -x ASCIIDOC_PY=../asciidoc.py + "${PYTHON}" test${PN}.py update || die + "${PYTHON}" test${PN}.py run || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild index a52e99262ff7..2439cc06996b 100644 --- a/app-text/bdf2psf/bdf2psf-1.104.ebuild +++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="" DEPEND="" diff --git a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild index 7d69aae44988..bcefb201b731 100644 --- a/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild +++ b/dev-java/hoteqn/hoteqn-4.0.0-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html" SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-3" SLOT=0 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RDEPEND=" diff --git a/dev-java/hoteqn/hoteqn-4.0.0.ebuild b/dev-java/hoteqn/hoteqn-4.0.0.ebuild deleted file mode 100644 index f8dd2c301815..000000000000 --- a/dev-java/hoteqn/hoteqn-4.0.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit java-pkg-2 - -DESCRIPTION="Java applet to view and display LaTeX mathematical equations" -HOMEPAGE="http://www.atp.ruhr-uni-bochum.de/VCLab/software/HotEqn/HotEqn.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="GPL-3" -SLOT=0 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" -RDEPEND=">=virtual/jre-1.4" -DEPEND=">=virtual/jdk-1.4" - -src_unpack() { - unpack "${A}" - rm -v "${S}"/mHotEqn.java || die -} - -src_compile() { - ejavac -nowarn -d classes $(find . -name "*.java") || die "failed to build" - jar cf ${PN}.jar -C classes . || die "failed to create jar" -} - -src_install() { - java-pkg_dojar ${PN}.jar -} - -pkg_postinst() { - elog "We don't currently build the browser applet part. File a bug if you need it." -} diff --git a/dev-java/jsr67/Manifest b/dev-java/jsr67/Manifest index 2d7808144095..712c3ac79ab2 100644 --- a/dev-java/jsr67/Manifest +++ b/dev-java/jsr67/Manifest @@ -1,2 +1 @@ DIST jsr67-1.3.jar 327033 SHA256 fe2b95887477f7f39c8d3a33211c0d96cf73872364a0b0478bdaf24500be6225 SHA512 c4145e5870af677542a09a17b7b57d9e5501f6354b26743b9eb9946dbd263114eb705c023af996ddcb256961df28a7ac2420a54fcdd69f73c8595901ee21760a WHIRLPOOL 25dcffa1eb5166867158211ae209e2b24f648d6806e392b80527b8c34f4ebdec181125f80443c1b6956856b1b9c14e83a9df9a72781d14c4fb366bd3a7ae9479 -DIST saaj-api.jar 18817 SHA256 d36278c49c50f1fe41c264414a1f572a6578d544b8ca89053597ecb9ca87f63e SHA512 b130ff18fcc3ab04c095ad454c82d83b2c383d4f8eb950291796d41f0f0ee7a15434de282864e778c3692cc3bdf4ab5213050a43ae10a6e308d613f9d477a813 WHIRLPOOL c5596415d9dec81e20b8c5d515388c049820e24467f40f7c0259e9d4169149f36367b1501c227adc738aebcd01ab0875925073c2467a7a6c8bc0d87a44470216 diff --git a/dev-java/jsr67/jsr67-1.3-r1.ebuild b/dev-java/jsr67/jsr67-1.3-r1.ebuild index 1ae8ec883103..1514d0cc07fb 100644 --- a/dev-java/jsr67/jsr67-1.3-r1.ebuild +++ b/dev-java/jsr67/jsr67-1.3-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/com/sun/xml/messaging/${MY_PN%%-*}/${MY_ LICENSE="sun-jsr67" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/dev-java/jsr67/jsr67-1.3.ebuild b/dev-java/jsr67/jsr67-1.3.ebuild deleted file mode 100644 index c8e52654d9d2..000000000000 --- a/dev-java/jsr67/jsr67-1.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="" - -inherit java-pkg-2 - -DESCRIPTION="SAAJ 1.3 (AKA JSR-67 MR3) API" -HOMEPAGE="https://saaj.dev.java.net/spec-1.3/" -SRC_URI="https://saaj.dev.java.net/spec-${PV}/saaj-api.jar" - -LICENSE="sun-jsr67" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-fbsd" - -IUSE="" - -RDEPEND=">=virtual/jre-1.4" -DEPEND="" - -S="${WORKDIR}" - -src_unpack() { - : -} - -src_install() { - java-pkg_newjar "${DISTDIR}/saaj-api.jar" -} diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest index 2b8ad918a027..229fc1da9605 100644 --- a/dev-lang/ekopath/Manifest +++ b/dev-lang/ekopath/Manifest @@ -4,3 +4,4 @@ DIST ekopath-2016-01-24-installer.run 57266129 SHA256 3ea7471dc29ccfd89b7a7cee78 DIST ekopath-2016-03-03-installer.run 57856781 SHA256 0db16cf44f38e170e80230e08cccd2596187c869a3cd9ec74a6c368f9f1cb617 SHA512 c7ddb516f420a2efd278472f2694cad87b6e8e956f56b48473f432cc9b3565e568713915137b980cd03e89003e80a098a29cb7f3fea93f02c590577ef521f0ba WHIRLPOOL a270e5eb8731fc5a8c536d2328b5c5d1012397df895d01009dc2d3751c0f344697069e998d51fcbc183cec719652cbfee0032b3b7ae408f5d9104376f22ddbaa DIST ekopath-2016-03-11-installer.run 57858541 SHA256 ff4dc9eca6c877a5a28e4249b783b742f2038d9e01fd1ad795bcbd5ad0059fa2 SHA512 339dd9cd2048629c4f1ef95e062b7029094b563cba9d078bebbd2b0d584da4840e3d824203767ee820da5dbd64b31dc1297529fe59ecdd028b1bad2dd602b3ed WHIRLPOOL ea7492fac3fffd611633d8b975fe73e2dcc3869d575de2fc5f9fc0e1694400e393f04728a63f372d2fd3f18a80ccb8d23ef518627e7d9474f4859b7d181af5ea DIST ekopath-2016-03-16-installer.run 57139166 SHA256 051f93cbb809471abc611cabc670b2d91ab2944a8f09e19ba2a64a1c99b76074 SHA512 356ffc628078e5e524ac5962b3c23c22f8d81fc5c7916ab5707755b853a27a89b7e6677b832a8cc6568499b2852c5c7916b57bad70ee3c027a595eacb4074c96 WHIRLPOOL c7d85d9c5b99b9527b6ed2aa434dac8aa90c8aaff73fa8300d67ba573b1fd0570d7ff33494a89ea20a9075557c6a1f7030efaa2b3ed86f0b70b919000177cfa1 +DIST ekopath-2016-03-24-installer.run 57140247 SHA256 4a1139432cd0eba1490bab6b18cb3d227e6b6ad9eb354be22a55b6914e436220 SHA512 314fb763972d53b9e0b95e02ff542deb663743185643a20845cca3d7098a264d857c6738e59c63490d1bbe7653d7fdd3e8463087c7755c8d0ae6bd73b53c308f WHIRLPOOL 83013389230b8cf1d5254822074e0bbdcf0de48e309900153fa5f58e2ab35d1f0577e1003d3f12ae34cbfe96ad77fa1d0b0d95f94c9d16b07381a49abb7ff6ac diff --git a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild new file mode 100644 index 000000000000..f71706c8bc6d --- /dev/null +++ b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit pax-utils versionator + +MY_PV=$(get_version_component_range 1-3) +MY_P=${PN}-${MY_PV} +DATE=$(get_version_component_range 4) +DATE=${DATE#p} +DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6} +INSTALLER=${PN}-${DATE}-installer.run + +DESCRIPTION="PathScale EKOPath Compiler Suite" +HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" +SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" + +LICENSE="all-rights-reserved" +SLOT="${MY_PV}" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="!!app-arch/rpm" +RDEPEND="!dev-lang/ekopath:0/${MY_PV}" + +RESTRICT="bindist mirror" + +QA_PREBUILT="opt/${MY_P}/*" + +S="${WORKDIR}" + +src_unpack() { + cp "${DISTDIR}/${INSTALLER}" "${S}/" || die + chmod +x "${S}/${INSTALLER}" || die +} + +src_install() { + # EI_PAX marking is obsolete and PT_PAX breaks the binary. + # We must use XT_PAX to run the installer. + if [[ ${PAX_MARKINGS} == "XT" ]]; then + pax-mark m "${INSTALLER}" + fi + + ./"${INSTALLER}" \ + --prefix "${ED%/}/opt/${MY_P}" \ + --mode unattended || die + + if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then + local guess + cd "${ED%/}/opt/${MY_P}/lib" && guess=( * ) + + if [[ ${guess[@]} ]]; then + die "Incorrect release version in PV, guessing it should be: ${guess[*]}" + else + die "No libdir installed" + fi + fi + [[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" + + rm -r "${ED}/opt/${MY_P}"/uninstall* || die +} diff --git a/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild new file mode 100644 index 000000000000..6a39c1078870 --- /dev/null +++ b/dev-lang/ekopath/ekopath-6.0.728_p20160324-r100.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit pax-utils versionator + +MY_PV=$(get_version_component_range 1-3) +MY_P=${PN}-${MY_PV} +DATE=$(get_version_component_range 4) +DATE=${DATE#p} +DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6} +INSTALLER=${PN}-${DATE}-installer.run + +DESCRIPTION="PathScale EKOPath Compiler Suite" +HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite" +SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" + +LICENSE="all-rights-reserved" +SLOT="0/${MY_PV}" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="!!app-arch/rpm" +RDEPEND="!dev-lang/ekopath:${MY_PV}" + +RESTRICT="bindist mirror" + +QA_PREBUILT="opt/${MY_P}/*" + +S="${WORKDIR}" + +src_unpack() { + cp "${DISTDIR}/${INSTALLER}" "${S}/" || die + chmod +x "${S}/${INSTALLER}" || die +} + +src_configure() { + cat > 99${PN} <<-EOF || die + PATH=${EROOT%/}/opt/${PN}/bin + ROOTPATH=${EROOT%/}/opt/${PN}/bin + LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64 + MANPATH=${EROOT%/}/opt/${PN}/docs/man + EOF +} + +src_install() { + # EI_PAX marking is obsolete and PT_PAX breaks the binary. + # We must use XT_PAX to run the installer. + if [[ ${PAX_MARKINGS} == "XT" ]]; then + pax-mark m "${INSTALLER}" + fi + + ./"${INSTALLER}" \ + --prefix "${ED%/}/opt/${MY_P}" \ + --mode unattended || die + + if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then + local guess + cd "${ED%/}/opt/${MY_P}/lib" && guess=( * ) + + if [[ ${guess[@]} ]]; then + die "Incorrect release version in PV, guessing it should be: ${guess[*]}" + else + die "No libdir installed" + fi + fi + [[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" + + rm -r "${ED}/opt/${MY_P}"/uninstall* || die + dosym ${MY_P} /opt/${PN} + doenvd 99${PN} +} diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest index 9159496d20c1..748cc98599af 100644 --- a/dev-lang/moarvm/Manifest +++ b/dev-lang/moarvm/Manifest @@ -1,2 +1,3 @@ DIST MoarVM-2016.01.tar.gz 3314742 SHA256 d409b684c7c92b144b31cf7f0408f30ccbb033ce646f57d7fbaeb9683773e37b SHA512 019433a985c8245c231d533b8310fceda185a694681aaecb922602ad98897c636c40fbe1a36ba656af4c242b28315611f656454eb41f25e0f891b652210eb435 WHIRLPOOL f603e1f60667771e0200e731b37ff854346d00a0de484a9b3072f83e0ee624bc2b7d7e862c872d9062a4397adb5bfab31d835754966a7fe44490312c82a37e8e DIST MoarVM-2016.02.tar.gz 3313448 SHA256 3bdacebba98e6b2d3d10f12af0ab514dec27fb24b15ed00aef479b7d190ce40a SHA512 fdeb107e071bcd7a893f15f105e722543010a87710cbd2ac4ce322000c96c9dae5c5e661dd8d60e712c4fe22d860650a003485d75f95a5b19fcde266f8fe483d WHIRLPOOL 9ccb54d147d558b4fa52bfe9b098384b3d61dffba598db803828bb0cbbc8bae9fd6a527d093c07a421cd97a59952e11ffaf9c6cef93ce9b48778009558e96732 +DIST MoarVM-2016.03.tar.gz 3318299 SHA256 dfc3914e609f30ff06f14267bcbb4fcc6da3d85782d35c1838701a5ea41d8f2f SHA512 358c48f6b1803e39841e9f287f2fe3cdde743962d9d9c34e629c18b1b7290fd8a713917f24233dd092ed68adf9a6d0aadb25bda22b3e353d40bd57ae58d70216 WHIRLPOOL e68dfbc40bda23a49c28089fe8396e5a182afc0ac2550f9ab5d9f1564943af163fcc68b466feaf0778a2df57cd472c87f0853d47882b9b625434c7740ec5aec4 diff --git a/dev-lang/moarvm/moarvm-2016.03.ebuild b/dev-lang/moarvm/moarvm-2016.03.ebuild new file mode 100644 index 000000000000..0e7c088bae43 --- /dev/null +++ b/dev-lang/moarvm/moarvm-2016.03.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib + +MY_PN="MoarVM" + +DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" +HOMEPAGE="http://moarvm.org" +SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="dev-libs/libuv" +DEPEND="${RDEPEND} + dev-lang/perl" + +S="${WORKDIR}/MoarVM-${PV}" + +src_configure() { + perl Configure.pl --prefix="/usr"|| die +} + +src_install() { + emake DESTDIR="${D}" install +} diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index 76e7c0da11e7..fe1859052984 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1,2 +1,3 @@ DIST nqp-2016.01.tar.gz 5117110 SHA256 87875120af7167093643f2a35869d66a61f735220a9348627ba89cf294387c8b SHA512 e79668f7f5f3679fe3b93f63e1151da1eab109ef4acc6f8ae3da3d9e5c3da814440dd43279978b1a13f30647d7c52bda5575b02f366bd928965b06b47c6d6d91 WHIRLPOOL d2369417707332d8bc045f6f93da81e1301ec2599f197664d80e6edeefc1bc7a2147ad3b7e893eef0fb6b96adf2f68f5ab44b948801e266e68d99552253abeda DIST nqp-2016.02.tar.gz 5121833 SHA256 051ddd4bab8f73a688836d896340320ff7043a6ecbd5c53be099249e75e33b8d SHA512 9a3233e351ebdf73ed27d3eade2052936d1a49ea95d32a8176e426e7126c720e4a3f69dedc4067925272293329b08ab397f6a7523b9e4129952847fbd86fcf0d WHIRLPOOL 1bad2dc420d59f07c3d9b8d9dcc78d51a772ed2672419fc53e427c68e24fce5645a0dcfd4a4e138e6333f9e909297b49fafe190e6dc763cca8e52dce20309ec5 +DIST nqp-2016.03.tar.gz 5126687 SHA256 50731983cfc0800015bf73a2174000f5631ad09b551ff190153fba00a448067f SHA512 707701e22752cb43b0694c8c57ec834cfee3d2a50c2b6ae3ee36af5881728c94ae1d03d07c624367edb6cf58bba18abd26dcc18656b0483f4f979db5dd26a07e WHIRLPOOL 364abefc3d7b005b89fd3a3180e66971dbc56851377b93e38d2a8b2ed546121ec730628e0f93947f77e8f12346d64e60b4af8ffa720dc0a05810fae846b262a4 diff --git a/dev-lang/nqp/nqp-2016.03.ebuild b/dev-lang/nqp/nqp-2016.03.ebuild new file mode 100644 index 000000000000..63020f35afb8 --- /dev/null +++ b/dev-lang/nqp/nqp-2016.03.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# still not working +RESTRICT="test" + +inherit eutils multilib versionator + +GITCRAP=d1e443f + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="http://rakudo.org/" +SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc java +moar" +REQUIRED_USE="|| ( java moar )" + +RDEPEND=" + java? ( >=virtual/jre-1.7 ) + moar? ( ~dev-lang/moarvm-${PV} ) + dev-libs/libffi" +DEPEND="${RDEPEND} + java? ( >=virtual/jdk-1.7 ) + dev-lang/perl" + +S=${WORKDIR}/perl6-nqp-${GITCRAP} + +src_configure() { + use java && myconf+="jvm," + use moar && myconf+="moar," + perl Configure.pl --backend=${myconf} --prefix=/usr || die + # dirty hack to make dyncall not fail + sed -i -e 's/-Werror=missing-prototypes//' Makefile || die + sed -i -e 's/-Werror=missing-declarations//' Makefile || die + sed -i -e 's/-Werror=strict-prototypes//' Makefile || die + + # more dirty hack to allow building with newer gcc + sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die + sed -i -e 's/-Werror=nested-externs//' Makefile || die +} + +src_compile() { + emake -j1 || die +} + +src_test() { + emake -j1 test || die +} + +src_install() { + emake DESTDIR="${ED}" install || die + + dodoc CREDITS README.pod || die + + if use doc; then + dodoc -r docs/* || die + fi +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 351daec99678..a1bca8c35695 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,9 +1,5 @@ DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7 -DIST php-5.5.31.tar.bz2 13659002 SHA256 fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277 SHA512 b5b44092636bf26898441cfda4007480dcd0d58b72cd5c53d74ad2926fe54bf7e5db995c8ff598f72f1783ecd02aafad6be7d3bbd35dc83300621c7c37d37eca WHIRLPOOL 4d6a4cce634d30454280b08c30e25fdc6c2d2f37a823123372a4b1bc2b0cc5cdb4e10ccdc73e78cfbf243f83184861c8f79fae023fcf291ee102151a28236052 -DIST php-5.5.32.tar.bz2 13685561 SHA256 b0f2c108db8e05db9f6366aaba9a754fd0ee31f3f86ee889561b608dfd6e92ee SHA512 1603864e7a98378bb5a7c1592d81029fd7dfe5d2fa88152a9e29484c3c98cd6126a79741657eea3e3295ed1bdeed47527d33981c9ea0df891f137ee8126cce2b WHIRLPOOL b7b86eec6b03720238bbe698289c6b1aecf920645f166d617fd26166aba8e19a474ff15d482f8f84fd48befc6b6be6c388797bb3f269f5609e71e10be9844759 DIST php-5.5.33.tar.bz2 13686486 SHA256 c490b1ed4df596b48eb68f630d89ca512945e2650840e7dace1119cc7e600aa9 SHA512 a0ac57adcc4b0caec153265a8d1ded8d4d0f71b44f08158feb0add9c8fdd36826767882e85dd03399cf146800eddcb6b6cc1b21051d4fc4371e3f61b1169132b WHIRLPOOL 373c61677adb89506cc4621d1c7a0732f6454a8679a797807631f2286188bb990dfcaf34b4108edf7b1819424100fa0d7060f0f792a65dc5f1c130cfa00e6b45 -DIST php-5.6.17.tar.bz2 14072840 SHA256 77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b SHA512 706fd31324c98717d44b4db4440a5eaffe24ad34b346ba95418b33ee072b3ddde5d7429d318f69554b4bfcd7dcc0e9e4b07142b539196e9f0ab7707485ad9dbb WHIRLPOOL 02b7ea265b41e9db94a0087bd5baefdd45f3954df12298f1c50340bee5de1f5ea21ec5e1e039741db5cdd19ffd51518775bc17eff5ad8ad138c71fcaacf80af1 -DIST php-5.6.18.tar.bz2 14094993 SHA256 c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed SHA512 1f0820d829923404ceae287129afa9c7d7d9c83d6fbf148a65a6ac49224f4cb84e743443c4fadb69d959229123ab7e99816aab40f694d808e64b05bb7238f89e WHIRLPOOL f4863256dfe3497276ca07b6f01eb5ec046f377e462b5d7d1d11b1e92e99f087b4c55719dace4d5aca1b30794ddd37c9d81b30deb6a913b7c0eeff67ebd74c13 DIST php-5.6.19.tar.bz2 14100438 SHA256 2a24a3f84971680ac0a4c71050067de4f76ee235aa4a041fae21bfa69975c168 SHA512 c8c2b3bdfc1a8abe834612c33123b4f103e841c230b53934fb7bafe11af7f1175f02ca54c92f33e8e603485e6283897bebb51acc55d1213b7433024684215c14 WHIRLPOOL f026e8779c531f887b1e292e5f1d6eafd0e3ae46f83ae8efb830ad8e0f91d86e5b002dda9e6a02987db6230557ff773d8c52dd2db423d792aed1aca292e5b92b DIST php-7.0.4.tar.bz2 14027088 SHA256 a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc SHA512 9d1dc761cdd9103a91299e01117c1790550e3b94e7694dcc2555d83e5abe3d2170acd6226e8501c5f2a77b5c374b1c9f5ea009999d476818c2682a54def86b96 WHIRLPOOL 08b6b023854af693d85a6e48b3ec83f10ede0c07ac6d18b1b3b2a4d8208dcc7ba55900985be812c3325703bc291d8a842d7754c1b7754e2c52c72e7488d6d8df DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea diff --git a/dev-lang/php/php-5.5.31.ebuild b/dev-lang/php/php-5.5.31.ebuild deleted file mode 100644 index 192d2f93130d..000000000000 --- a/dev-lang/php/php-5.5.31.ebuild +++ /dev/null @@ -1,784 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - vpx? ( media-libs/libvpx ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - vpx? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -RDEPEND="${RDEPEND} - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -pkg_setup() { - depend.apache_pkg_setup -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use_if_iuse opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - - # Remove bogus /etc/php-fpm.conf.default (bug 359906) - [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" - fi - - # Install PHP ini files into /usr/share/php - - dodoc php.ini-development - dodoc php.ini-production - -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - #Add user patches #357637 - epatch_user - - #force rebuilding aclocal.m4 - rm aclocal.m4 - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) - $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_enable opcache opcache ) - $(use_with postgres pgsql "${EPREFIX}"/usr) - $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}"/usr) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}"/usr) - $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb) - $(use_with berkdb db4 ${EPREFIX}/usr) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ${EPREFIX}/usr) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm ${EPREFIX}/usr)" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir ${EPREFIX}/usr) - $(use_with truetype t1lib ${EPREFIX}/usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir ${EPREFIX}/usr) - $(use_with gd png-dir ${EPREFIX}/usr) - $(use_with xpm xpm-dir ${EPREFIX}/usr) - $(use_with vpx vpx-dir ${EPREFIX}/usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd)" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ${EPREFIX}/usr) - $(use_with ssl imap-ssl ${EPREFIX}/usr)" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ${EPREFIX}/usr) - $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - my_conf+=" $(use_with mysql mysql $mysqllib)" - my_conf+=" $(use_with mysqli mysqli $mysqlilib)" - - local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - if use mysql ; then - my_conf+="${mysqlsock}" - elif use mysqli ; then - my_conf+="${mysqlsock}" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib ) - $(use_with mysql pdo-mysql ${mysqllib}) - $(use_with postgres pdo-pgsql ) - $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ${EPREFIX}/usr) - $(use_with libedit libedit ${EPREFIX}/usr)" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm ${EPREFIX}/usr)" - else - my_conf+=" - $(use_enable session session )" - fi - - # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake || die "emake failed" - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ - "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP" - APACHE2_MOD_CONF="70_mod_php" # provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" - elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" - - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog -} - -pkg_prerm() { - eselect php cleanup -} diff --git a/dev-lang/php/php-5.5.32.ebuild b/dev-lang/php/php-5.5.32.ebuild deleted file mode 100644 index d621d8aedc4b..000000000000 --- a/dev-lang/php/php-5.5.32.ebuild +++ /dev/null @@ -1,784 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd - -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - vpx? ( media-libs/libvpx ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - vpx? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -RDEPEND="${RDEPEND} - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -pkg_setup() { - depend.apache_pkg_setup -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use_if_iuse opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - - # Remove bogus /etc/php-fpm.conf.default (bug 359906) - [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" - fi - - # Install PHP ini files into /usr/share/php - - dodoc php.ini-development - dodoc php.ini-production - -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - #Add user patches #357637 - epatch_user - - #force rebuilding aclocal.m4 - rm aclocal.m4 - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) - $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_enable opcache opcache ) - $(use_with postgres pgsql "${EPREFIX}"/usr) - $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}"/usr) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}"/usr) - $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb) - $(use_with berkdb db4 ${EPREFIX}/usr) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ${EPREFIX}/usr) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm ${EPREFIX}/usr)" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir ${EPREFIX}/usr) - $(use_with truetype t1lib ${EPREFIX}/usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir ${EPREFIX}/usr) - $(use_with gd png-dir ${EPREFIX}/usr) - $(use_with xpm xpm-dir ${EPREFIX}/usr) - $(use_with vpx vpx-dir ${EPREFIX}/usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd)" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ${EPREFIX}/usr) - $(use_with ssl imap-ssl ${EPREFIX}/usr)" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ${EPREFIX}/usr) - $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - my_conf+=" $(use_with mysql mysql $mysqllib)" - my_conf+=" $(use_with mysqli mysqli $mysqlilib)" - - local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - if use mysql ; then - my_conf+="${mysqlsock}" - elif use mysqli ; then - my_conf+="${mysqlsock}" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib ) - $(use_with mysql pdo-mysql ${mysqllib}) - $(use_with postgres pdo-pgsql ) - $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ${EPREFIX}/usr) - $(use_with libedit libedit ${EPREFIX}/usr)" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm ${EPREFIX}/usr)" - else - my_conf+=" - $(use_enable session session )" - fi - - # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake || die "emake failed" - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ - "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP" - APACHE2_MOD_CONF="70_mod_php" # provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" - elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" - - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog -} - -pkg_prerm() { - eselect php cleanup -} diff --git a/dev-lang/php/php-5.6.17.ebuild b/dev-lang/php/php-5.6.17.ebuild deleted file mode 100644 index 444286eb8ea7..000000000000 --- a/dev-lang/php/php-5.6.17.ebuild +++ /dev/null @@ -1,787 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - > \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - fi - - dodoc php.ini-development - dodoc php.ini-production -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Add user patches #357637 - epatch_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_with truetype t1lib "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - $(use_with vpx vpx-dir "${EPREFIX}/usr") - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib) - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -r "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/sbin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP" - APACHE2_MOD_CONF="70_mod_php" # Provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes" - elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI." - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to" - ewarn "enable the readline USE flag or php -a will hang." - elog - fi - elog "This ebuild installed a version of php.ini based on" - elog "php.ini-${PHP_INI_VERSION}. You can choose which version of" - elog "php.ini to install by default by setting PHP_INI_VERSION" - elog "to either 'production' or 'development' in your make.conf." - elog "Both versions of php.ini can be found with the PHP docs in" - elog "${EPREFIX}/usr/share/doc/${PF}" - elog - elog "For more details on how minor version slotting works," - elog "please see the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_prerm() { - # This returns "1" on success so we can't "|| die" here. - eselect php cleanup -} diff --git a/dev-lang/php/php-5.6.18.ebuild b/dev-lang/php/php-5.6.18.ebuild deleted file mode 100644 index ececa097f92b..000000000000 --- a/dev-lang/php/php-5.6.18.ebuild +++ /dev/null @@ -1,804 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd - -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - > \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - fi - - dodoc php.ini-development - dodoc php.ini-production -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Add user patches #357637 - epatch_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_with truetype t1lib "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - $(use_with vpx vpx-dir "${EPREFIX}/usr") - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib) - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -r "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/sbin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP" - APACHE2_MOD_CONF="70_mod_php" # Provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes" - elog "php${SLOT/./-} in order to compile extensions for the ${SLOT} ABI." - elog - elog "This ebuild installed a version of php.ini based on" - elog "php.ini-${PHP_INI_VERSION}. You can choose which version of" - elog "php.ini to install by default by setting PHP_INI_VERSION" - elog "to either 'production' or 'development' in your make.conf." - elog "Both versions of php.ini can be found with the PHP docs in" - elog "${EPREFIX}/usr/share/doc/${PF}" - elog - elog "For more details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest index 4ee253d28f34..b19f9e915d23 100644 --- a/dev-lang/rakudo/Manifest +++ b/dev-lang/rakudo/Manifest @@ -1,2 +1,3 @@ DIST rakudo-2016.01.1.tar.gz 2687265 SHA256 897d01bcb27c209bd51918bb5be6adc6e6ea9dbc2c6b65414f9ac081aa8c5d7b SHA512 31228d49577f5d25b306a987650af0ae11bb2fa80fcaeee421dbe88dc9812edd5a399999f8727dee11d74177b7b9bca0290e26c4240c7baed35fabb4c912f85f WHIRLPOOL 52b2d7d1a0461883b1d07bbb492994f7eb8930a8726565d9a4788883e16510fc052dc066bf8443e09042548d76a3f3ca1cb17be8baa23b16f5742eb52f33c39b DIST rakudo-2016.02.tar.gz 2691766 SHA256 8ccfbf24f49bf4f5aa0304ffa69abbd90b97dc59f2c65e2384c6b609e3d3f00a SHA512 9fa891a84e882626050772231dee15ad20f1c2d84b5b9ff985964efbff45f18e0a1940dad2cc1fbb8b91f69d9f7f2a3034998819e8ddbf0c380684b326d299ca WHIRLPOOL 2a55ec29df905ec79fee842f84394ac8733d1b116fc90c29a06e8953a77b15bfc193d974a804f99d41ee0b9fce87d4b07ff6e367f03243d08d03f20340fe766e +DIST rakudo-2016.03.tar.gz 2702229 SHA256 d77b58acb09f34c99af94f32db92698df88cda7015c7630ddb1392adbf703471 SHA512 53619288655edf72f986cb5fe7b72cd70ed88a6b18421d46d5d70a8932ca22eb1067be5ddf98264e576f7d81a84d9bbaca2ac5ac3241e582d2f4672589ba7ab1 WHIRLPOOL 43696dda25214aa9e30be7c1c3323dee8ea0f1c50a5754ca2a08d421b4c59cac5001fa4a63d8086ce0cb97801eb098d4e854ca4b801eaf7d277099bf6d86b655 diff --git a/dev-lang/rakudo/rakudo-2016.03.ebuild b/dev-lang/rakudo/rakudo-2016.03.ebuild new file mode 100644 index 000000000000..623e8f443bd6 --- /dev/null +++ b/dev-lang/rakudo/rakudo-2016.03.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="A compiler for the Perl 6 programming language" +HOMEPAGE="http://rakudo.org" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" + inherit git-r3 +else + SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" +fi + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# TODO: add USE="javascript" once that's usable in nqp +IUSE="test" + +RDEPEND="=dev-lang/nqp-${PV}:=[moar]" +DEPEND="${RDEPEND} + >=dev-lang/perl-5.10" + +#PATCHES=(${FILESDIR}/${PV}) + +src_configure() { + perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar +} + +src_test() { + export RAKUDO_PRECOMP_PREFIX=$(mktemp -d) + default +} diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml index f7d539ea1bf3..85cf4eb92057 100644 --- a/dev-lang/rust-bin/metadata.xml +++ b/dev-lang/rust-bin/metadata.xml @@ -1,8 +1,8 @@ - - jauhien@gentoo.org - Jauhien Piatlicki + + rust@gentoo.org + Rust Project diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index a3aff03ad73e..6d0b35dc8f72 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -1,7 +1,7 @@ - + rust@gentoo.org Rust Project diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 37352e505b11..1999abae7217 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -2,4 +2,5 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89 DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7 DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb +DIST glib-2.48.0.tar.xz 7487800 SHA256 744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34 SHA512 684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5 WHIRLPOOL 39ddd7fd17ecc2100f2156165210d2cf68ae13724b252e42705bc89d0c4145cddca3a30f9e3bf9b6a2971cbffe0e108d2acae1200c8fe6d9db91b4b3953c4950 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 diff --git a/dev-libs/glib/glib-2.48.0.ebuild b/dev-libs/glib/glib-2.48.0.ebuild new file mode 100644 index 000000000000..b1ce2b6f3fe2 --- /dev/null +++ b/dev-libs/glib/glib-2.48.0.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Until bug #537330 glib is a reverse dependency of pkgconfig and, then +# adding new dependencies end up making stage3 to grow. Every addition needs +# then to be think very closely. + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) +# Building with --disable-debug highly unrecommended. It will build glib in +# an unusable form as it disables some commonly used API. Please do not +# convert this to the use_enable form, as it results in a broken build. +GCONF_DEBUG="yes" +# Completely useless with or without USE static-libs, people need to use +# pkg-config +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \ + pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2+" +SLOT="2" +IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr" +REQUIRED_USE=" + utils? ( ${PYTHON_REQUIRED_USE} ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] + || ( + >=dev-libs/elfutils-0.142 + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + ) +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=dev-libs/libxslt-1.0 + >=sys-devel/gettext-0.11 + >=dev-util/gtk-doc-am-1.20 + systemtap? ( >=dev-util/systemtap-1.3 ) + test? ( + sys-devel/gdb + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] + >=sys-apps/dbus-1.2.14 ) + !& /dev/null; then + if has_version sys-apps/dbus; then + export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" + export DBUS1_LIBS="-ldbus-1" + fi + export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" + export LIBFFI_LIBS="-lffi" + fi + + # These configure tests don't work when cross-compiling. + if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + case ${CHOST} in + hppa*|metag*) export glib_cv_stack_grows=yes ;; + *) export glib_cv_stack_grows=no ;; + esac + # https://bugzilla.gnome.org/show_bug.cgi?id=756474 + export glib_cv_uscore=no + # https://bugzilla.gnome.org/show_bug.cgi?id=756475 + export ac_cv_func_posix_get{pwuid,grgid}_r=yes + fi + + local myconf + + case "${CHOST}" in + *-mingw*) myconf="${myconf} --with-threads=win32" ;; + *) myconf="${myconf} --with-threads=posix" ;; + esac + + # FIXME: Always use internal libpcre, bug #254659 + # (maybe consider going back to system lib) + # libelf used only by the gresource bin + ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ + $(use_enable xattr) \ + $(use_enable fam) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_enable systemtap dtrace) \ + $(use_enable systemtap systemtap) \ + $(multilib_native_use_enable utils libelf) \ + --disable-compile-warnings \ + --enable-man \ + --with-pcre=internal \ + --with-xml-catalog="${EPREFIX}/etc/xml/catalog" + + if multilib_is_native_abi; then + local d + for d in glib gio gobject; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + python_setup + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + # Hardened: gdb needs this, bug #338891 + if host-is-pax ; then + pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ + || die "Hardened adjustment failed" + fi + + # Need X for dbus-launch session X11 initialization + Xemake check +} + +multilib_src_install() { + gnome2_src_install completiondir="$(get_bashcompdir)" + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog* NEWS* README" + einstalldocs + + if use utils ; then + python_replicate_script "${ED}"/usr/bin/gtester-report + else + rm "${ED}usr/bin/gtester-report" + rm "${ED}usr/share/man/man1/gtester-report.1" + fi + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${ED}/usr/lib/charset.alias" + + # Don't install gdb python macros, bug 291328 + rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" +} + +pkg_preinst() { + gnome2_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="usr/$(get_libdir)/gio/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + # force (re)generation of gschemas.compiled + GNOME2_ECLASS_GLIB_SCHEMAS="force" + + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + multilib_foreach_abi multilib_pkg_postinst +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest index 8bff40d42023..f3c612d27ffc 100644 --- a/dev-libs/libbsd/Manifest +++ b/dev-libs/libbsd/Manifest @@ -1,2 +1 @@ -DIST libbsd-0.7.0.tar.xz 322908 SHA256 0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb SHA512 2c4c8fb2ae7fb5e5aab90f7a59a679220922dfeeaf0d54f80976914fcd507171bb9359f0837c32499e63a0f3e9342c9dcd387a466b359d20e3790ddc8ca17cea WHIRLPOOL 06083651f5678362d3422f96e59d30d8010493f9d1c8c43a94f7ab310daead491c70bce7838cc8302cb448e4a8fa99c7456f0ba9a3b411b292829ba949712b59 DIST libbsd-0.8.2.tar.xz 344292 SHA256 b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5 WHIRLPOOL 4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290 diff --git a/dev-libs/libbsd/libbsd-0.7.0.ebuild b/dev-libs/libbsd/libbsd-0.7.0.ebuild deleted file mode 100644 index 1099b74be8f8..000000000000 --- a/dev-libs/libbsd/libbsd-0.7.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils multilib - -DESCRIPTION="An library to provide useful functions commonly found on BSD systems" -HOMEPAGE="http://libbsd.freedesktop.org/wiki/" -SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz" - -LICENSE="BSD BSD-2 BSD-4 ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86" -IUSE="static-libs" - -DOCS="ChangeLog README TODO" - -pkg_setup() { - local f="${ROOT}/usr/$(get_libdir)/${PN}.a" - local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first." - if ! has_version ${CATEGORY}/${PN}; then - if [[ -e ${f} ]]; then - eerror "${m}" - die "${m}" - fi - fi -} - -src_configure() { - # The build system will install libbsd-ctor.a despite of USE="-static-libs" - # which is correct, see: - # http://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8 - econf $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest index 3f81e6bf418b..27dc234717fe 100644 --- a/dev-libs/libgaminggear/Manifest +++ b/dev-libs/libgaminggear/Manifest @@ -1,2 +1,2 @@ -DIST libgaminggear-0.10.1.tar.bz2 101415 SHA256 1e2626a81b41b74f26ac422c19cdafe858aeb2a572e53c0b2212064e69f14254 SHA512 60f30e1b05c31fb6072f5bd74d7edcd2039fe632c18183e122625bf5f16563e77599e22fc4926e7e6c43d985b3d8840ba9e5cc16b6cb8fb0986c9d49244b3e7c WHIRLPOOL 75e4759d0a2895f7bec0c17a490fbd2c2880fb575e8cdea116d229bab51e747db158c3a90bfb111bebf74bf650438b4c97463ea890592b3984eb77b934dc511e DIST libgaminggear-0.11.1.tar.bz2 103314 SHA256 c3202b76cceb8fe9bdfc9ba284ef88241b1f8e5d5b2d2a001514b974bbf73215 SHA512 9d29d85cf79e12d318ce73b9900d61f5da90b34d3c74ba587b4fdfd9788e723ebba181a8af510bad0763f2239288101a9379efe3d964800cc6885904f13426a0 WHIRLPOOL 938e3fb2e1953e4582f2da8d840facfe4cea97517747dccbe042e7976f484913ba88142121ed1505d9da7fdf24135630661b754ceb8fb321fde38e4b4174c252 +DIST libgaminggear-0.11.2.tar.bz2 103443 SHA256 99abcb627242aa96b597ed831fd1e6df1e8a3958fbaf6cc8e8fdf04d62570d0e SHA512 bd7d4d8c513cb4542ccde12a72ebc816124e09cbb0122e3df70cbbe8ff536b79f4ef5925a1b9e495401b586663afe79d70fd27bb962ba29a7c95a2242143f150 WHIRLPOOL 36052baeef5ca0fd1a0e8c2e424e0acfbdabde166fd23ffa21ffbac417d8c78e68e2e05b1348e9822da3e19c02d27f7cab4937691f722036b9a2714a45550442 diff --git a/dev-libs/libgaminggear/libgaminggear-0.10.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild similarity index 100% rename from dev-libs/libgaminggear/libgaminggear-0.10.1.ebuild rename to dev-libs/libgaminggear/libgaminggear-0.11.2.ebuild diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild index 2081c72f22b6..2effb551f5c0 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/11" # subslot = soname major version -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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest index 24c5b9b14d6e..5a58a17d0ee1 100644 --- a/dev-lisp/asdf/Manifest +++ b/dev-lisp/asdf/Manifest @@ -2,6 +2,7 @@ DIST asdf-3.0.3.tar.gz 427575 SHA256 05f11d83d33f1080f683701ad0e139011051f9c3190 DIST asdf-3.1.4.tar.gz 831537 SHA256 bc8bfaf36335e5f01fd08159c1ded5a96088fbea002b466bdf95c129c413cc43 SHA512 c48eb0928d3b98154d63e8ce797baeb4ad51ab685594b80f2ec4db9747b41c619ec17856d2483590ca8bd0b8c9db160837e7e49e72396c3a16db338ea985282c WHIRLPOOL 71babc996c326b6fb0118752a0f60601f9cefb28d254fd48c838abae14e7bc02f8831a5e96e9521b95f52b9bc1bb632fb5d93abed11dea480ba9f007e7cfdbf1 DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1904fd25a22552e4cc59ad SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 WHIRLPOOL 730e55f875367d190a893b52663bcf35ed5880715ef696d519d35947b82f8a304c94a46294f48c4403c1583895f41a03955510c92848a7290d1d681ab3214e24 DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212 +DIST asdf-3.1.7.tgz 402257 SHA256 06b7b081a887183d31d1fc710d4f63a2e30ff6f70ee9792f130017abd62037be SHA512 ebe2ddf702f6200bf98408fb262e9929565c9d29bcd874dd2657a6f84e123b0153a78e457fb425d48a05c427f7c090ab5fd0e6201223eb4b296b3b4cd5b57c26 WHIRLPOOL 6fff0e34909bc3094c6ea5acddd5c35b08a1ae173f3343f3fd4e11f4ba4320d377f014bca4f74218de794d2dd4d461641ba96ba55172427e8fa4c846aa2e20fb DIST cl-asdf_1.86-1.diff.gz 4888 SHA256 ac7c526a4471353cff3fc2ae750693cf5a9a35c6dca1e52d04e9fd17d76082c8 SHA512 9aa905a14e814a9c7e8077d09aca238d735511ae67f0197fffc84100f5500950081bc00f5be7c6838e3a58d9e4c2f5b6fce9e41d84c7e39fb4fb2e04a1482abf WHIRLPOOL 86a88af4124e9e822c899f23400d054fd915365a825017fdf1ad0b6a26e121cbfe80639f65b018dbc7012173a40c88a31b287c96919184e050feb809ba86bd12 DIST cl-asdf_1.86.orig.tar.gz 53686 SHA256 cfee04493fe4b8a70a42e3ed79d927c3551878c8685ba7c8cf557341453421ce SHA512 a62ff032b41d60b3afbd1f1ef85ea52d669a6fdd87371b19364dec98e99a01e134242bd0b0d6e8731c8d89feab78b809b740a533a46ff21a3969ef0f7dd1e65c WHIRLPOOL c1943361d8e396d9ec602428b91622a023f7743553c4a8d8316ac6b472e11ef1bc3ad3e65644e2d492932c8eb7d02bf596f465e48b6e6714ee4af957459754d2 DIST cl-asdf_1.89-1.diff.gz 395 SHA256 1ad2de4d9bb494f58e69f327d02cd86100967371c93727393b99b3b6fd20d567 SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4 WHIRLPOOL 20bc02a86d3645bedf1952ef70193f3b52250dcab5720e21940f0721e2c8be330f8452d4f77c82cc7bb105afb935c3b255e435b5d99ac40965c49621082c0f4b diff --git a/dev-lisp/asdf/asdf-3.1.7.ebuild b/dev-lisp/asdf/asdf-3.1.7.ebuild new file mode 100644 index 000000000000..20519664965b --- /dev/null +++ b/dev-lisp/asdf/asdf-3.1.7.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils prefix + +DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" +HOMEPAGE="http://common-lisp.net/project/asdf/" +SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" +IUSE="doc" + +SLOT="0/${PVR}" + +DEPEND="!dev-lisp/cl-${PN} + !dev-lisp/asdf-binary-locations + !dev-lisp/gentoo-init + !=0.7.3' which is really both old and silly diff --git a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild index 39dc593f195e..67077dac2006 100644 --- a/dev-python/amqplib/amqplib-1.0.2-r1.ebuild +++ b/dev-python/amqplib/amqplib-1.0.2-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 @@ -13,7 +13,7 @@ SRC_URI="https://py-amqplib.googlecode.com/files/${P}.tgz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="examples extras test" PATCHES=( diff --git a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild index c692047d628e..16f93ff09485 100644 --- a/dev-python/anyjson/anyjson-0.3.3-r1.ebuild +++ b/dev-python/anyjson/anyjson-0.3.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild index 80c2a037cd03..8105ebfe5959 100644 --- a/dev-python/cachetools/cachetools-1.1.5.ebuild +++ b/dev-python/cachetools/cachetools-1.1.5.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild index 198c01c25cfd..9ff10717fa84 100644 --- a/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild +++ b/dev-python/couchdb-python/couchdb-python-1.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest index 29fb55987b4d..f36a7553f6eb 100644 --- a/dev-python/debtcollector/Manifest +++ b/dev-python/debtcollector/Manifest @@ -1,2 +1,3 @@ DIST debtcollector-0.10.0.tar.gz 20669 SHA256 8cc22cf2223af7789692ef0b1cb5c0c3a00da7d6e34cbfce125a956cb4d2f21e SHA512 a521a4dd5229384a500e973fa504be75c9019abd00cd4012118a566a1b4d95ecc10d616de29e0c16953a69fe7cdd219b44afb9463c59a6220c49d4a3dd12f896 WHIRLPOOL 2ffac565e27d411321a4c8c662e78bd0774158d9be0f77f8f7baa049fd62e52cd1b8a3a552f0f993e7e4c0b9325b0be3446580e602e4524e95f7d1e58361f388 DIST debtcollector-0.7.0.tar.gz 17151 SHA256 03ef06604e666a9f4a1506ffcfa887068bdb9f16e33657f9211a7b4e8bc753ea SHA512 684bea62b17843717c6aa19f36e538bd62bfe101693394eb66d6d6f408f32a0c9e458dee8c81324f4503fab952b73654f2eca24c51ef67594c51657fcdca9dad WHIRLPOOL 32cb704719ae3ea00f3d5e4e1df225604e226c5c4882afcf136fdfe035c367b334f1409c35b079214f8ab8b04608ef8a1f648a38632fc9fef9a8f312ce76d3c0 +DIST debtcollector-1.3.0.tar.gz 21853 SHA256 9a65cf09239eab75b961ef609b3176ed2487bedcfa0a465331661824e1c8db8f SHA512 b53ef131599fb04abb9f11e8abe3dc8447a595695bab505be642c03925e0da625e6a10944ec10863526645080ed3ce43b9a5138a1f7ba91511ade6daf42d018a WHIRLPOOL 04c6ee34a48955a86535c3161005417f5c5dfca9152e092c3856d61a4707f6249245398006d0da0c31ffa7103ab69a566bf84d7321b70362d59f359b5225622f diff --git a/dev-python/debtcollector/debtcollector-1.3.0.ebuild b/dev-python/debtcollector/debtcollector-1.3.0.ebuild new file mode 100644 index 000000000000..7d7708ca229a --- /dev/null +++ b/dev-python/debtcollector/debtcollector-1.3.0.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=( python{2_7,3_{3,4,5}} ) + +inherit distutils-r1 + +DESCRIPTION="Python deprecation patterns and strategies that collect technical debt" +HOMEPAGE="http://www.openstack.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc test" + +CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} + test? ( + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] + dev-python/doc8[${PYTHON_USEDEP}] + ) + doc? ( + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + + + + + prometheanfire@gentoo.org + Matthew Thode + + + This package contains tools for authenticating to an OpenStack-based cloud. + + diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest index d99b9c1d912c..93b08ee1e508 100644 --- a/dev-python/keystonemiddleware/Manifest +++ b/dev-python/keystonemiddleware/Manifest @@ -4,3 +4,4 @@ DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 e3fca3fdc093d7fd3817bbd767fac DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f WHIRLPOOL e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4 DIST keystonemiddleware-2.3.2.tar.gz 180429 SHA256 ba4a3bc6224d8ba85319741034d3c6f0c569096e38c6f75a5f044b1c742feeb3 SHA512 ef3a36cd8daa2456b960b9677f06d3753ed3eb7bad83b5d32a1fb2e69239237a495649b5c8138b92b1ab2b6b8e7a8db9e1d02dd7c595962f82681c478e5dfb78 WHIRLPOOL 846b4efdb61a0680d6a71cfe7605c88c3e908c0391b974ba6517c0122a2720bbc5b8990c41907a306ace5d0d25f9362260acc44dfd8e7c9e8dcf6b19213fcda8 DIST keystonemiddleware-2.3.3.tar.gz 185140 SHA256 3a71fdd81d835dbf95086df29bed4f72a05f6588a193ee207877cdb954b9d155 SHA512 cc5a9d5d7411e59471993deff33e71198fe0124252f668e01dc32f84dd2cec56a3256c3a1f05c5f9ed15c25598472fce79a26809ed34123ad10fb90aa8bfde7a WHIRLPOOL 88cf95922b4f32e673b0c77ee95a4effc2f0a65aa3118d5e49c0f25ba83e356bd1af4aa05efe71dc69c1bc3453fea132eab3c53d24815edf1aebcebe01beeaa2 +DIST keystonemiddleware-4.3.0.tar.gz 195199 SHA256 c78def2359359a35d349cf38c53f2d2fdd109fc6debe14ee4c31837e64210b02 SHA512 1adf923ebf8896de21c86d9ddbbec26567f873f3819b4cd5d145cb89b3db963457b1529083f96423967c9b504f12e532ec125cf2009634746cfb1b94772ecb47 WHIRLPOOL f006000815af7329fa1288cae47a1a450fdaf361ff5cecf6ccb6388c040f027011048ccea608b7dca8d5f8450f3c5a4f29194ecd1c9310997a1a830e864e0935 diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild new file mode 100644 index 000000000000..bdd0f16dd138 --- /dev/null +++ b/dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) + +inherit distutils-r1 + +DESCRIPTION="A middleware for the OpenStack Keystone API" +HOMEPAGE="https://github.com/openstack/keystonemiddleware" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples test" + +CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} + test? ( + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] + >=dev-python/mock-1.2[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] + !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] + >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}] + >=dev-python/reno-0.1.1[${PYTHON_USEDEP}] + >=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + =dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] + >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}] + >=dev-python/bandit-0.17.3[${PYTHON_USEDEP}] + )" + +RDEPEND=" + ${CDEPEND} + >=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}] + >=dev-python/positional-1.0.1[${PYTHON_USEDEP}] + >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}] + !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}] + !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}] + !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.8.1[${PYTHON_USEDEP}] + !~dev-python/requests-2.9.0[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]" + +PATCHES=( +) + +python_prepare_all() { + sed -i '/^hacking/d' test-requirements.txt || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + testr init + testr run || die "testsuite failed under python2.7" + flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error" +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/build/html/. ) + use examples && local EXAMPLES=( examples/.) + distutils-r1_python_install_all +} diff --git a/dev-python/kombu/kombu-3.0.34.ebuild b/dev-python/kombu/kombu-3.0.34.ebuild index 5e0a228487a3..e74c50071905 100644 --- a/dev-python/kombu/kombu-3.0.34.ebuild +++ b/dev-python/kombu/kombu-3.0.34.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 @@ -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/monotonic/Manifest b/dev-python/monotonic/Manifest index 722f66981d3b..67a156c3ffbe 100644 --- a/dev-python/monotonic/Manifest +++ b/dev-python/monotonic/Manifest @@ -2,3 +2,4 @@ DIST monotonic-0.2.tar.gz 6652 SHA256 c5e81e875a43e218135ea2aa4c367523894e1a2d76 DIST monotonic-0.3.tar.gz 6707 SHA256 2825ba5ded67b1a70d44529634d3f4ddfad67a5ed7fdcf026022a3ce175be07b SHA512 772154934ffdd1a12aacc331761ce219980caac1bce243fd0740320a25152cf800142c5787c9423270bf02d18e88973dcd981781e2279b28ce364063102f1099 WHIRLPOOL 83d34eac5ee577ba8c42c6276d1c3a46fc30a63919ffd6f86260c09aaf6720ab171db89dfdaa28fd6d42ebb309725ff2e4e0e6c8306c21f9f12dce3d71436e71 DIST monotonic-0.4.tar.gz 6702 SHA256 852f656adbf623ee859def6ca2f5498f4cae3256f8320d5c50570ee8a0592ab6 SHA512 604f7d9f2b36e03413a0f9c341b45698440f3b004cd7120d3905e4712ac85daeadc0580ebd471ad9ad699aa2ec625908f13b604b10f656c803f6e885553d7e6c WHIRLPOOL f13cd567de00c24800da8b40ae1018f54b95e98c2ccda194ea2e8cf080c1ee47d0670db59ddaf72df373906d46107ec10a62581544076c7e70379119f3443dfd DIST monotonic-0.5.tar.gz 6493 SHA256 8c1f882aa66c41daffa701cbf7121d8d264d0cb7722bbb78a6eccd2d8b12c880 SHA512 55630c99559acb54d97cbaf033ed773e711059282538a16d9169d1efc08e5d5a77ec5a39c8402605b27865e963ab361d79ff2033ac58fb86272f279881ad7481 WHIRLPOOL fdc8896d25b604e0627e2533353b06abda8644b993c310346b530bcdab86038bee9d844f3d440c402488e06eb512cf0a2a53b6204bedff58f4b90d36fd13b828 +DIST monotonic-1.0.tar.gz 7082 SHA256 47d7d045b3f2a08bffe683d761ef7f9131a2598db1cec7532a06720656cf719d SHA512 af2127ba56f346f0ccba324d7398b2c69b8ca3357dbd647eff4ecd8b843c28db935a1e16bf468e0c5e66b54a3bc63ebd24d4a8ea544c45ac22c01eb034322cc8 WHIRLPOOL 1d875e7aade716d670fda4fae34012200a258c234916719d843dd1a94d7ae89523ca8972c439d6aa3d7dfea73803c9df7145123f3b4a511f40ba2a5be300c89f diff --git a/dev-python/monotonic/monotonic-1.0.ebuild b/dev-python/monotonic/monotonic-1.0.ebuild new file mode 100644 index 000000000000..ce597396e26a --- /dev/null +++ b/dev-python/monotonic/monotonic-1.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) + +inherit distutils-r1 + +DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3" +HOMEPAGE="https://github.com/atdt/monotonic" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest new file mode 100644 index 000000000000..647f374e55c2 --- /dev/null +++ b/dev-python/oslo-cache/Manifest @@ -0,0 +1 @@ +DIST oslo-cache-1.5.0.tar.gz 36204 SHA256 a8810cac4b53535e26d9c12c75c49e08387c54577f2973379a8ff4bba45f418d SHA512 aeb9ec97c9b964b1a897b929426082a6a3900dca9b6e86a203338603fc94b57d3327e79a1b6ee2bb9364041b014e8a5b9e3ea330937d79f32ff111115fb3af0b WHIRLPOOL c0c1fa549f656b7eddafc08b1611690adb46b2ac0f4be1f44efc265dced9c06ec9744e0e923f2c857d00b4526fbcbc7fb13711734ac4a33a17116a376ce4830b diff --git a/dev-python/oslo-cache/metadata.xml b/dev-python/oslo-cache/metadata.xml new file mode 100644 index 000000000000..4688c947896d --- /dev/null +++ b/dev-python/oslo-cache/metadata.xml @@ -0,0 +1,11 @@ + + + + + prometheanfire@gentoo.org + Matthew Thode + + + Wraps the dogpile.cache library + + diff --git a/dev-python/oslo-cache/oslo-cache-1.5.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.5.0.ebuild new file mode 100644 index 000000000000..2fe2236a0ad1 --- /dev/null +++ b/dev-python/oslo-cache/oslo-cache-1.5.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) + +inherit distutils-r1 vcs-snapshot + +MY_PN=${PN/-/.} + +DESCRIPTION="Oslo Caching around dogpile.cache" +HOMEPAGE="https://launchpad.net/oslo" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + +CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} +" +RDEPEND=" + >=dev-python/Babel-1.3[${PYTHON_USEDEP}] + >=dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}] +" + +python_prepare_all() { + sed -i '/^hacking/d' test-requirements.txt || die + sed -i '/^argparse/d' requirements.txt || die + distutils-r1_python_prepare_all +} diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest index e7df940cdf2f..dc75d256d2ea 100644 --- a/dev-python/oslo-concurrency/Manifest +++ b/dev-python/oslo-concurrency/Manifest @@ -2,3 +2,4 @@ DIST oslo.concurrency-1.8.0.tar.gz 52531 SHA256 2070e04106d9d3bdffdd9729a1f0b62a DIST oslo.concurrency-1.8.1.tar.gz 53044 SHA256 12c5339c9263c994feb5c59290f7fb0eab12d6b729284efd01dd324c95bdecbb SHA512 227c16dd6916bd48ec937520650196b80bbbdf3988e7d6095eecd1ded601e207f24f63598881276591403e3b7c6e85f9adcce5a8ca210f82cffc75eff2351422 WHIRLPOOL 48bf1ffd9b04d0c5f199a8a6ff2deec6e25557a5af680450d30441b715edf0fea986c6620fb9a0ab722b13ca5f4664d39450db5e23cc96a331ed65532abf7a5a DIST oslo.concurrency-1.8.2.tar.gz 53278 SHA256 149f4c972916f14c14c97d7be7b92ba59497c1bbd09c114ee3681bef0773daca SHA512 b73b52cef9dca932b8d0b737bd544f0a6d138de701aa9d2309d6e7698af337e4aea5cbb47c78c2ebda14abc164b8cc2b40fee6c8e92a30ee674318f436cf3b94 WHIRLPOOL 1ad6cc6dc0d339b2bec4959539fdadfb0914b1677005e250b4e74da3be97310474d20514003b0c0f50a4c6dff021ac8efa25e1f9b4502f419ab9763117caa16e DIST oslo.concurrency-2.5.0.tar.gz 35903 SHA256 279c7cca885f69cfb7b3b50d686cd3d7c8d50dfb8eb13aada01bf733ef5ccc45 SHA512 866c3b7ea938c2b1fed7a004a34398b99fd6b084ca3c709a8448464f4845445a16fc1a016ea30b391190625ac53bf6756509dfbee28c89000f689743622246e0 WHIRLPOOL 0067b6d3089d94c41491e5e208392bad7cd7eebb9d7ba9c5300b985cfbad924273c30ec575674ba2177fe4ba3b17fe2dcd709c778753b013989bfb285070aa2b +DIST oslo.concurrency-3.6.0.tar.gz 39546 SHA256 21726ea22125ec3e6076cc13b64ef25b60b31b6eca646c57f0d152f295695353 SHA512 561f3e99f8e2a013b381b95f035a3bd7da5cc3989ba93019fd2abffcdec71cc4cef17b71c1eaf34922a90f0241d9551e5214f71f6fb1c17b83b3033d0e63dfe1 WHIRLPOOL 2cfc1adffb83e8fcd910bcab075a1c5c8a4f0ed4ecebb9cf74428b86ca688b031bac0cf3fabf2951deeda68228f4b4c46e6c9ff0a45cafa52669b5c98985b879 diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild new file mode 100644 index 000000000000..a9c8b22193e6 --- /dev/null +++ b/dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) + +inherit distutils-r1 + +DESCRIPTION="library for running multi-thread, multi-process applications" +HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency" +SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz" +S="${WORKDIR}/oslo.concurrency-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +CDPEND=" + >=dev-python/pbr-1.6[${PYTHON_USEDEP}] + + + + + prometheanfire@gentoo.org + Matthew Thode + + + A connection pool for pika. + + diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild new file mode 100644 index 000000000000..27e18dd85b38 --- /dev/null +++ b/dev-python/pika-pool/pika-pool-0.1.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) + +inherit distutils-r1 + +DESCRIPTION="A connection pool for pika." +HOMEPAGE="https://github.com/bninja/pika-pool" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=">=dev-python/pika-0.9[${PYTHON_USEDEP}] + + + + + prometheanfire@gentoo.org + Matthew Thode + + + A decorator which enforces only some args may be passed positionally. + + diff --git a/dev-python/positional/positional-1.0.1.ebuild b/dev-python/positional/positional-1.0.1.ebuild new file mode 100644 index 000000000000..037652a0ef4b --- /dev/null +++ b/dev-python/positional/positional-1.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 pypy ) + +inherit distutils-r1 + +DESCRIPTION="A decorator which enforces only some args may be passed positionally." +HOMEPAGE="https://github.com/morganfainberg/positional" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-1.6[${PYTHON_USEDEP}]" +RDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" 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 ae3cb378c8ee..15085b57f62a 100644 --- a/dev-python/py-amqp/py-amqp-1.4.9.ebuild +++ b/dev-python/py-amqp/py-amqp-1.4.9.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/dev-python/pycadf/pycadf-1.1.0.ebuild b/dev-python/pycadf/pycadf-1.1.0.ebuild index b2df3b9a20b0..560f539c1882 100644 --- a/dev-python/pycadf/pycadf-1.1.0.ebuild +++ b/dev-python/pycadf/pycadf-1.1.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/pysaml2/pysaml2-3.0.0.ebuild b/dev-python/pysaml2/pysaml2-3.0.0.ebuild index c9ccb9aa2faf..c323b3a8e0af 100644 --- a/dev-python/pysaml2/pysaml2-3.0.0.ebuild +++ b/dev-python/pysaml2/pysaml2-3.0.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/python-editor/python-editor-0.4.ebuild b/dev-python/python-editor/python-editor-0.4.ebuild index 91fb831aef39..2db4b77caeeb 100644 --- a/dev-python/python-editor/python-editor-0.4.ebuild +++ b/dev-python/python-editor/python-editor-0.4.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/python-memcached/python-memcached-1.57.ebuild b/dev-python/python-memcached/python-memcached-1.57.ebuild index 6cc00f92c551..7b780f953c05 100644 --- a/dev-python/python-memcached/python-memcached-1.57.ebuild +++ b/dev-python/python-memcached/python-memcached-1.57.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 pypy ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 pypy ) inherit distutils-r1 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 d1f95a6aaffe..00abdffb80f8 100644 --- a/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild +++ b/dev-python/python-sqlparse/python-sqlparse-0.1.18.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) inherit distutils-r1 diff --git a/dev-python/reno/reno-1.2.0.ebuild b/dev-python/reno/reno-1.2.0.ebuild index a55842086b97..33387ad65603 100644 --- a/dev-python/reno/reno-1.2.0.ebuild +++ b/dev-python/reno/reno-1.2.0.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 @@ -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/repoze-lru/repoze-lru-0.6-r1.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild index 9c87bc00d0b6..0ad1d2b6ca07 100644 --- a/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild +++ b/dev-python/repoze-lru/repoze-lru-0.6-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 diff --git a/dev-python/repoze-who/repoze-who-2.2.ebuild b/dev-python/repoze-who/repoze-who-2.2.ebuild index 822c8219655f..758e1aaf2c83 100644 --- a/dev-python/repoze-who/repoze-who-2.2.ebuild +++ b/dev-python/repoze-who/repoze-who-2.2.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild index b7a226edf1c5..e4d9a6b203a0 100644 --- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild +++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} ) inherit distutils-r1 diff --git a/dev-python/routes/routes-2.2.ebuild b/dev-python/routes/routes-2.2.ebuild index 2d06a69aef60..bc81d74c1c6b 100644 --- a/dev-python/routes/routes-2.2.ebuild +++ b/dev-python/routes/routes-2.2.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) inherit distutils-r1 diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild index 83cc39512b3e..32ad458d912a 100644 --- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild +++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD-2" 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" 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 a5682bf643ed..327bf25dfb8c 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.10.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 # py3 has a syntax errors. On testing it is underdone -PYTHON_COMPAT=( python2_7 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 ) inherit distutils-r1 diff --git a/dev-python/stevedore/stevedore-1.12.0.ebuild b/dev-python/stevedore/stevedore-1.12.0.ebuild index efb2e19253a2..ddef870f3b85 100644 --- a/dev-python/stevedore/stevedore-1.12.0.ebuild +++ b/dev-python/stevedore/stevedore-1.12.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-ruby/cliver/cliver-0.3.2.ebuild b/dev-ruby/cliver/cliver-0.3.2.ebuild index 851a62a55a93..3462d38c411b 100644 --- a/dev-ruby/cliver/cliver-0.3.2.ebuild +++ b/dev-ruby/cliver/cliver-0.3.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_RECIPE_TEST="rspec" diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest index cf12bc157f6e..a2454c4fcca2 100644 --- a/dev-ruby/hiera/Manifest +++ b/dev-ruby/hiera/Manifest @@ -4,3 +4,4 @@ DIST hiera-3.0.1.gem 35328 SHA256 8e0c8f1f9fc2200c7a5d4a5d70c7b1524f071d41cb1b06 DIST hiera-3.0.5.gem 36352 SHA256 197fc593eff00b84c27ae115ca6d4768ec7fc0004d57ff86ac395d81876a82eb SHA512 cfe708d17c442a91cf8b3d299c55ac219d49b8f793a642a00a4f5dcec3a7f7b94177f4c19a776a16b39526a5c455a3fd56847d460bad3fbde9a78a37b3ebbdd9 WHIRLPOOL 635910129b45ac2848e24ec309824ea09a37755763318743f9234ffe45dde9ddf74d95bd383ebe3f01b1cff970446be04b1f3a7b9716d68caafb43adea1b138a DIST hiera-3.0.6.gem 36352 SHA256 ce02aa03416d13aadbd36f87fc8bdfb7271313e7bbfa325ee7210f33d956664f SHA512 ce543973305aeccab29f1cf17fad54edbd5a8d1d201ca687d31bd4d6ee0f13f4250c7f1d87154bcfc911d8e13ea703aa7140e319d594d3709145b596643d488f WHIRLPOOL d0b60718b5c30f869bc8bc97693974b8675aa26ba5ac61a144ec08f0d9356491b72bbf251ebf7f6dc32fe52264b84ae811d97a599cafa7579399c0de99eae3c1 DIST hiera-3.1.0.gem 37376 SHA256 dfb9408e5e3c492e6bed72324ed5b6367667f7520571cdc60710737f4f9a1c17 SHA512 a42820e0a0f3b14443cfa09bd773bc5f1517ca1dea511e3ec2a1e51f999511a73f92baea055a7725b52a416c4eb85276bcd0b8676183011789d7f00e251a56ec WHIRLPOOL 1ecabd43da78b64b23deb1d76b84aa981d2b00311f2373b6c3e654b6f920d880a5876c4e08492ff1b3d4a400a6f9714005bf19edd2a8c3016fd3a300b9084b72 +DIST hiera-3.1.1.gem 39424 SHA256 03ca00c411506ad8c24f86f1d491d86731b8e5c1aea95c036a6793966ffd9790 SHA512 0684e0d5959881cc5363a1509e18cfd8c312814be2df9c13eb0c09eb4540e723dc6b6df0db8c7954bbb2040909dd549035e9c204adc071fc42ab5d61f8639b2f WHIRLPOOL d38af352c32c1bac574bc840630e48094973227a8ec51d79a98a2e4809a0a52ab25b9e5d827c08d905c6478645991c73cc6c1f2b879bbbb6b4341e5d3962e5ba diff --git a/dev-ruby/hiera/hiera-3.1.1.ebuild b/dev-ruby/hiera/hiera-3.1.1.ebuild new file mode 100644 index 000000000000..2cc9248da617 --- /dev/null +++ b/dev-ruby/hiera/hiera-3.1.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="A simple pluggable Hierarchical Database" +HOMEPAGE="http://projects.puppetlabs.com/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~hppa ~x86" + +ruby_add_bdepend "test? ( dev-ruby/mocha )" + +ruby_add_rdepend "dev-ruby/json + dev-ruby/deep_merge" + +all_ruby_prepare() { + # Our json package is either the compiled version or the pure + # version. Fix gemspec accordingly. + sed -i -e 's/json_pure/json/' ../metadata || die +} diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest index c5fb6daffd9c..b2ef2ade9007 100644 --- a/dev-ruby/jwt/Manifest +++ b/dev-ruby/jwt/Manifest @@ -1,2 +1,2 @@ -DIST jwt-1.5.2.tar.gz 21131 SHA256 6e628b77e541929f13118344e57511ca9dc08de7dcaf0dc0b6dc5dd3793faeb5 SHA512 9b56bf1fad65318f4c6a6d3bb09bad2ac2661704e4d0ae01eaac5b71bf0486abba573536afa1fa0f00b2b68ea445350f723ac5b73319b238c4d69f10b21d0773 WHIRLPOOL 87a9881eef08b15fdf1295543d332465280d56340d371b021c16663f2d6788944638bf4c9560f3d2f4b6982a105986d59824c0491c64ad40120e52ce252d1b88 DIST jwt-1.5.3.tar.gz 21972 SHA256 81442b60756812ca54134e4fe69e052c15ab0dc7c40030be415593699bec599b SHA512 6ef91237658911be11dd2bdbe6c16e285015784a0a3f4e756be9d5b9066533ac6891aac94889449b6e6137bfe8d91bd0ee3fa3239f5daf7751a562652481e976 WHIRLPOOL 4578fc0eafd26a912d9347d0c48ab502cad16f6179d9113bb5939d86b2d8edfc0c601485197ba6455023e3a1b0bdd5c8aed6911dccd914102fab2116f3c524a3 +DIST jwt-1.5.4.tar.gz 22053 SHA256 90be9e8acf3ad12a109092faebc3a050ea51eeb358e51798da2098fba9335bc2 SHA512 c594e7152d89a0ace71acd425553302de81fea2542fa23fc3809d8edbafa7498ec6cec37f07d41ebd5dfaad2b190d53614cf7b0f1c50a82cebb55cbd74c8909e WHIRLPOOL 93cef43f8ed630e4c987c386ca748574b00cea3e82733771fc259b3fe4f064a20319f9115d84d10723d4c708c9680ad024e4f81c74c3f1b544b984cbedf92419 diff --git a/dev-ruby/jwt/jwt-1.5.2.ebuild b/dev-ruby/jwt/jwt-1.5.4.ebuild similarity index 79% rename from dev-ruby/jwt/jwt-1.5.2.ebuild rename to dev-ruby/jwt/jwt-1.5.4.ebuild index c209bd695811..f51fc2810318 100644 --- a/dev-ruby/jwt/jwt-1.5.2.ebuild +++ b/dev-ruby/jwt/jwt-1.5.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$ @@ -13,14 +13,14 @@ inherit ruby-fakegem DESCRIPTION="A Ruby implementation of JSON Web Token draft 06" HOMEPAGE="https://github.com/jwt/ruby-jwt" -SRC_URI="https://github.com/jwt/ruby-jwt/archive/${P}.tar.gz" +SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" -RUBY_S="ruby-jwt-${P}" +RUBY_S="ruby-jwt-${PV}" all_ruby_prepare() { sed -i -e "/simplecov/ s:^:#:" \ diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest index 122250ea2d27..8c7d8951c51b 100644 --- a/dev-ruby/open4/Manifest +++ b/dev-ruby/open4/Manifest @@ -1,2 +1 @@ -DIST open4-1.3.3.gem 18944 SHA256 c1499107df3086a5d361fd5103d33468b9fa0fff794295142c6e70950554145e SHA512 e128043d53a4e47f60c21c1d827002f422a0bed102cfaeb716cf09a9d54970afc201c7457a241051557438a4ed16891431988f0b252d45dec50798be66f7e7a1 WHIRLPOOL 53ca88ba9d94a202e9a52c8a8b43061b2063ce1ff0d68a90f4552bc3431bbb4d7f2ad80d94ef22c72ad42f88c37606a8c1cf57af26eee8a16f9c8fc82dbc6f5a DIST open4-1.3.4.gem 18944 SHA256 a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1 SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb WHIRLPOOL 74d55311ecc0c973059cf7058d72a4b0d4c7e664bf9bfe0f825dbe7dac85f66272449ab18668089837a397c6162e10aa697feb605177d69b06fd75d281ea8a18 diff --git a/dev-ruby/open4/open4-1.3.3.ebuild b/dev-ruby/open4/open4-1.3.3.ebuild deleted file mode 100644 index 46ef01b7bf51..000000000000 --- a/dev-ruby/open4/open4-1.3.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -# jruby: not compatible with its fork implementation -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="README" - -inherit ruby-fakegem - -DESCRIPTION="Open3::popen3 with exit status" -HOMEPAGE="http://rubyforge.org/projects/codeforpeople/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/minitest )" - -all_ruby_prepare() { - mv rakefile Rakefile || die -} - -all_ruby_install() { - all_fakegem_install - - insinto /usr/share/doc/${PF}/samples - doins samples/* -} - -each_ruby_test() { - ${RUBY} -Ilib -Itest/support test/*.rb || die -} diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild index b6890ac0fe7a..97a193df278e 100644 --- a/dev-ruby/open4/open4-1.3.4.ebuild +++ b/dev-ruby/open4/open4-1.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="README" diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest index 5d86ca7df1f7..5d3bd3232a56 100644 --- a/dev-ruby/paint/Manifest +++ b/dev-ruby/paint/Manifest @@ -1,2 +1 @@ -DIST paint-1.0.0.tar.gz 18392 SHA256 b141f1c1ccb43ee1d7e3c6e4a42a9465846de0664efec8e2cd231e813f1eb7de SHA512 15461471d5a6eb08402e78bd9f86c99322d4e6ba1fc24054240190270021fdd2105070e99602799d65fed53f8065da012e0351462d82572cf7015760eb1946b1 WHIRLPOOL 11d55f6b42195dc3e436957f1f02936087d56416baafbfb29311300db24c8ac1056a1ce5dee0d3edd4fe413e2e281b6a8b0f1923f8207accbb11564dc93eb241 DIST paint-1.0.1.tar.gz 18598 SHA256 d717b4ef06302e7b05100aad269f9a89f398c913114ec4f07be9d68d5af2b269 SHA512 480f37fa22896636a591a6491a1329797f35a146ff92b623a4c287adfc52d67d972c61ba16e6d8c3135d985553bc19c12afffdf9bc161575d6dabe9131c4a359 WHIRLPOOL ef9d0e89b9084fbcb9dc9dc9cdf80175282e39c071da826ae03da323d3bf162738c65b26e7d225d101b8736fc85b211909ace88b1401be0a8423bc8f00a26bf6 diff --git a/dev-ruby/paint/paint-1.0.0.ebuild b/dev-ruby/paint/paint-1.0.0.ebuild deleted file mode 100644 index 33c7d5b664d9..000000000000 --- a/dev-ruby/paint/paint-1.0.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc" - -inherit ruby-fakegem - -DESCRIPTION="Terminal painter" -HOMEPAGE="https://github.com/janlelis/paint" -SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test doc" diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest index a887f1f61da5..d5dfeed2f7e9 100644 --- a/dev-util/gdbus-codegen/Manifest +++ b/dev-util/gdbus-codegen/Manifest @@ -1,2 +1,3 @@ DIST glib-2.44.1.tar.xz 7132940 SHA256 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888 WHIRLPOOL 6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7 DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb +DIST glib-2.48.0.tar.xz 7487800 SHA256 744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34 SHA512 684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5 WHIRLPOOL 39ddd7fd17ecc2100f2156165210d2cf68ae13724b252e42705bc89d0c4145cddca3a30f9e3bf9b6a2971cbffe0e108d2acae1200c8fe6d9db91b4b3953c4950 diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.48.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.48.0.ebuild new file mode 100644 index 000000000000..1eb55336256c --- /dev/null +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.48.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_REQ_USE="xml" + +inherit eutils gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +# To prevent circular dependencies with glib[test] +PDEPEND=">=dev-libs/glib-${PV}:2" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.40.0-sitedir.patch" + ) + distutils-r1_python_prepare_all + + sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest index 9bb6d3238c39..3ab6101d1012 100644 --- a/dev-util/gtk-doc-am/Manifest +++ b/dev-util/gtk-doc-am/Manifest @@ -1,2 +1,3 @@ DIST gtk-doc-1.21.tar.xz 647484 SHA256 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e SHA512 caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d WHIRLPOOL cd72184e6f58745573d8bec785b0a8c61f3f68ff9c20254dd6a03e113aeac1672a8408f03c84918c523e2031a98fd5d75990d9377ea8444c2ce7fdba03dfaccc DIST gtk-doc-1.24.tar.xz 669664 SHA256 b420759ea05c760301bada14e428f1b321f5312f44e10a176d6804822dabb58b SHA512 a0095efed339cb101dcd947fdc1789edd4a59d7005f6328c68973133795e34819fffdccb4591725b78f8409be95158604387deb681e78ebce0356503de1377a4 WHIRLPOOL b0af2db253147dbf58738e5e66964e6b2000cd3d30f3ef138c81d544a6c12ba2a3b32f71acf3b7677c8562fe945b1d63fe212b99b4f4bb53ccd256bcacb9ad71 +DIST gtk-doc-1.25.tar.xz 673184 SHA256 1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c WHIRLPOOL 6e1acc14d6d034a8c42af36fef866da9805043b15e49fe1bf3dbe484bf8970b1f3f005c28ec390ab6b6914ae8c22864b59c864bc3d50aada09e9dac5ee850a70 diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild new file mode 100644 index 000000000000..73627a8c9417 --- /dev/null +++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GNOME_ORG_MODULE="gtk-doc" + +inherit gnome.org + +DESCRIPTION="Automake files from gtk-doc" +HOMEPAGE="http://www.gtk.org/gtk-doc/" + +LICENSE="GPL-2 FDL-1.1" +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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=dev-lang/perl-5.6" +DEPEND="${RDEPEND} + virtual/pkgconfig + != 5.6.0 is required for gtk-doc" + + # Replicate AC_SUBST + sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \ + "${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!" +} + +src_compile() { + : +} + +src_install() { + dobin gtkdoc-rebase + + insinto /usr/share/aclocal + doins gtk-doc.m4 +} diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index 9bb6d3238c39..3ab6101d1012 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1,2 +1,3 @@ DIST gtk-doc-1.21.tar.xz 647484 SHA256 5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e SHA512 caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d WHIRLPOOL cd72184e6f58745573d8bec785b0a8c61f3f68ff9c20254dd6a03e113aeac1672a8408f03c84918c523e2031a98fd5d75990d9377ea8444c2ce7fdba03dfaccc DIST gtk-doc-1.24.tar.xz 669664 SHA256 b420759ea05c760301bada14e428f1b321f5312f44e10a176d6804822dabb58b SHA512 a0095efed339cb101dcd947fdc1789edd4a59d7005f6328c68973133795e34819fffdccb4591725b78f8409be95158604387deb681e78ebce0356503de1377a4 WHIRLPOOL b0af2db253147dbf58738e5e66964e6b2000cd3d30f3ef138c81d544a6c12ba2a3b32f71acf3b7677c8562fe945b1d63fe212b99b4f4bb53ccd256bcacb9ad71 +DIST gtk-doc-1.25.tar.xz 673184 SHA256 1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c WHIRLPOOL 6e1acc14d6d034a8c42af36fef866da9805043b15e49fe1bf3dbe484bf8970b1f3f005c28ec390ab6b6914ae8c22864b59c864bc3d50aada09e9dac5ee850a70 diff --git a/dev-util/gtk-doc/gtk-doc-1.25.ebuild b/dev-util/gtk-doc/gtk-doc-1.25.ebuild new file mode 100644 index 000000000000..a4ef05afe813 --- /dev/null +++ b/dev-util/gtk-doc/gtk-doc-1.25.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +GCONF_DEBUG="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo + +DESCRIPTION="GTK+ Documentation Generator" +HOMEPAGE="http://www.gtk.org/gtk-doc/" + +LICENSE="GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris" + +IUSE="doc emacs highlight vim" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + >=dev-libs/glib-2.6:2 + >=dev-lang/perl-5.6 + >=app-text/openjade-1.3.1 + dev-libs/libxslt + >=dev-libs/libxml2-2.3.6:2 + ~app-text/docbook-xml-dtd-4.3 + app-text/docbook-xsl-stylesheets + ~app-text/docbook-sgml-dtd-3.0 + >=app-text/docbook-dsssl-stylesheets-1.40 + emacs? ( virtual/emacs ) + highlight? ( + vim? ( || ( app-editors/vim app-editors/gvim ) ) + !vim? ( dev-util/source-highlight ) + ) +" +DEPEND="${RDEPEND} + ~dev-util/gtk-doc-am-${PV} + app-text/yelp-tools + virtual/pkgconfig +" + +pkg_setup() { + DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. + You may set your own key bindings for \"gtk-doc-insert\" and + \"gtk-doc-insert-section\" in your ~/.emacs file." + SITEFILE=61${PN}-gentoo.el + python-single-r1_pkg_setup +} + +src_prepare() { + # Remove global Emacs keybindings, bug #184588 + epatch "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch + + gnome2_src_prepare +} + +src_configure() { + local myconf + if use vim; then + myconf="${myconf} $(use_with highlight highlight vim)" + else + myconf="${myconf} $(use_with highlight highlight source-highlight)" + fi + + gnome2_src_configure \ + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ + ${myconf} +} + +src_compile() { + gnome2_src_compile + use emacs && elisp-compile tools/gtk-doc.el +} + +src_install() { + gnome2_src_install + + python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan + + # Don't install those files, they are in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase" + + if use doc; then + docinto doc + dodoc doc/* + docinto examples + dodoc examples/* + fi + + if use emacs; then + elisp-install ${PN} tools/gtk-doc.el* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + readme.gentoo_create_doc + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + if use emacs; then + elisp-site-regen + readme.gentoo_print_elog + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + use emacs && elisp-site-regen +} diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index a05d3bcf365d..b05f32d41381 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,2 +1 @@ -DIST meld-3.14.1.tar.xz 496100 SHA256 f43f750ed00da7925ecc70d6c5fc398c46ccf5af2f9e14b42c9a8afc7fbc06a3 SHA512 dd32ff3012be14050f1c647fad2eb91b7018dbee1957b5609021283b8f769183e00ba8ef97f5ba6b9ace31e7344549075c9e4509d9140433e3fe8a6144a957cd WHIRLPOOL 41459e736ec817856724aa8d01e6d009bc132d7db156a74b6d7a79d489d93096fded213c5ff277e83dc8812832289e24ad6f86920c64babd7402cc6cbc08b775 DIST meld-3.14.2.tar.xz 505488 SHA256 4a3c0951cd3b7e7ae2480f66adfb0e50b3bd301821d6e2adb518130446231873 SHA512 a74b07db0e3ce4186d2ef4d2156ed1ad1a0cd39d953e999d75d457345d1a294fe0832049531b78fc8e75a038b07991fbfbcdf745d74e5b2802199a35007333b1 WHIRLPOOL 69823c4bc555e12f3b80c8f35f61fe44a22e246c2093e0535d69fadbcf5a55bf2e6ddc611ae2d5368173e4620d373cd26c85571d0e5648ebf82216ffcae6adf7 diff --git a/dev-util/meld/meld-3.14.1.ebuild b/dev-util/meld/meld-3.14.1.ebuild deleted file mode 100644 index bf465c68b4c3..000000000000 --- a/dev-util/meld/meld-3.14.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_REQ_USE="xml" -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit gnome2 distutils-r1 - -DESCRIPTION="A graphical diff and merge tool" -HOMEPAGE="http://meldmerge.org/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.36:2[dbus] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}] - gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.12:3[introspection] - >=x11-libs/gtksourceview-3.10:3.0[introspection] - x11-themes/hicolor-icon-theme -" -DEPEND="${RDEPEND} - dev-util/intltool - dev-util/itstool - sys-devel/gettext -" - -python_compile_all() { - mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) -} diff --git a/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch b/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch new file mode 100644 index 000000000000..4af6f890ec40 --- /dev/null +++ b/dev-vcs/gitstats/files/gitstats-0_pre131024-filter-invalid-unicode.patch @@ -0,0 +1,11 @@ +--- gitstats 2016-03-24 10:57:18.000000000 -0300 ++++ gitstats.mod 2016-03-24 10:57:11.355016439 -0300 +@@ -321,7 +321,7 @@ + + # Collect revision statistics + # Outputs " diff --git a/net-nntp/nzbget/nzbget-17.0_pre1660.ebuild b/net-nntp/nzbget/nzbget-17.0_pre1660.ebuild new file mode 100644 index 000000000000..f184e35bf8d0 --- /dev/null +++ b/net-nntp/nzbget/nzbget-17.0_pre1660.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools eutils flag-o-matic user + +MY_PV=${PV/_pre/-r} +MY_P=${PN}-${PV/_pre/-testing-r} + +DESCRIPTION="A command-line based binary newsgrapper supporting .nzb files" +HOMEPAGE="http://nzbget.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="debug gnutls ncurses parcheck ssl test zlib" + +RDEPEND="dev-libs/libxml2 + ncurses? ( sys-libs/ncurses:0 ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl:0= ) + ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + virtual/pkgconfig" +DOCS=( ChangeLog README nzbget.conf ) + +S=${WORKDIR}/${PN}-${PV/_pre*/-testing} + +# Fix linking for ncurses[tinfo] +# https://github.com/nzbget/nzbget/issues/188 +# https://bugs.gentoo.org/527262 + +# Add a missing autoconf macro +# https://github.com/nzbget/nzbget/pull/189 +PATCHES=( + "${FILESDIR}/${PN}-14.0_pre1145-tinfo.patch" + "${FILESDIR}/${PN}-17.0_pre1660-add-missing-macro.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then + eerror "${P} requires a C++14-capable compiler. Your current compiler" + eerror "does not seem to support the -std=c++14 option. Please" + eerror "upgrade to gcc-4.9 or an equivalent version supporting C++14." + die "The currently active compiler does not support -std=c++14" + fi +} + +src_prepare() { + default + sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die + + sed \ + -e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \ + -e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \ + -e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \ + -e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \ + -e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \ + -e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \ + nzbget.conf > nzbgetd.conf || die + + # Don't install a duplicate README which causes make install to fail + # https://github.com/nzbget/nzbget/issues/135 + sed -i "\|^\tlib/par2/README|d" Makefile.am || die + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable ncurses curses) \ + $(use_enable parcheck) \ + $(use_enable ssl tls) \ + $(use_enable zlib gzip) \ + $(use_enable test tests) \ + --with-tlslib=$(usex gnutls GnuTLS OpenSSL) +} + +src_test() { + ./nzbget --tests || die "Tests failed" +} + +src_install() { + default + + insinto /etc + doins nzbget.conf + doins nzbgetd.conf + + keepdir /var/lib/nzbget/{dst,nzb,queue,tmp} + keepdir /var/log/nzbget + + newinitd "${FILESDIR}"/nzbget.initd nzbget + newconfd "${FILESDIR}"/nzbget.confd nzbget +} + +pkg_preinst() { + enewgroup nzbget + enewuser nzbget -1 -1 /var/lib/nzbget nzbget + + fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp} + fperms 750 /var/lib/nzbget/{queue,tmp} + fperms 770 /var/lib/nzbget/{dst,nzb} + + fowners nzbget:nzbget /var/log/nzbget + fperms 750 /var/log/nzbget + + fowners nzbget:nzbget /etc/nzbgetd.conf + fperms 640 /etc/nzbgetd.conf +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog + elog "Please add users that you want to be able to use the system-wide" + elog "nzbget daemon to the nzbget group. To access the daemon run nzbget" + elog "with the --configfile /etc/nzbgetd.conf option." + elog + fi +} diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest index d45bf2469639..223d3e13a64c 100644 --- a/net-p2p/airdcpp-webclient/Manifest +++ b/net-p2p/airdcpp-webclient/Manifest @@ -1,3 +1,3 @@ -DIST airdcpp-webclient-0.16.5.tar.gz 702187 SHA256 d153621ce390ee5d434a63d8af5d46b4b54638984de35ee8340ca63f27f61e16 SHA512 decc359aa569de8d3ae117a7f9ce38d9234564401072a776271ce7dff1e24022ad8d01fbf9cf4cc5238778c3c0cb7031b33e2e8d6a1014034ef507a8c29a6f7b WHIRLPOOL 3c71a391dd3e7a5defa5ec8a3abf580b5850abade28b763ad2548f0cc6df5345002c3a07e7e9db33abdedbd60740b62fc27fb0f8af5022353ac35cb826437e18 DIST airdcpp-webclient-1.0.0.tar.gz 705277 SHA256 46c19884e220f39924a59c98d09743f2e9017a11bc81f7f95f5419798627813b SHA512 5a8523f15f6ee598d9b5dde502a80831ab8bb7c36c2fa60abb88232619c1e0f64ee3a2d08f1f90ec1a8af6ee0571733f353514522975614fc036d9f6655610ac WHIRLPOOL ef9aad1bc02fdcf66355ceea9302bacb79a69561b507963cec59bfb9f423d17316edcbccb1edba596e0acd93971eaf6f45661f5f90b3d16b007ed42b39e67535 DIST airdcpp-webclient-1.0.1.tar.gz 705436 SHA256 865cb00afa63076ebc1e9f8136380452f8b4d264b8381814cd209acb48525c6c SHA512 5312758d80741434941d43b1312689a25cb96f2e50ca4392074e356dc619d6949fd4ba8a6830ddb0ceb194d2f5a6616eb3b2e772d71efaeb1c49a53fcc5eb541 WHIRLPOOL 804ef5af06aa406511e10b22e320c031d59777d8f5e4ce1dfb02ea03559558741ff5ed6659c6a9175d6f4e1d9e87e0d564a01c9d23d0cba36bf1cf428d018e83 +DIST airdcpp-webclient-1.0.2.tar.gz 705947 SHA256 ab5e23438d4a5ed820e5994f758a5e534ea2693096399b152c4e00f654a791fc SHA512 11b09adec44e594ca96f7bc3df81f2739f1f00261406d19277f97b336ff5a71281ad40d2b1f7238fbe1d0461e959f64e6391620ebd38166664e3a47f694d56d5 WHIRLPOOL 67f016e4a0b69410c91de188fc456913a04322fdc7a077fd1830338eaa6db2a8e5450791b9339c222e429ebb87419e8fa0accb420909b4dbe2e27f6ab0bedb26 diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.2.ebuild similarity index 65% rename from net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild rename to net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.2.ebuild index fd9a9a6f2593..9c383243f1bd 100644 --- a/net-p2p/airdcpp-webclient/airdcpp-webclient-0.16.5.ebuild +++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.0.2.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit cmake-utils +inherit cmake-utils user DESCRIPTION="Cross-platform Direct Connect client" HOMEPAGE="https://github.com/airdcpp-web/airdcpp-webclient" @@ -13,23 +13,23 @@ SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g KEYWORDS="~amd64 ~x86" LICENSE="GPL-2" SLOT="0" -IUSE="+webui" +IUSE="nat-pmp +tbb +webui" RDEPEND=" - dev-libs/geoip app-arch/bzip2 - sys-libs/zlib - dev-libs/openssl:0 - dev-cpp/tbb - virtual/libiconv - net-libs/miniupnpc - net-libs/libnatpmp - dev-libs/leveldb dev-cpp/websocketpp dev-libs/boost + dev-libs/geoip + dev-libs/leveldb + dev-libs/openssl:0= + net-libs/miniupnpc + sys-libs/zlib + virtual/libiconv + nat-pmp? ( net-libs/libnatpmp ) + tbb? ( dev-cpp/tbb ) " DEPEND=" - net-libs/nodejs + dev-lang/python:* ${RDEPEND} " PDEPEND="webui? ( www-apps/airdcpp-webui )" @@ -42,6 +42,19 @@ src_configure() { cmake-utils_src_configure } +src_install() { + newconfd "${FILESDIR}/airdcppd.confd" airdcppd + newinitd "${FILESDIR}/airdcppd.initd" airdcppd + keepdir /var/lib/airdcppd + fowners airdcppd:airdcppd /var/lib/airdcppd + cmake-utils_src_install +} + +pkg_setup() { + enewgroup airdcppd + enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd +} + pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then elog "Run 'airdcppd --configure' to set up ports and authentication" diff --git a/net-p2p/bitcoind/bitcoind-0.12.0.ebuild b/net-p2p/bitcoind/bitcoind-0.12.0.ebuild index 2da79b5cc12b..38ecc9addb7a 100644 --- a/net-p2p/bitcoind/bitcoind-0.12.0.ebuild +++ b/net-p2p/bitcoind/bitcoind-0.12.0.ebuild @@ -61,7 +61,7 @@ src_install() { if use examples; then docinto examples - dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh} + dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh} use zeromq && dodoc -r contrib/zmq fi diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild index 979b901baa3c..1ab5fea5ba41 100644 --- a/net-p2p/bitcoind/bitcoind-9999.ebuild +++ b/net-p2p/bitcoind/bitcoind-9999.ebuild @@ -57,7 +57,7 @@ src_install() { if use examples; then docinto examples - dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh} + dodoc -r contrib/{pyminer,qos,spendfrom,tidy_datadir.sh} use zeromq && dodoc -r contrib/zmq fi diff --git a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild index 276c3a070657..b8ea0439a8c3 100644 --- a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild +++ b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild @@ -50,6 +50,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-disable-ijs.patch #574992 epatch "${FILESDIR}"/${P}-gstoraster.patch + epatch "${FILESDIR}"/${P}-configure-PKG_CONFIG.patch eautoreconf } diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch b/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch new file mode 100644 index 000000000000..6263c4a0d2cf --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch @@ -0,0 +1,107 @@ +Use PKG_CHECK_MODULES() / $PKG_CONFIG + +Autotools docs suggest that the $PKG_CONFIG variable should be respected: + +https://autotools.io/pkgconfig/cross-compiling.html + +However, we aren't using the autotools macros properly, and we ignore +$PKG_CONFIG for the most part. This causes problems for some cross-compilation +environments which rely on it. + +This patch fixes up configure.ac to use PKG_CHECK_MODULES() for most things, +and to appropriately use $PKG_CONFIG (instead of self-derived $PKGCONFIG) for +the remainder. + +Reported (and accepted) here: + + https://bugs.linuxfoundation.org/show_bug.cgi?id=1347 + +--- +=== modified file 'configure.ac' +--- configure.ac 2016-03-03 19:46:43 +0000 ++++ configure.ac 2016-03-21 20:59:37 +0000 +@@ -249,9 +249,6 @@ + # Check for modules needed by utils/ + # ================================== + +-dnl Check for pkg-config, which is used for some other tests later on... +-AC_PATH_PROG(PKGCONFIG, pkg-config) +- + dnl Avahi for cups-browsed + AVAHI_LIBS="" + AVAHI_CFLAGS="" +@@ -272,17 +269,9 @@ + [AS_HELP_STRING([--with-avahi-includes], [Set directory for Avahi includes])], + AVAHI_CFLAGS="-I$withval $AVAHI_CFLAGS",) + +-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then +- AC_MSG_CHECKING(for Avahi) +- if $PKGCONFIG --exists avahi-client; then +- AC_MSG_RESULT(yes) +- AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`" +- AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`" +- AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library]) +- else +- AC_MSG_RESULT(no) +- enable_avahi=no +- fi ++if test "x$enable_avahi" != xno; then ++ PKG_CHECK_MODULES(AVAHI, avahi-client, ++ [AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])]) + fi + + AC_SUBST(AVAHI_LIBS) +@@ -336,26 +325,18 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then ++if test x$enable_avahi != xno; then + PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib]) + fi + + AC_SUBST(AVAHI_GLIB_CFLAGS) + AC_SUBST(AVAHI_GLIB_LIBS) + +-GIO_CFLAGS="" +-GIO_LIBS="" +-if test "x$PKGCONFIG" != x; then +- PKG_CHECK_MODULES(GIO, [gio-2.0]) +-fi ++PKG_CHECK_MODULES(GIO, [gio-2.0]) + AC_SUBST(GIO_CFLAGS) + AC_SUBST(GIO_LIBS) + +-GIO_UNIX_CFLAGS="" +-GIO_UNIX_LIBS="" +-if test "x$PKGCONFIG" != x; then +- PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0]) +-fi ++PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0]) + AC_SUBST(GIO_UNIX_CFLAGS) + AC_SUBST(GIO_UNIX_LIBS) + +@@ -715,17 +696,17 @@ + AC_ARG_ENABLE(braille, AS_HELP_STRING([--enable-braille],[enable Braille embosing filters, requires liblouis]), + enable_braille=$enableval,enable_braille=yes) + AC_MSG_CHECKING(for liblouis) +-if $PKGCONFIG --exists liblouis; then ++PKG_CHECK_EXISTS([liblouis], [ + AC_MSG_RESULT(yes) +- if test "x$PKGCONFIG" != x -a "x$enable_braille" = xyes; then +- TABLESDIR=`$PKGCONFIG --variable=tablesdir liblouis` ++ if test "x$enable_braille" = xyes; then ++ TABLESDIR=`$PKG_CONFIG --variable=tablesdir liblouis` + else + TABLESDIR=/usr/share/liblouis/tables + fi +-else ++], [ + AC_MSG_RESULT(no) + TABLESDIR=/usr/share/liblouis/tables +-fi ++]) + AM_CONDITIONAL(ENABLE_BRAILLE, test "x$enable_braille" = xyes) + AC_SUBST(TABLESDIR) + + diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 743df0f35459..f6728ebca3c7 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -288,7 +288,7 @@ multilib_src_install_all() { keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ /var/log/cups /var/spool/cups/tmp - keepdir /etc/cups/{interfaces,ppd,ssl} + keepdir /etc/cups/{ppd,ssl} use X || rm -r "${ED}"/usr/share/applications diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 2f20df380c37..b75ee141d933 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -5,6 +5,10 @@ # This file requires >=portage-2.1.1 # New entries go on top. +# Pawel Hajdan jr (25 Mar 2016) +# System ffmpeg build is broken in recent chromium (bug #576372). +>=www-client/chromium-50.0.2657.0 system-ffmpeg + # Maciej Mrozowski (23 Mar 2016) # Experimental cairo-qt backend (see bug #568000). app-text/poppler cairo-qt diff --git a/profiles/desc/input_devices.desc b/profiles/desc/input_devices.desc index 8b78071c04ea..b34e84c16f5b 100644 --- a/profiles/desc/input_devices.desc +++ b/profiles/desc/input_devices.desc @@ -33,6 +33,7 @@ penmount - INPUT_DEVICES setting to build driver for penmount input devices roccat_arvo - INPUT_DEVICES setting to build driver for Roccat Arvo input devices roccat_isku - INPUT_DEVICES setting to build driver for Roccat Isku input devices roccat_iskufx - INPUT_DEVICES setting to build driver for Roccat Isku Fx input devices +roccat_kiro - INPUT_DEVICES setting to build driver for Roccat Kiro input devices roccat_kone - INPUT_DEVICES setting to build driver for Roccat Kone input devices roccat_koneplus - INPUT_DEVICES setting to build driver for Roccat Kone[+] input devices roccat_konepure - INPUT_DEVICES setting to build driver for Roccat Kone Pure input devices @@ -41,6 +42,7 @@ roccat_konepureoptical - INPUT_DEVICES setting to build driver for Roccat Kone P roccat_konextd - INPUT_DEVICES setting to build driver for Roccat KoneXTD input devices roccat_konextdoptical - INPUT_DEVICES setting to build driver for Roccat KoneXTD Optical input devices roccat_kovaplus - INPUT_DEVICES setting to build driver for Roccat Kova[+] input devices +roccat_kova2016 - INPUT_DEVICES setting to build driver for Roccat Kova 2016 input devices roccat_lua - INPUT_DEVICES setting to build driver for Roccat Lua input devices roccat_nyth - INPUT_DEVICES setting to build driver for Roccat Nyth input devices roccat_pyra - INPUT_DEVICES setting to build driver for Roccat Pyra input devices diff --git a/profiles/license_groups b/profiles/license_groups index c6ac74627a62..b49b29f29165 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -13,13 +13,13 @@ # http://www.gnu.org/licenses/license-list.html # GPL or LGPL with various exceptions are also included here, because # they are more permissive than the licenses they are based on. -GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3+ GPL-3-with-font-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ libwebsockets metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community the-Click-license Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 ZLIB ZPL +GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3+ GPL-3-with-font-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ libwebsockets metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 ZLIB ZPL FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EUPL-1.1 gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 # http://www.opensource.org/licenses # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0 -OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat the-Click-license UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL +OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL # Misc licenses that are probably free software, i.e. follow the # Free Software Definition at http://www.gnu.org/philosophy/free-sw.html diff --git a/profiles/package.mask b/profiles/package.mask index bd8b25d464b2..ac64c367e240 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,28 @@ #--- END OF EXAMPLES --- +# Michael Palimaka (24 Mar 2016) +# Requires old llvm. Dead upstream. +# Masked for removal in 30 days. Bug #571216. +dev-python/llvmpy +dev-python/llvmmath +dev-python/pykit + +# José María Alonso (24 Mar 2016) +# Fails to build dev-lisp/sbcl-1.3.3 #563812 +=dev-lisp/asdf-3.1.7 +=dev-lisp/uiop-3.1.7 + +# Michael Palimaka (24 Mar 2016) +# Doesn't run. Unmaintained. Bug #304865. +# Masked for removal in 30 days. +app-cdr/qmultirecord + +# Michael Palimaka (24 Mar 2016) +# Fails to build. Bug #368953. +# Masked for removal in 30 days. +net-p2p/hx + # Aaron Bauman (19 Mar 2016) # Unpatched security vulnerability per bug #521892. # Masked for removal in 30 days. diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask index 580c39a542b0..4d1375a4ae0c 100644 --- a/profiles/releases/13.0/package.mask +++ b/profiles/releases/13.0/package.mask @@ -1,7 +1,3 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ - -# Andreas K. Huettel (14 Jan 2013) -# Mask portage versions not supporting EAPI=5 - py-compile + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + cp -a "${S}" "${WORKDIR}/${php_slot}" || die + done + fi } src_configure() { @@ -55,23 +66,40 @@ src_configure() { local PHP_CONFIG local php_libdir="${EROOT}usr/$(get_libdir)" + econf \ + $(use_enable python) \ + $(use_enable ruby) \ + --disable-php \ + $(use_enable static-libs static) + if use php; then local php_slot for php_slot in $(php_get_slots); do PHP_CONFIG="${php_libdir}/${php_slot}/bin/php-config" [[ -e "${PHP_CONFIG}" ]] && export PHP_CONFIG + pushd "${WORKDIR}/${php_slot}" > /dev/null || die + econf \ + --disable-python \ + --disable-ruby \ + --enable-php \ + --disable-static + popd > /dev/null || die done fi - - econf \ - $(use_enable python) \ - $(use_enable ruby) \ - $(use_enable php) \ - $(use_enable static-libs static) } src_compile() { emake + if use php; then + local php_slot + for php_slot in $(php_get_slots); do + pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die + rm -r ../capi || die + ln -sfr "${S}/capi" ../capi + emake + popd > /dev/null || die + done + fi use doc && emake -C "${S}/doc" doxygen-html } @@ -84,9 +112,15 @@ src_install() { if use php; then local php_slot - local libpath="lib/extensions/no-debug-non-zts-20131226/geos.so" + local libpath + local php_libdir="${EROOT}usr/$(get_libdir)" for php_slot in $(php_get_slots); do + pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die + emake DESTDIR="${D}" install + popd > /dev/null || die + # The libpath will vary by slot as the extension-dir is tied to the API date + libpath="lib/extensions/$(${php_libdir}/${php_slot}/bin/php-config --extension-dir | grep -o '[^/]*$')/geos.so" local lib="${D}/usr/$(get_libdir)/${php_slot}/${libpath}" if [[ -e "${lib}" ]]; then chrpath -d ${lib} || die "Failed cleaning RPATH on '${lib}'" diff --git a/sci-libs/io_lib/Manifest b/sci-libs/io_lib/Manifest index a8e2cb6093b4..4ac0ff55996a 100644 --- a/sci-libs/io_lib/Manifest +++ b/sci-libs/io_lib/Manifest @@ -2,3 +2,4 @@ DIST io_lib-1.10.1.tar.gz 254965 SHA256 380c9d584b2c851adcf02c8e40b8ecc86b292245 DIST io_lib-1.11.2.1.tar.gz 385229 SHA256 5a7b90aec5971286200ebe42bf4105b58476f464d577d5c21245d64870a4596d SHA512 56c2f76bd8ea1d6a1e03bce005a03df73b8b3397e482e1537620fda9fadd9128bf2fe6789283dc75a77ed5f8424e31a2f81f2a54dbb2b93886b52eb0613843b8 WHIRLPOOL 91d82540b6f56779f983de09870ff42d5184a7c44742e2c1d69c4e932b951e7c934ebfaf0ebef8d4b66f1cdde975859fc3ed7506213c31db524adeca069fefe0 DIST io_lib-1.12.5.tar.gz 782430 SHA256 0bcecddaad5e94f1f9d2e9f2ae37e4303b6e8d0c9f6dabecb6bbebd6816fe80f SHA512 414406fc26e0c991c0390bfa5d28d7682a458efbaa51f58df699665e6ff6f9ac3bda724508bf3b5f5cf666983bc2efec53ff719783fe14f54e79d54ca20158d0 WHIRLPOOL 41dc2264401faa145a64ba5544e85fb02be2418a087561bc966a1fb66267e66e7683f3cfd658428a92b4952e776bd1952eba4e4c69921180afea110a230e4e6d DIST io_lib-1.13.2.tar.gz 1579795 SHA256 780b1a52a3d3b96dd92b855623f7085a709978925e4e0eb25a8fc9e56a917df0 SHA512 2192c93a730f5fb6658f75fe6688605c813fcbeef8765d6b372c11a09e746536fdba7fcd20bc95bae3b11dfed0cd1bb52d6dd40cf33747164da91cb94a6ebcf9 WHIRLPOOL 01aedfa2dbe2b7742b901d60c0103b237246a5aa0d67848a503d89690fc94a93af4276f38aa1dfbaa85e58bec60041dc230743e8d6783b37e1df6489baba46e4 +DIST io_lib-1.14.7.tar.gz 2177248 SHA256 e75e463f62cd97bf58cf52bed76362af5e19823248be858dfeb85bdca107c754 SHA512 c1021f0a0dd284e8abbf9cc1dd11995550cf6621455c873effaab56b573fee053ed9e55879003c735c26c403a0aa34d75be87d337cd515cc912706abe7e08665 WHIRLPOOL 43a97772cfa1e9684ed0866c243fa32a6647290ba0bd40b6edf0dce01542249216a08337acca81f06f1a7b54b561ee84cf7c66872234b0b6c8b3f60595373e1d diff --git a/sci-libs/io_lib/io_lib-1.14.7.ebuild b/sci-libs/io_lib/io_lib-1.14.7.ebuild new file mode 100644 index 000000000000..b05d7955fe92 --- /dev/null +++ b/sci-libs/io_lib/io_lib-1.14.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +DESCRIPTION="General purpose trace and experiment file reading/writing interface" +HOMEPAGE="http://staden.sourceforge.net/" +SRC_URI="mirror://sourceforge/staden/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +DEPEND=" + net-misc/curl + sys-libs/zlib" +RDEPEND="${DEPEND}" + +# tests fails and might need sci-biology/staden from +# the science overlay + +RESTRICT="test" + +src_configure() { + econf $(use static-libs static) +} + +src_install() { + default + use static-libs || prune_libtool_files + dodoc docs/{Hash_File_Format,ZTR_format} +} diff --git a/sci-libs/libaec/libaec-0.3.2.ebuild b/sci-libs/libaec/libaec-0.3.2.ebuild index 6bc37f2e7e92..f28cf63e369c 100644 --- a/sci-libs/libaec/libaec-0.3.2.ebuild +++ b/sci-libs/libaec/libaec-0.3.2.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Adaptive Entropy Coding library" HOMEPAGE="https://www.dkrz.de/redmine/projects/aec" SRC_URI="https://www.dkrz.de/redmine/attachments/download/${PID}/${P}.tar.gz" -LICENSE="LIBAEC" +LICENSE="BSD-2" SLOT="0/2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs +szip" diff --git a/sys-apps/duc/duc-1.4.1.ebuild b/sys-apps/duc/duc-1.4.1-r1.ebuild similarity index 85% rename from sys-apps/duc/duc-1.4.1.ebuild rename to sys-apps/duc/duc-1.4.1-r1.ebuild index 3c2974ee0706..579a78bd347a 100644 --- a/sys-apps/duc/duc-1.4.1.ebuild +++ b/sys-apps/duc/duc-1.4.1-r1.ebuild @@ -4,9 +4,7 @@ EAPI=5 -AUTOTOOLS_AUTORECONF="true" -AUTOTOOLS_IN_SOURCE_BUILD="true" -inherit autotools-utils +inherit autotools if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -37,7 +35,7 @@ DEPEND=" x11-libs/libX11 x11-libs/pango[X] ) - !X? ( virtual/opengl ) + !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) @@ -57,14 +55,13 @@ src_unpack() { src_prepare() { sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die - autotools-utils_src_prepare + default + + eautoreconf } src_configure() { - local myconf=( - --disable-static - $(use_with ncurses ui) - ) + local myconf=( $(use_enable ncurses ui) ) if use tokyocabinet; then myconf+=( --with-db-backend=tokyocabinet ) @@ -83,8 +80,8 @@ src_configure() { myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) ) else # No GUI - myconf+=( $(use_enable cairo) ) + myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl ) fi - autotools-utils_src_configure + econf ${myconf[@]} } diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild index 3c2974ee0706..579a78bd347a 100644 --- a/sys-apps/duc/duc-9999.ebuild +++ b/sys-apps/duc/duc-9999.ebuild @@ -4,9 +4,7 @@ EAPI=5 -AUTOTOOLS_AUTORECONF="true" -AUTOTOOLS_IN_SOURCE_BUILD="true" -inherit autotools-utils +inherit autotools if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -37,7 +35,7 @@ DEPEND=" x11-libs/libX11 x11-libs/pango[X] ) - !X? ( virtual/opengl ) + !X? ( >=media-libs/glfw-3.0 ) ) leveldb? ( dev-libs/leveldb ) ncurses? ( sys-libs/ncurses:= ) @@ -57,14 +55,13 @@ src_unpack() { src_prepare() { sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die - autotools-utils_src_prepare + default + + eautoreconf } src_configure() { - local myconf=( - --disable-static - $(use_with ncurses ui) - ) + local myconf=( $(use_enable ncurses ui) ) if use tokyocabinet; then myconf+=( --with-db-backend=tokyocabinet ) @@ -83,8 +80,8 @@ src_configure() { myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) ) else # No GUI - myconf+=( $(use_enable cairo) ) + myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl ) fi - autotools-utils_src_configure + econf ${myconf[@]} } diff --git a/sys-apps/findutils/findutils-4.6.0.ebuild b/sys-apps/findutils/findutils-4.6.0.ebuild index 34539177b787..16ac9bb52859 100644 --- a/sys-apps/findutils/findutils-4.6.0.ebuild +++ b/sys-apps/findutils/findutils-4.6.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3+" 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 ~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 ~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="debug nls selinux static test" RDEPEND="selinux? ( sys-libs/libselinux ) diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild index f45cfc24ea39..7e0d0fab80c7 100644 --- a/sys-apps/iproute2/iproute2-4.4.0.ebuild +++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" - 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" fi DESCRIPTION="kernel routing and traffic control utilities" diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest index 2958a551adec..99653fee2e40 100644 --- a/sys-apps/kexec-tools/Manifest +++ b/sys-apps/kexec-tools/Manifest @@ -1,3 +1,3 @@ +DIST kexec-tools-2.0.12.tar.xz 274776 SHA256 14ce67b6242426a7ded10f58b7d29d3cfef5c1379850e8ba3816bb42053f920d SHA512 d192f841180daf534f7214b6c7c5dcd9de0e5616e8cb0da164c24e8b5903a2f65bb1fbe6ca29a3b9077fa6f6435cc33fda19a96584e1f393ee7a2fe56f374dab WHIRLPOOL 9895716544987682f4ba9cc0622afa14c7dc844482fedce29ec9780b8ff74f87cf2bd79ef58febe651fa3bc5934b6d54aaae31d2593fb32ea9fffdca1e5f8c91 DIST kexec-tools-2.0.4.tar.xz 271604 SHA256 e5f5ab00d746eb15b4714eca6a8ec5a1a86a62ce2bbdad1b3000161138a978c6 SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e WHIRLPOOL 70ad298512e700cd1cdee7698e4fa68a769d91d3080d5d8387b8362ad49126ad68b0b6dbd1f13305958bdc988f805fa610e487682fd0eb5e4e9bcda0a9022627 -DIST kexec-tools-2.0.8.tar.xz 272648 SHA256 f3abe96fa0793e63936725a4471429f070039a1e81e605deb378747194a50c47 SHA512 94d715cdf779802308f5f8a0bdfae55c1798cc515fd322a490e8b5414763ab4fa924930022baa0689cd001c2431aef4f28f18b3c7b0b7000cdfaa1a159ad5251 WHIRLPOOL 8d13239e153dded9a98f847101d5581fed8e5a51a17961d6156f0135642e589b7e766ecaeef439fca2b69d4a2bc8e8d3f681a78f28d35acf03bc8d6c06f8ab9e DIST kexec-tools-2.0.9.tar.xz 272728 SHA256 8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 SHA512 b58f8f0872f1a6a3a93bc67068d7035c4b39e985dafadc573585d92259ff289bf98d5a567293a5286668315ac2158b232919e0c6847fdefc68b7ecbcfab5109e WHIRLPOOL 840d9d17ce9facc131736ef52acabb03bcc6d21f671896ff5603bd8d6bd629519e169ca878a127b863235b236dafd3b29f598424b272f599503bb3f1a5f70050 diff --git a/sys-apps/kexec-tools/files/kexec.conf-9999 b/sys-apps/kexec-tools/files/kexec.conf-9999 deleted file mode 100644 index 74f8b891ce54..000000000000 --- a/sys-apps/kexec-tools/files/kexec.conf-9999 +++ /dev/null @@ -1,18 +0,0 @@ -# Boot partition -#BOOTPART="/boot" - -# Kernel name -#KNAME="vmlinuz-2.6.10" - -# Root partition (should be autodetected) -#ROOTPART="/dev/hda3" - -# Kernel parameters (should be autodetected) -#KPARAM="splash=silent,theme:emergence" - -# Initrd -#INITRD="/boot/fbsplash-emergence-1024x768" - -# Load kexec kernel image into memory during shutdown instead of bootup -# (default: yes) -#LOAD_DURING_SHUTDOWN="yes" diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12 b/sys-apps/kexec-tools/files/kexec.init-2.0.12 new file mode 100755 index 000000000000..7a202cc11014 --- /dev/null +++ b/sys-apps/kexec-tools/files/kexec.init-2.0.12 @@ -0,0 +1,175 @@ +#!/sbin/runscript +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Set up some defaults. +: "${LOAD_DURING_SHUTDOWN:=yes}" +: "${BOOTPART:=/boot}" +: "${DONT_MOUNT_BOOT:=no}" + +depend() { + need localmount +} + +auto_prefix_bootpath() { + # Only auto-add prefix to relative paths. + case $1 in + */*) echo "$1";; + *) echo "${BOOTPART}/$1" ;; + esac +} + +image_path() { + # Do no sanity checking if the user has set a value. + if [ -n "${KNAME}" ]; then + auto_prefix_bootpath "${KNAME}" + return + fi + + local x kver="$(uname -r)" karch="$(uname -m)" + for x in \ + "bzImage" \ + "vmlinuz" \ + "bzImage-${kver}" \ + "vmlinuz-${kver}" \ + "kernel-genkernel-${karch}-${kver}" \ + "kernel-${kver}" \ + "kernel-${karch}"; do + if [ -e "${BOOTPART}/${x}" ]; then + echo "${BOOTPART}/${x}" + return + fi + done + + return 1 +} + +initrd_path() { + # Do no sanity checking if the user has set a value. + if [ -n "${INITRD}" ]; then + auto_prefix_bootpath "${INITRD}" + return 0 + fi + + local x kver="$(uname -r)" karch="$(uname -m)" + for x in \ + "initrd" \ + "initrd.img-${kver}" \ + "initrd-${kver}.img" \ + "initrd-${kver}" \ + "initramfs-${kver}.img" \ + "initramfs-genkernel-${karch}-${kver}"; do + if [ -e "${BOOTPART}/${x}" ]; then + echo "${BOOTPART}/${x}" + return 0 + fi + done + + return 1 +} + +mount_boot() { + [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1 + mountinfo -q "${BOOTPART}" && return 1 + + ebegin "Mounting ${BOOTPART}" + mount "${BOOTPART}" + eend $? +} + +load_image() { + if [ "${KNAME}" = "-" ]; then + ebegin "Disabling kexec" + kexec -u + eend $? + return # eend preserved $? for us. + fi + + local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt + + if ! img="$(image_path)"; then + if mount_boot; then + if img="$(image_path)"; then + mounted=true + initrd="$(initrd_path)" + else + eerror "No kernel image found in ${BOOTPART}!" + umount "${BOOTPART}" + return 1 + fi + else + eerror "No kernel image found in ${BOOTPART}!" + return 1 + fi + fi + + if [ -z "${ROOTPART}" ]; then + ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" + fi + + if [ -z "${KPARAM}" ]; then + kparamopt="--reuse-cmdline" + fi + + if [ -n "${initrd}" ]; then + initrdopt="--initrd=${initrd}" + fi + + local msg + [ -n "${initrd}" ] && \ + msg=" (with ${initrd})" + ebegin "Using kernel image ${img}${msg} for kexec" + + kexec ${KEXEC_OPT_ARGS} ${kparamopt} \ + -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} + local ret=$? + + ${mounted} && umount "${BOOTPART}" + eend ${ret} + return ${ret} +} + +start() { + if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then + local mounted + if mount_boot; then + mounted=true + fi + if ! image_path >/dev/null; then + ewarn "Cannot find kernel image!" + ewarn "Please make sure a valid kernel image is present before reboot." + return 0 + fi + if [ -n "${mounted}" ]; then + ebegin "Unmounting ${BOOTPART}" + umount "${BOOTPART}" + eend $? + fi + # $? is already set to the previous calls. + return + else + load_image + fi +} + +stop() { + if ! yesno ${RC_REBOOT}; then + ebegin "Not rebooting; disabling kexec" + kexec -u + eend $? + return + fi + + if [ -f /nokexec ]; then + ebegin "Rebooting; disabling kexec due to /nokexec" + rm -f /nokexec + kexec -u + eend $? + return + fi + + if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then + load_image + fi +} diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4 b/sys-apps/kexec-tools/files/kexec.init-2.0.4 deleted file mode 100644 index a7101efbd87e..000000000000 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.4 +++ /dev/null @@ -1,144 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -image_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - for x in "${KNAME:-bzImage}" vmlinuz \ - bzImage-${kver} vmlinuz-${kver} \ - kernel-genkernel-${karch}-${kver} \ - kernel-${kver} kernel-${karch}; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -initrd_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - for x in "${INITRD:-initrd}" \ - initrd.img-${kver} initrd-${kver}.img \ - initrd-${kver} initramfs-${kver}.img \ - initramfs-genkernel-${karch}-${kver} ; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -mount_boot(){ - local ret - - [ -n ${DONT_MOUNT_BOOT} ] && return 1 - grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1 - - BOOTPART="${BOOTPART:-/boot}" - ebegin "Mounting ${BOOTPART}" - mount "${BOOTPART}"; ret=$? - eend ${ret} - return ${ret} -} - -load_image() { - local ret - if [ "${KNAME}" = "-" ]; then - ebegin "Disabling kexec" - kexec -u; ret=$? - eend ${ret} - return ${ret} - fi - - BOOTPART="${BOOTPART:-/boot}" - local img= initrd="$(initrd_path)" mounted=false initrdopt= - - if ! img="$(image_path)"; then - if mount_boot; then - if img="$(image_path)"; then - mounted=true - initrd="$(initrd_path)" - else - eerror "No kernel image found in ${BOOTPART}!" - umount "${BOOTPART}" - return 1 - fi - else - eerror "No kernel image found in ${BOOTPART}!" - return 1 - fi - fi - - if [ -n "${INITRD}" ] && \ - ! [ "${INITRD}" = "${initrd}" ]; then - eerror "Requested initrd: ${INITRD}" - eerror "could not be found" - return 1 - fi - - [ -n "${ROOTPART}" ] || \ - ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" - - [ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline" - - [ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}" - - local msg= - [ -n ${initrd} ] && \ - msg="with ${initrd}" - einfo "Using kernel image ${img} ${msg} for kexec" - - ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}" - kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} - local res=$? - - ${mounted} && umount "${BOOTPART}" - eend ${res} - return ${res} -} - -start() { - if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then - if ! image_path > /dev/null; then - ewarn "Cannot find kernel image!" - ewarn "Please make sure a valid kernel image is present before reboot." - return 0 - fi - else - ebegin "Configuring kexec" - load_image - eend $? - fi -} - -stop() { - [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0 - - if ! yesno $RC_REBOOT; then - einfo "Not rebooting, so disabling" - kexec -u - return 0 - fi - - if [ -f /nokexec ]; then - einfo "Not using kexec during reboot" - rm -f /nokexec - kexec -u - return 0 - fi - - ebegin "Configuring kexec" - load_image - eend $? -} diff --git a/sys-apps/kexec-tools/files/kexec.init-9999 b/sys-apps/kexec-tools/files/kexec.init-9999 deleted file mode 100644 index f1306874297c..000000000000 --- a/sys-apps/kexec-tools/files/kexec.init-9999 +++ /dev/null @@ -1,165 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() { - need localmount -} - -image_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - KNAME="${KNAME:-bzImage}" - if [ -e "${KNAME}" ]; then - echo "${KNAME}" - return 0 - fi - for x in "${KNAME#${BOOTPART}}" vmlinuz \ - bzImage-${kver} vmlinuz-${kver} \ - kernel-genkernel-${karch}-${kver} \ - kernel-${kver} kernel-${karch}; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -initrd_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - INITRD="${INITRD:-initrd}" - if [ -e "${INITRD}" ]; then - echo "${INITRD}" - return 0 - fi - for x in "${INITRD#${BOOTPART}}" \ - initrd.img-${kver} initrd-${kver}.img \ - initrd-${kver} initramfs-${kver}.img \ - initramfs-genkernel-${karch}-${kver} ; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -mount_boot(){ - local ret - - [ -n "${DONT_MOUNT_BOOT}" ] && return 1 - grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1 - - BOOTPART="${BOOTPART:-/boot}" - ebegin "Mounting ${BOOTPART}" - mount "${BOOTPART}"; ret=$? - eend ${ret} - return ${ret} -} - -load_image() { - local ret - if [ "${KNAME}" = "-" ]; then - ebegin "Disabling kexec" - kexec -u; ret=$? - eend ${ret} - return ${ret} - fi - - BOOTPART="${BOOTPART:-/boot}" - local img= initrd="$(initrd_path)" mounted=false initrdopt= - - if ! img="$(image_path)"; then - if mount_boot; then - if img="$(image_path)"; then - mounted=true - initrd="$(initrd_path)" - else - eerror "No kernel image found in ${BOOTPART}!" - umount "${BOOTPART}" - return 1 - fi - else - eerror "No kernel image found in ${BOOTPART}!" - return 1 - fi - fi - - if [ -n "${INITRD}" ] && \ - ! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then - eerror "Requested initrd: ${INITRD#${BOOTPART}}" - eerror "could not be found" - return 1 - fi - - [ -n "${ROOTPART}" ] || \ - ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" - - [ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline" - - [ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}" - - local msg= - [ -n "${initrd}" ] && \ - msg="with ${initrd}" - einfo "Using kernel image ${img} ${msg} for kexec" - - ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}" - kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} - local res=$? - - ${mounted} && umount "${BOOTPART}" - eend ${res} - return ${res} -} - -start() { - if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then - local ret=0 - BOOTPART="${BOOTPART:-/boot}" - if mount_boot; then - mounted=true - fi - if ! image_path > /dev/null; then - ewarn "Cannot find kernel image!" - ewarn "Please make sure a valid kernel image is present before reboot." - return 0 - fi - if [ -n "${mounted}" ]; then - ebegin "Unmounting ${BOOTPART}" - umount "${BOOTPART}"; ret=$? - eend ${ret} - fi - return ${ret} - else - ebegin "Configuring kexec" - load_image - eend $? - fi -} - -stop() { - [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0 - - if ! yesno $RC_REBOOT; then - einfo "Not rebooting, so disabling" - kexec -u - return 0 - fi - - if [ -f /nokexec ]; then - einfo "Not using kexec during reboot" - rm -f /nokexec - kexec -u - return 0 - fi - - ebegin "Configuring kexec" - load_image - eend $? -} diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild similarity index 79% rename from sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild rename to sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild index b8bd5e7baa6d..2a2d1600e837 100644 --- a/sys-apps/kexec-tools/kexec-tools-2.0.9-r1.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-2.0.12.ebuild @@ -1,18 +1,25 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="5" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" + AUTOTOOLS_AUTORECONF=true +else + SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi inherit autotools-utils linux-info systemd DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" -SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="booke lzma xen zlib" REQUIRED_USE="lzma? ( zlib )" @@ -27,7 +34,6 @@ CONFIG_CHECK="~KEXEC" PATCHES=( "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - "${FILESDIR}"/${PN}-2.0.9-hardened.patch ) pkg_setup() { @@ -50,7 +56,7 @@ src_install() { dodoc "${FILESDIR}"/README.Gentoo - newinitd "${FILESDIR}"/kexec.init-2.0.4-r2 kexec + newinitd "${FILESDIR}"/kexec.init-2.0.12 kexec newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec insinto /etc diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild deleted file mode 100644 index f3d29ffbc780..000000000000 --- a/sys-apps/kexec-tools/kexec-tools-2.0.8.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-utils flag-o-matic linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" -SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - ) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" - # to disable the -fPIE -pie in the hardened compiler - if gcc-specs-pie ; then - filter-flags -fPIE - append-ldflags -nopie - fi -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.4-r2 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild deleted file mode 100644 index 3f19f710c71e..000000000000 --- a/sys-apps/kexec-tools/kexec-tools-2.0.9.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-utils flag-o-matic linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" -SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" - # to disable the -fPIE -pie in the hardened compiler - if gcc-specs-pie ; then - filter-flags -fPIE - append-ldflags -nopie - fi -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.4-r2 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild index 008925c94fd6..2a2d1600e837 100644 --- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild @@ -1,21 +1,25 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="5" -AUTOTOOLS_AUTORECONF=true +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" + AUTOTOOLS_AUTORECONF=true +else + SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi -inherit autotools-utils linux-info systemd git-r3 +inherit autotools-utils linux-info systemd DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" -SRC_URI="" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="booke lzma xen zlib" REQUIRED_USE="lzma? ( zlib )" @@ -30,7 +34,6 @@ CONFIG_CHECK="~KEXEC" PATCHES=( "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - "${FILESDIR}"/${PN}-2.0.9-hardened.patch ) pkg_setup() { @@ -53,8 +56,8 @@ src_install() { dodoc "${FILESDIR}"/README.Gentoo - newinitd "${FILESDIR}"/kexec.init-${PV} kexec - newconfd "${FILESDIR}"/kexec.conf-${PV} kexec + newinitd "${FILESDIR}"/kexec.init-2.0.12 kexec + newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec insinto /etc doins "${FILESDIR}"/kexec.conf diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest index 586ff77a73b9..da5562230732 100644 --- a/sys-apps/roccat-tools/Manifest +++ b/sys-apps/roccat-tools/Manifest @@ -1,4 +1,2 @@ -DIST roccat-tools-3.4.0.tar.bz2 2548969 SHA256 4f0e91b3cfc5be6b2c71d8a1dc77bce27c8ef180166d85f01b8383fbe05d9cb3 SHA512 7064f2095d14a496f99713b04024e0d05bfe6000f84c24a73bc48151f1d58dca94b4042fba3118787da87fc9efdfd7f42519cbdf27af34fdbb2cacd03f02b92d WHIRLPOOL b401e14dcfcb19e799905b8582ab471ab732674eef3007474dd3edee62c08b4c6e84d04d7924e0be6b96fe76ce4f3f910129dfb5b6a450b97922bf4c68945087 -DIST roccat-tools-3.5.0.tar.bz2 2549533 SHA256 b940702f4005f81fec673e187328a1506d0d77ba27ecac35588b0a0e3313347d SHA512 d86f5a9c76f6c907a6d9353b710b1a24f495b12165ac6750db30a927361d19362fb975ca1fb3ca090cc17942aaa05064b7064d371d6c1ca365c08efce9663f51 WHIRLPOOL 8fbdcf96d675c2a129ff013732a3cb55e2a5426f9ab4df71496d9e3cfeabc2b6d673921ba8b9b24a4278376c0249d9e45b54ff26899de8f2cfc5980d7e37181a -DIST roccat-tools-3.6.1.tar.bz2 3442053 SHA256 2230f2a6da72a1effd513d7bc90456e80b58f8f9fc97134f4ac41559b1bb43af SHA512 a99863fee21700a840572b68dfe859ee6032ee42b527457ac0dadbd696644abba1d7d20ff96e2aa24145af084c632e1f815e31a8eefe12f1edae4a4981b7095a WHIRLPOOL f238c6f8907bbdbace26899228a4578b9103453313b673e265278e6496f8e5c54a60fcb58bfe87cb798ef8bf6f627a2a47f55b964f25cb126f80c7789e75392f DIST roccat-tools-3.7.0.tar.bz2 3451047 SHA256 fbfd69634e3f504a8a5f43948566eb9c52955416a7e0698218c61e7d586fd1a5 SHA512 d28113c7fdf43bfa91dbd9e7921f20a2ab67214ed902148d3eea8e5eb8c633e4916f27d6e3e9e32357da39961fe71876de656a29a0415e48a20a90b523e51df1 WHIRLPOOL 7317e385b5deb5f805ad312bab3c817fdd4f081632d3ad80eb6747a56d50b45a9da8b4471f6fa1a45cf58424be5a84acecaa55ebd80797210edcf997efccd253 +DIST roccat-tools-3.9.0.tar.bz2 3508796 SHA256 ea90b53cf4707c76a41d0f67711eca91e21ef41be253ab45b113a55ac1f278c1 SHA512 28c7b8c835a92f9fc741e393373388995f7da95971b6eb2432598a17ddd2887505d38a834e3a155331fa4a67e3dc6a559050c9ea69b2729c26648a2ab76266cb WHIRLPOOL 13f08b01ca83d2b5bc035580a87d62264cb9b0644839793049638d2880c34e96941ea55cd923a21ecd3cbe077b4654901dc93046e8f6371bef1a4adf6cbf0977 diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml index e8b4e44d8c19..3d55f12a9780 100644 --- a/sys-apps/roccat-tools/metadata.xml +++ b/sys-apps/roccat-tools/metadata.xml @@ -12,8 +12,6 @@ Build support for Lua scripting for RyosMKPro ripple effects - Build support for Lua scripting for RyosMKPro ripple effects - support lua 5.1 - Build support for Lua scripting for RyosMKPro ripple effects - support lua 5.2 roccat diff --git a/sys-apps/roccat-tools/roccat-tools-3.4.0.ebuild b/sys-apps/roccat-tools/roccat-tools-3.4.0.ebuild deleted file mode 100644 index f92e790407eb..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-3.4.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepuremilitary - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_konextdoptical - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryosmk - input_devices_roccat_ryostkl - input_devices_roccat_tyon -" -IUSE="${IUSE_INPUT_DEVICES} lua" -REQUIRED_USE=" - lua? ( input_devices_roccat_ryosmk ) -" - -RDEPEND=" - >=dev-libs/libgaminggear-0.10 - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= - lua? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( - -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" - ) - if use lua ; then - mycmakeargs+=( -DWITH_LUA=5.1 ) - fi - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog - ewarn - ewarn "Starting from version 3.0.0, executables were renamed and now prefixed with 'roccat'," - ewarn "so konextdconfig is now roccatkonextdconfig and so on" - ewarn "Everything that was ryos is now ryosmk to distinguish it from the ryostkl product range" - ewarn -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-3.5.0-r1.ebuild b/sys-apps/roccat-tools/roccat-tools-3.5.0-r1.ebuild deleted file mode 100644 index 6d28253d190e..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-3.5.0-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepuremilitary - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_konextdoptical - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryosmk - input_devices_roccat_ryostkl - input_devices_roccat_tyon -" -IUSE="${IUSE_INPUT_DEVICES} lua lua51 lua52" -REQUIRED_USE=" - lua? ( input_devices_roccat_ryosmk ) - lua? ( ^^ ( lua51 lua52 ) ) -" - -RDEPEND=" - =dev-libs/libgaminggear-0.10* - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= - lua51? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) - lua52? ( dev-lang/lua:5.2 ) -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( - -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" - ) - if use lua51 ; then - mycmakeargs+=( -DWITH_LUA=5.1 ) - elif use lua52 ; then - mycmakeargs+=( -DWITH_LUA=5.2 ) - fi - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog - ewarn - ewarn "Starting from version 3.0.0, executables were renamed and now prefixed with 'roccat'," - ewarn "so konextdconfig is now roccatkonextdconfig and so on" - ewarn "Everything that was ryos is now ryosmk to distinguish it from the ryostkl product range" - ewarn - ewarn "In version 3.5.0-r1 the support for Lua as a scripting language for RyosMKPro" - ewarn "ripple effects has been changed. Now in combination with USE=lua to enable it" - ewarn "one also needs to put additional use flag depending on which lua version is wanted - " - ewarn "it can be USE=lua51 for Lua 5.1 or USE=lua52 for 5.2" - ewarn -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-3.5.0.ebuild b/sys-apps/roccat-tools/roccat-tools-3.5.0.ebuild deleted file mode 100644 index 2a75fb9b8189..000000000000 --- a/sys-apps/roccat-tools/roccat-tools-3.5.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit readme.gentoo cmake-utils gnome2-utils udev user - -DESCRIPTION="Utility for advanced configuration of Roccat devices" - -HOMEPAGE="http://roccat.sourceforge.net/" -SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_INPUT_DEVICES=" - input_devices_roccat_arvo - input_devices_roccat_isku - input_devices_roccat_iskufx - input_devices_roccat_kone - input_devices_roccat_koneplus - input_devices_roccat_konepure - input_devices_roccat_konepuremilitary - input_devices_roccat_konepureoptical - input_devices_roccat_konextd - input_devices_roccat_konextdoptical - input_devices_roccat_kovaplus - input_devices_roccat_lua - input_devices_roccat_pyra - input_devices_roccat_savu - input_devices_roccat_ryosmk - input_devices_roccat_ryostkl - input_devices_roccat_tyon -" -IUSE="${IUSE_INPUT_DEVICES} lua" -REQUIRED_USE=" - lua? ( input_devices_roccat_ryosmk ) -" - -RDEPEND=" - =dev-libs/libgaminggear-0.10* - x11-libs/gtk+:2 - x11-libs/libnotify - media-libs/libcanberra - virtual/libusb:1 - dev-libs/dbus-glib - virtual/libgudev:= - lua? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) -" - -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup roccat -} - -src_configure() { - local UDEVDIR="$(get_udevdir)"/rules.d - local MODELS=${INPUT_DEVICES//roccat_/} - mycmakeargs=( - -DDEVICES=${MODELS// /;} \ - -DUDEVDIR="${UDEVDIR/"//"//}" - ) - if use lua ; then - mycmakeargs+=( -DWITH_LUA=5.1 ) - fi - cmake-utils_src_configure -} -src_install() { - cmake-utils_src_install - local stat_dir=/var/lib/roccat - keepdir $stat_dir - fowners root:roccat $stat_dir - fperms 2770 $stat_dir - readme.gentoo_src_install -} -pkg_preinst() { - gnome2_icon_savelist -} -pkg_postinst() { - gnome2_icon_cache_update - readme.gentoo_print_elog - ewarn - ewarn "Starting from version 3.0.0, executables were renamed and now prefixed with 'roccat'," - ewarn "so konextdconfig is now roccatkonextdconfig and so on" - ewarn "Everything that was ryos is now ryosmk to distinguish it from the ryostkl product range" - ewarn -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sys-apps/roccat-tools/roccat-tools-3.6.1.ebuild b/sys-apps/roccat-tools/roccat-tools-3.9.0.ebuild similarity index 97% rename from sys-apps/roccat-tools/roccat-tools-3.6.1.ebuild rename to sys-apps/roccat-tools/roccat-tools-3.9.0.ebuild index f8bfe3d25ba3..7aae56bca1e0 100644 --- a/sys-apps/roccat-tools/roccat-tools-3.6.1.ebuild +++ b/sys-apps/roccat-tools/roccat-tools-3.9.0.ebuild @@ -17,6 +17,7 @@ IUSE_INPUT_DEVICES=" input_devices_roccat_arvo input_devices_roccat_isku input_devices_roccat_iskufx + input_devices_roccat_kiro input_devices_roccat_kone input_devices_roccat_koneplus input_devices_roccat_konepure @@ -25,6 +26,7 @@ IUSE_INPUT_DEVICES=" input_devices_roccat_konextd input_devices_roccat_konextdoptical input_devices_roccat_kovaplus + input_devices_roccat_kova2016 input_devices_roccat_lua input_devices_roccat_nyth input_devices_roccat_pyra diff --git a/sys-auth/keystone/keystone-2016.1.9999.ebuild b/sys-auth/keystone/keystone-2016.1.9999.ebuild new file mode 100644 index 000000000000..8ffebca822f6 --- /dev/null +++ b/sys-auth/keystone/keystone-2016.1.9999.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) + +inherit distutils-r1 git-r3 user + +DESCRIPTION="The Openstack authentication, authorization, and service catalog" +HOMEPAGE="https://launchpad.net/keystone" +EGIT_REPO_URI="https://github.com/openstack/keystone.git" +EGIT_BRANCH="stable/mitaka" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="" +IUSE="+sqlite memcached mongo mysql postgres ldap test" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND}" +RDEPEND=" + ${CDEPEND} + >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + <=dev-python/paste-2.0.2[${PYTHON_USEDEP}] + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] + !~dev-python/routes-2.0[${PYTHON_USEDEP}] + !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] + >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + sqlite? ( + >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] + =dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] + >=dev-python/passlib-1.6[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}] + !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}] + !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}] + !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] + >=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}] + >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}] + >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}] + =dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] + !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] + =dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]" + +#PATCHES=( +#) + +pkg_setup() { + enewgroup keystone + enewuser keystone -1 -1 /var/lib/keystone keystone +} + +python_prepare_all() { + # it's in git, but not in the tarball..... + sed -i '/^hacking/d' test-requirements.txt || die + mkdir -p ${PN}/tests/tmp/ || die + cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die + distutils-r1_python_prepare_all +} + +# Ignore (naughty) test_.py files & 1 test that connect to the network +#-I 'test_keystoneclient*' \ +python_test() { + nosetests -I 'test_keystoneclient*' \ + -e test_static_translated_string_is_Message \ + -e test_get_token_id_error_handling \ + -e test_provider_token_expiration_validation \ + -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7" +} + +python_install() { + distutils-r1_python_install + newconfd "${FILESDIR}/keystone.confd" keystone + newinitd "${FILESDIR}/keystone.initd" keystone + + diropts -m 0750 + keepdir /etc/keystone /var/log/keystone + insinto /etc/keystone + insopts -m0640 -okeystone -gkeystone + doins etc/keystone.conf.sample etc/logging.conf.sample + doins etc/default_catalog.templates etc/policy.json + doins etc/policy.v3cloudsample.json etc/keystone-paste.ini + insinto /etc/keystone/httpd + doins httpd/keystone.py httpd/wsgi-keystone.conf + + fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone +} + +pkg_postinst() { + elog "You might want to run:" + elog "emerge --config =${CATEGORY}/${PF}" + elog "if this is a new install." + elog "If you have not already configured your openssl installation" + elog "please do it by modifying /etc/ssl/openssl.cnf" + elog "BEFORE issuing the configuration command." + elog "Otherwise default values will be used." +} + +pkg_config() { + if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then + einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..." + read + "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone + else + einfo "keystone PKI certificates directory already present, skipping configuration" + fi +} diff --git a/sys-auth/skey/skey-1.1.5-r10.ebuild b/sys-auth/skey/skey-1.1.5-r10.ebuild index d73f0140d986..bc6deb778844 100644 --- a/sys-auth/skey/skey-1.1.5-r10.ebuild +++ b/sys-auth/skey/skey-1.1.5-r10.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="BSD MIT RSA BEER-WARE" 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="static-libs" DEPEND="dev-lang/perl diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest index 39b2d1b9d687..6b84ac5b9df5 100644 --- a/www-apps/airdcpp-webui/Manifest +++ b/www-apps/airdcpp-webui/Manifest @@ -1,3 +1,3 @@ -DIST airdcpp-webui-0.16.2.tgz 10910907 SHA256 d6b51beb090cf85f9dcc967ec163e211f263f05f792ac8e1ffa6af2625a03d92 SHA512 ccf7cacece5916d5c473ced387c7e2bc93f96d79bd840eec716cccf245c29e445a5eeaa8b8cb969bf25fcb5a546e90f23d05272d6092826eb23920c248342947 WHIRLPOOL 92d6ba833484758887e758cc2518f0f2e3360cd7452bff7ef0c1c9d752f03a6c51e9513ec16cdad03bb29b11d528ba791001267c0f357a0754161149f48dc323 DIST airdcpp-webui-1.0.0.tgz 10951669 SHA256 8fa13325e83d3541f96c154002751f3637d783f6a95edf63e2c71ca98ec200cd SHA512 5ad12e7ca96eb99542ef56a724894534f7644bf6d95cf68b776b2a7a230d4f8d1eed377c356cc06fbf2d7e5afd85afcb98cdcafe31faefbd529d52a23cf302c4 WHIRLPOOL 04ef6ede1656cf4cca990466a69d8b70c540ff3b40e998fba90e084cf50b64e41070a0689c0ea5adfaa376b4ad047e6b6939ffbc641708dfc5bf365ceedab101 DIST airdcpp-webui-1.0.2.tgz 10951832 SHA256 bab92904323f1fb8cbd72bb4d0991a1e6a5ff7045bf9cc12d0c5151cb1e51c98 SHA512 b28b469aa8ad32501c705b0c94fa04c5cc2a9fef5eb75da5b2a8103ef7e20064aae66bd260bdf84a9de72f02aef709c3015889a31b16b1ba037d5da7518871ed WHIRLPOOL dd37578397a21630508412107f1659abfed67d50e348bfd95cbbbea8951338c461f8261575e0b02dd708f5b7a54bd0fa1d3b85e44e5a6c2049f38dd34e723fdb +DIST airdcpp-webui-1.0.3.tgz 10882321 SHA256 87a3b20ee4e4b9bc713fc54ba2c79c12c97ee080c302aa9869d9e1f37a25803a SHA512 16fa92fab308ab9b399b5ca2ce0de6027c42180a200e7205cdda572281ecee9f182def9d6de34d12fb7442585ff3d2b0dfd675262227a467bab244409702d573 WHIRLPOOL 67c68c374cf85d1949bd305e4c736138b65ac384fe74d1099d764b8b72c42393bd3270d86ddc274d815509dc5069b9fa4e141f43dab2c433b6302ce9f29e7e97 diff --git a/www-apps/airdcpp-webui/airdcpp-webui-0.16.2.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-1.0.3.ebuild similarity index 100% rename from www-apps/airdcpp-webui/airdcpp-webui-0.16.2.ebuild rename to www-apps/airdcpp-webui/airdcpp-webui-1.0.3.ebuild diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 0fefb0f054e6..92ac6d8123de 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1 +1,3 @@ +DIST chromium-49.0.2623.108.tar.xz 520440328 SHA256 da083a2bf17ff4c9b09b7451a81dfb41ece6b50ad363df20e918909e8cbcb1c0 SHA512 4b52bad489c21f20598c2770a4240e07e57fc127492eea6d7401214d3dbc74fdc68a8f20bbcff5c12ff5ff51cb0e76e2585ed590c2ca14fac7b99f4dd9281ee3 WHIRLPOOL cd7ec9002e1c1bd794fd1448294bd7aedd9bfe83839f4270046edab7c66d11c0d9f3223aabdc33870831592c939aff4d7fc1e73608d4cc21709f1cd523f34728 DIST chromium-49.0.2623.87.tar.xz 452249780 SHA256 c98d0f843d1f5e24f5df42154d91f340a8ae64f316399f163b701193e880774d SHA512 4c9a96d322ec199a047d52057076579b9d6aefe6db8661f3b3c53f9f9d18ef5cd39c91038fe61e4158d371d4d4d8a78019f8cdf6e5e8135488d8233471d62728 WHIRLPOOL ac660f2d73bc5adcec6b93a19f33939dbc110c6c650ddb980f3d3e6e013d98beb7056359b29b713bbb00f742686d965a32b079adcb24faa4ed45474f2ee6a77a +DIST chromium-50.0.2661.37.tar.xz 462477912 SHA256 e67a0e083a446ab57cabe8c7d8e1047aac128ee1aecaddc3d9f801b178a7be39 SHA512 e620d005a1ce2bfd0f3fe940914ac4e117feadbc8a569fa6e32be2593d540dc350c1282675a9f8cb07402a5393203eed77894531f3a9fe2cf16cbb8f70c124d3 WHIRLPOOL 97b66dbfa1824f45a038f761aa1d41852c174853b80bc8c297497ac4d549e46d84b6eb1f6732615c258f14c12aa3b02f3826bebcf2afceca27d8e04f1b311cf8 diff --git a/www-client/chromium/chromium-49.0.2623.108.ebuild b/www-client/chromium/chromium-49.0.2623.108.ebuild new file mode 100644 index 000000000000..40b39bc2ed4a --- /dev/null +++ b/www-client/chromium/chromium-49.0.2623.108.ebuild @@ -0,0 +1,698 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil 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 check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD hotwording? ( no-source-code )" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" + +REQUIRED_USE="gn? ( kerberos !system-ffmpeg )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=" + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + >=dev-libs/jsoncpp-0.5.0-r1:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/libexif:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + gtk3? ( x11-libs/gtk+:3= ) + !gtk3? ( x11-libs/gtk+:2= ) + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 ) + !gn? ( + >=app-accessibility/speech-dispatcher-0.8:= + app-arch/snappy:= + >=dev-libs/icu-55.1:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + media-libs/flac:= + >=media-libs/harfbuzz-0.9.41:=[icu(+)] + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig" + +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + ! "${T}/flapper_version.h" || die + myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_libvpx (http://crbug.com/494939). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_re2 (bug #571156). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf_gyp+=" + -Duse_system_bzip2=1 + -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_icu=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + myconf_gyp+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf_gyp+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf_gyp+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use gtk3) + $(gyp_use hangouts enable_hangout_services_extension) + $(gyp_use hidpi enable_hidpi) + $(gyp_use hotwording enable_hotwording) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none) + $(gyp_use widevine enable_widevine)" + + myconf_gn+=" use_cups=$(usex cups true false)" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf_gyp+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf_gyp+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf_gyp+=" + -Dlogging_like_official_build=1" + + if [[ $(tc-getCC) == *clang* ]]; then + myconf_gyp+=" -Dclang=1" + myconf_gn+=" is_clang=true" + else + myconf_gyp+=" -Dclang=0" + myconf_gn+=" is_clang=false" + fi + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf_gyp+=" + -Dclang_use_chrome_plugins=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0 + -Dsysroot=" + myconf_gn+=" use_sysroot=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm64 ]] ; then + target_arch=arm64 + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf_gyp+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf_gyp+=" -Darmv7=1" + else + myconf_gyp+=" -Darmv7=0" + fi + myconf_gyp+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf_gyp+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gyp+=" -Dwerror=" + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + # Tools for building programs to be executed on the build system, bug #410883. + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # TODO: also do this for GN bundled ffmpeg build. + if ! use system-ffmpeg && ! use gn; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + fi + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + touch chrome/test/data/webui/i18n_process_css_test.html || die + + einfo "Configuring Chromium..." + if use gn; then + tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die + out/Release/gn gen --args="${myconf_gn}" out/Release || die + else + build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die + egyp_chromium ${myconf_gyp} || die + fi +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + if ! use gn; then + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + fi + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + use widevine && doexe out/Release/libwidevinecdmadapter.so + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + if use gn; then + doins out/Release/icudtl.dat || die + fi + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/chromium-50.0.2661.37.ebuild b/www-client/chromium/chromium-50.0.2661.37.ebuild new file mode 100644 index 000000000000..030e6f9369a1 --- /dev/null +++ b/www-client/chromium/chromium-50.0.2661.37.ebuild @@ -0,0 +1,695 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil 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 check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD hotwording? ( no-source-code )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" + +REQUIRED_USE="gn? ( kerberos !system-ffmpeg )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=" + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + >=dev-libs/jsoncpp-0.5.0-r1:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/libexif:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + gtk3? ( x11-libs/gtk+:3= ) + !gtk3? ( x11-libs/gtk+:2= ) + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 ) + !gn? ( + >=app-accessibility/speech-dispatcher-0.8:= + app-arch/snappy:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + media-libs/flac:= + >=media-libs/harfbuzz-0.9.41:=[icu(+)] + >=media-libs/libjpeg-turbo-1.2.0-r1:= + media-libs/libpng:0= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig" + +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + ! "${T}/flapper_version.h" || die + myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_icu (bug #576370). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_libvpx (http://crbug.com/494939). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_re2 (bug #571156). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf_gyp+=" + -Duse_system_bzip2=1 + -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + # myconf_gyp+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf_gyp+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf_gyp+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use gtk3) + $(gyp_use hangouts enable_hangout_services_extension) + $(gyp_use hidpi enable_hidpi) + $(gyp_use hotwording enable_hotwording) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none) + $(gyp_use widevine enable_widevine)" + + myconf_gn+=" use_cups=$(usex cups true false)" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf_gyp+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf_gyp+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf_gyp+=" + -Dlogging_like_official_build=1" + + if [[ $(tc-getCC) == *clang* ]]; then + myconf_gyp+=" -Dclang=1" + myconf_gn+=" is_clang=true" + else + myconf_gyp+=" -Dclang=0" + myconf_gn+=" is_clang=false" + fi + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf_gyp+=" + -Dclang_use_chrome_plugins=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0 + -Dsysroot=" + myconf_gn+=" use_sysroot=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm64 ]] ; then + target_arch=arm64 + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf_gyp+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf_gyp+=" -Darmv7=1" + else + myconf_gyp+=" -Darmv7=0" + fi + myconf_gyp+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf_gyp+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gyp+=" -Dwerror=" + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + # Tools for building programs to be executed on the build system, bug #410883. + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # TODO: also do this for GN bundled ffmpeg build. + if ! use system-ffmpeg && ! use gn; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + fi + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + touch chrome/test/data/webui/i18n_process_css_test.html || die + + einfo "Configuring Chromium..." + if use gn; then + tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die + out/Release/gn gen --args="${myconf_gn}" out/Release || die + else + build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die + egyp_chromium ${myconf_gyp} || die + fi +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + if ! use gn; then + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + fi + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + use widevine && doexe out/Release/libwidevinecdmadapter.so + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + doins out/Release/icudtl.dat || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/files/chromium-system-jinja-r8.patch b/www-client/chromium/files/chromium-system-jinja-r8.patch new file mode 100644 index 000000000000..e1576ae77d6a --- /dev/null +++ b/www-client/chromium/files/chromium-system-jinja-r8.patch @@ -0,0 +1,47 @@ +--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000 ++++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000 +@@ -54,7 +54,6 @@ + 'actions': [{ + 'action_name': 'cache_jinja_templates', + 'inputs': [ +- '<@(jinja_module_files)', + 'code_generator_v8.py', + '<@(code_generator_template_files)', + ], +--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000 ++++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000 +@@ -2,10 +2,6 @@ + { + 'variables': { + 'scripts_for_in_files': [ +- # jinja2/__init__.py contains version string, so sufficient as +- # dependency for whole jinja2 package +- '<(DEPTH)/third_party/jinja2/__init__.py', +- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + 'hasher.py', + 'in_file.py', + 'in_generator.py', +--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000 ++++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000 +@@ -12,9 +12,6 @@ + '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + ], + 'idl_lexer_parser_files': [ +- # PLY (Python Lex-Yacc) +- '<(DEPTH)/third_party/ply/lex.py', +- '<(DEPTH)/third_party/ply/yacc.py', + # Web IDL lexer/parser (base parser) + '<(DEPTH)/tools/idl_parser/idl_lexer.py', + '<(DEPTH)/tools/idl_parser/idl_node.py', +--- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000 ++++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000 +@@ -6,9 +6,6 @@ + 'variables': { + 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform', + 'jinja_module_files': [ +- # jinja2/__init__.py contains version string, so sufficient for package +- '<(DEPTH)/third_party/jinja2/__init__.py', +- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + ], + }, + diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index f71802c39a57..62bb55bb848b 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_49.0.2623.87-1_amd64.deb 48921974 SHA256 dc273de84f6f2dad563bcbbb2e62312cd2a61d6ed41e10398bff7fdc1883d6cc SHA512 e599b2d2bc50300156e8723508a37cc168041a56e9c6dd018944d597ef69d97bb7b058a1ef2f9c834f331b4e52f70ac46c2581c3caa6aeb4efc0102e2326419b WHIRLPOOL 63b06c469c93cd1bbbf7f3154094757ca1e8a5ad48015ad8f24c93fafd049b2d6d10559286dd483656cdd981ade5d880ad45983cb7371ab5b670f4a345902d1a +DIST google-chrome-stable_49.0.2623.108-1_amd64.deb 48656074 SHA256 da75e1ddbe9bb13474d83a7d0854b263672b18a999143eaf41a90d531897fece SHA512 30594f1c72409418af3cce2dc6dcf2036b5de2124e1f3e57a3f9f3ed30adf1482a59622906cb50032113a6a1fb9ff1a93eab827846221df15cb64492cc85e9b1 WHIRLPOOL 6fd0fa4dc8b4d56c6caef1f28ab1fd03630fbbd0c7f55560d1678d53192b6f9b34b78fd5e6619f8de468311cda89e4b211ac0aa35e958a0ecc8a4d8828b3ebf4 diff --git a/www-client/google-chrome/google-chrome-49.0.2623.87_p1.ebuild b/www-client/google-chrome/google-chrome-49.0.2623.108_p1.ebuild similarity index 100% rename from www-client/google-chrome/google-chrome-49.0.2623.87_p1.ebuild rename to www-client/google-chrome/google-chrome-49.0.2623.108_p1.ebuild diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index e913e882f940..151d0f8f0003 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ DIST google-chrome-beta_50.0.2661.49-1_amd64.deb 48342892 SHA256 50b2d095dfb94206ad0414f377f6f34b60b7d59d707b42077d219ed35a1b5483 SHA512 aeef5b3b95279e7041bfa01b159e979da0b9b908140dd1cf70e20f780abeac9c170e0b7c0b9df8c6e2cfb210d4bdb69d5882c830239d0a830796cb8a16f4f2d8 WHIRLPOOL e7bc55b4d9c5c8f2e83b45e7139f86056d5a991062d5e5d2454df122154d9de29f8c2c16fcf1d39d429364d8692f0c79428c5340177cf4fd2ee4da5114ee051a -DIST google-chrome-stable_49.0.2623.87-1_amd64.deb 48921974 SHA256 dc273de84f6f2dad563bcbbb2e62312cd2a61d6ed41e10398bff7fdc1883d6cc SHA512 e599b2d2bc50300156e8723508a37cc168041a56e9c6dd018944d597ef69d97bb7b058a1ef2f9c834f331b4e52f70ac46c2581c3caa6aeb4efc0102e2326419b WHIRLPOOL 63b06c469c93cd1bbbf7f3154094757ca1e8a5ad48015ad8f24c93fafd049b2d6d10559286dd483656cdd981ade5d880ad45983cb7371ab5b670f4a345902d1a +DIST google-chrome-stable_49.0.2623.108-1_amd64.deb 48656074 SHA256 da75e1ddbe9bb13474d83a7d0854b263672b18a999143eaf41a90d531897fece SHA512 30594f1c72409418af3cce2dc6dcf2036b5de2124e1f3e57a3f9f3ed30adf1482a59622906cb50032113a6a1fb9ff1a93eab827846221df15cb64492cc85e9b1 WHIRLPOOL 6fd0fa4dc8b4d56c6caef1f28ab1fd03630fbbd0c7f55560d1678d53192b6f9b34b78fd5e6619f8de468311cda89e4b211ac0aa35e958a0ecc8a4d8828b3ebf4 DIST google-chrome-unstable_51.0.2687.0-1_amd64.deb 48740950 SHA256 ddbb12a22a6b37f110b6a4229f1e3adfcd69e6dbe42dfbb5943bf64d3b7fd315 SHA512 9131cc955ee2bb072ce2db785371469516daea47fa4aad8d7de09a27502ca41df79f4b25e2ec07615a805b7fc5d3e5f2d98ca61bd138d04b12b8e0b4e7ba01fe WHIRLPOOL a259c3d673d56925f4d6559ce8462f67c3477af815c3cf0306f130c3f2980013a307f93ec8ee80171a6eb894f55e8847e9ebf63d705614acbbc8f0bfb4fa0707 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.87_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.108_p1.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.87_p1.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.108_p1.ebuild diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-364.12-pax.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-364.12-pax.patch new file mode 100644 index 000000000000..18c316282bc7 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-364.12-pax.patch @@ -0,0 +1,398 @@ +diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h +--- work.orig/kernel/common/inc/nv-linux.h 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/common/inc/nv-linux.h 2016-03-22 13:51:58.637292065 +0100 +@@ -1307,6 +1307,9 @@ extern void *nvidia_stack_t_cache; + #define NV_KMEM_CACHE_CREATE(name, type) \ + NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL) + ++#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \ ++ NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, SLAB_USERCOPY, NULL) ++ + #define NV_KMEM_CACHE_DESTROY(kmem_cache) \ + kmem_cache_destroy(kmem_cache) + +diff -urp work.orig/kernel/common/inc/nv-modeset-interface.h work/kernel/common/inc/nv-modeset-interface.h +--- work.orig/kernel/common/inc/nv-modeset-interface.h 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/common/inc/nv-modeset-interface.h 2016-03-22 13:51:58.637292065 +0100 +@@ -72,7 +72,7 @@ typedef struct { + * mix nvidia and nvidia-modeset kernel modules from different + * releases. + */ +- const char *version_string; ++// const char *version_string; + + /* + * Allocate and free an nvidia_stack_t to pass into +@@ -115,6 +115,6 @@ typedef struct { + + } nvidia_modeset_rm_ops_t; + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops); ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string); + + #endif /* _NV_MODESET_INTERFACE_H_ */ +diff -urp work.orig/kernel/common/inc/nv-register-module.h work/kernel/common/inc/nv-register-module.h +--- work.orig/kernel/common/inc/nv-register-module.h 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/common/inc/nv-register-module.h 2016-03-22 13:51:58.637292065 +0100 +@@ -34,7 +34,7 @@ typedef struct nvidia_module_s { + int (*ioctl)(struct inode *, struct file * file, unsigned int cmd, unsigned long arg); + unsigned int (*poll)(struct file * file, poll_table *wait); + +-} nvidia_module_t; ++} __do_const nvidia_module_t; + + int nvidia_register_module(nvidia_module_t *); + int nvidia_unregister_module(nvidia_module_t *); +diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c +--- work.orig/kernel/nvidia/nv.c 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/nvidia/nv.c 2016-03-22 13:51:58.637292065 +0100 +@@ -654,7 +654,7 @@ int __init nvidia_init_module(void) + NV_SPIN_LOCK_INIT(&km_lock); + #endif + +- nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name, ++ nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name, + nvidia_stack_t); + if (nvidia_stack_t_cache == NULL) + { +diff -urp work.orig/kernel/nvidia/nv-chrdev.c work/kernel/nvidia/nv-chrdev.c +--- work.orig/kernel/nvidia/nv-chrdev.c 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/nvidia/nv-chrdev.c 2016-03-22 13:51:58.637292065 +0100 +@@ -20,8 +20,6 @@ int nv_register_chrdev(void *param) + { + nvidia_module_t *module = (nvidia_module_t *)param; + +- module->instance = nv_module_instance; +- + return (nvidia_register_module(module)); + } + +diff -urp work.orig/kernel/nvidia/nv-instance.c work/kernel/nvidia/nv-instance.c +--- work.orig/kernel/nvidia/nv-instance.c 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/nvidia/nv-instance.c 2016-03-22 13:51:58.637292065 +0100 +@@ -51,6 +51,7 @@ struct pci_driver nv_pci_driver = { + nvidia_module_t nv_fops = { + .owner = THIS_MODULE, + .module_name = MODULE_NAME, ++ .instance = MODULE_INSTANCE_NUMBER, + .open = nvidia_open, + .close = nvidia_close, + .ioctl = nvidia_ioctl, +diff -urp work.orig/kernel/nvidia/nv-mmap.c work/kernel/nvidia/nv-mmap.c +--- work.orig/kernel/nvidia/nv-mmap.c 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/nvidia/nv-mmap.c 2016-03-22 13:51:58.637292065 +0100 +@@ -113,12 +113,12 @@ nvidia_vma_release(struct vm_area_struct + } + + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_ACCESS) +-static int ++static ssize_t + nvidia_vma_access( + struct vm_area_struct *vma, + unsigned long addr, + void *buffer, +- int length, ++ size_t length, + int write + ) + { +diff -urp work.orig/kernel/nvidia/nv-modeset-interface.c work/kernel/nvidia/nv-modeset-interface.c +--- work.orig/kernel/nvidia/nv-modeset-interface.c 2016-03-17 03:58:29.000000000 +0100 ++++ work/kernel/nvidia/nv-modeset-interface.c 2016-03-22 13:56:37.019870910 +0100 +@@ -100,10 +100,9 @@ static NvU32 nvidia_modeset_enumerate_gp + return count; + } + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops) ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string) + { +- const nvidia_modeset_rm_ops_t local_rm_ops = { +- .version_string = NV_VERSION_STRING, ++ static const nvidia_modeset_rm_ops_t local_rm_ops = { + .alloc_stack = nvidia_modeset_rm_ops_alloc_stack, + .free_stack = nvidia_modeset_rm_ops_free_stack, + .get_gpuid_list = nvidia_get_gpuid_list, +@@ -114,13 +113,13 @@ NV_STATUS nvidia_get_rm_ops(nvidia_modes + .set_callbacks = nvidia_modeset_set_callbacks, + }; + +- if (strcmp(rm_ops->version_string, NV_VERSION_STRING) != 0) ++ if (strcmp(*version_string, NV_VERSION_STRING) != 0) + { +- rm_ops->version_string = NV_VERSION_STRING; ++ *version_string = NV_VERSION_STRING; + return NV_ERR_GENERIC; + } + +- *rm_ops = local_rm_ops; ++ *rm_ops = &local_rm_ops; + + return NV_OK; + } +diff -urp work.orig/kernel/nvidia-drm/nvidia-drm-drv.c work/kernel/nvidia-drm/nvidia-drm-drv.c +--- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c 2016-03-17 03:57:24.000000000 +0100 ++++ work/kernel/nvidia-drm/nvidia-drm-drv.c 2016-03-22 14:23:07.084230003 +0100 +@@ -586,7 +586,7 @@ static const struct drm_ioctl_desc nv_dr + DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), + }; + +-static struct drm_driver nv_drm_driver = { ++static drm_driver_no_const nv_drm_driver __read_only = { + + .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, + +@@ -643,6 +643,7 @@ static void nvidia_update_drm_driver_fea + return; + } + ++ pax_open_kernel(); + nv_drm_driver.driver_features |= DRIVER_MODESET | DRIVER_ATOMIC; + + nv_drm_driver.master_set = nvidia_drm_master_set; +@@ -651,6 +652,7 @@ static void nvidia_update_drm_driver_fea + nv_drm_driver.dumb_create = nvidia_drm_dumb_create; + nv_drm_driver.dumb_map_offset = nvidia_drm_dumb_map_offset; + nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy; ++ pax_close_kernel(); + + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } +diff -urp work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c work/kernel/nvidia-modeset/nvidia-modeset-linux.c +--- work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-03-17 03:57:25.000000000 +0100 ++++ work/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-03-22 13:55:05.208148788 +0100 +@@ -317,29 +317,28 @@ static void nvkms_resume(NvU32 gpuId) + * Interface with resman. + *************************************************************************/ + +-static nvidia_modeset_rm_ops_t __rm_ops = { 0 }; ++static const nvidia_modeset_rm_ops_t *__rm_ops; + static nvidia_modeset_callbacks_t nvkms_rm_callbacks = { +- nvkms_suspend, +- nvkms_resume ++ .suspend = nvkms_suspend, ++ .resume = nvkms_resume + }; + + static int nvkms_alloc_rm(void) + { + NV_STATUS nvstatus; + int ret; ++ const char *version_string = NV_VERSION_STRING; + +- __rm_ops.version_string = NV_VERSION_STRING; +- +- nvstatus = nvidia_get_rm_ops(&__rm_ops); ++ nvstatus = nvidia_get_rm_ops(&__rm_ops, &version_string); + + if (nvstatus != NV_OK) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Version mismatch: " + "nvidia.ko(%s) nvidia-modeset.ko(%s)\n", +- __rm_ops.version_string, NV_VERSION_STRING); ++ version_string, NV_VERSION_STRING); + return -EINVAL; + } + +- ret = __rm_ops.set_callbacks(&nvkms_rm_callbacks); ++ ret = __rm_ops->set_callbacks(&nvkms_rm_callbacks); + if (ret < 0) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Failed to register callbacks\n"); + return ret; +@@ -350,20 +349,20 @@ static int nvkms_alloc_rm(void) + + static void nvkms_free_rm(void) + { +- __rm_ops.set_callbacks(NULL); ++ __rm_ops->set_callbacks(NULL); + } + + void NVKMS_API_CALL nvkms_call_rm(void *ops) + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.op(stack, ops); ++ __rm_ops->op(stack, ops); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + /************************************************************************* +@@ -685,13 +684,13 @@ NvBool NVKMS_API_CALL nvkms_open_gpu(NvU + nvidia_modeset_stack_ptr stack = NULL; + NvBool ret; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return NV_FALSE; + } + +- ret = __rm_ops.open_gpu(gpuId, stack) == 0; ++ ret = __rm_ops->open_gpu(gpuId, stack) == 0; + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + + return ret; + } +@@ -700,18 +699,18 @@ void NVKMS_API_CALL nvkms_close_gpu(NvU3 + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.close_gpu(gpuId, stack); ++ __rm_ops->close_gpu(gpuId, stack); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + NvU32 NVKMS_API_CALL nvkms_enumerate_gpus(nv_gpu_info_t *gpu_info) + { +- return __rm_ops.enumerate_gpus(gpu_info); ++ return __rm_ops->enumerate_gpus(gpu_info); + } + + /************************************************************************* +diff -urp work.orig/kernel/nvidia-uvm/uvm8_global.c work/kernel/nvidia-uvm/uvm8_global.c +--- work.orig/kernel/nvidia-uvm/uvm8_global.c 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm8_global.c 2016-03-22 14:00:03.852089935 +0100 +@@ -33,17 +33,17 @@ + #include "nv_uvm_interface.h" + + uvm_global_t g_uvm_global; +-static struct UvmOpsUvmEvents g_exported_uvm8_ops; ++static struct UvmOpsUvmEvents g_exported_uvm8_ops = { ++ .startDevice = NULL, ++ .stopDevice = NULL, ++ .isrTopHalf = uvm8_isr_top_half, ++}; + static bool g_ops_registered = false; + + static NV_STATUS uvm8_register_callbacks(void) + { + NV_STATUS status = NV_OK; + +- g_exported_uvm8_ops.startDevice = NULL; +- g_exported_uvm8_ops.stopDevice = NULL; +- g_exported_uvm8_ops.isrTopHalf = uvm8_isr_top_half; +- + // Register the UVM callbacks with the main GPU driver: + status = uvm_rm_locked_call(nvUvmInterfaceRegisterUvmCallbacks(&g_exported_uvm8_ops)); + if (status != NV_OK) +diff -urp work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c +--- work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-03-22 13:51:58.641294799 +0100 +@@ -285,7 +285,7 @@ NvU64 uvm_gpu_semaphore_get_gpu_va(uvm_g + + NvU32 uvm_gpu_semaphore_get_payload(uvm_gpu_semaphore_t *semaphore) + { +- return ACCESS_ONCE(*semaphore->payload); ++ return ACCESS_ONCE_RW(*semaphore->payload); + } + + void uvm_gpu_semaphore_set_payload(uvm_gpu_semaphore_t *semaphore, NvU32 payload) +@@ -301,7 +301,7 @@ void uvm_gpu_semaphore_set_payload(uvm_g + // being optimized out on non-SMP configs (we need them for interacting with + // the GPU correctly even on non-SMP). + mb(); +- ACCESS_ONCE(*semaphore->payload) = payload; ++ ACCESS_ONCE_RW(*semaphore->payload) = payload; + } + + NV_STATUS uvm_gpu_tracking_semaphore_alloc(uvm_gpu_semaphore_pool_t *pool, uvm_gpu_tracking_semaphore_t *tracking_sem) +diff -urp work.orig/kernel/nvidia-uvm/uvm8_hal.h work/kernel/nvidia-uvm/uvm8_hal.h +--- work.orig/kernel/nvidia-uvm/uvm8_hal.h 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm8_hal.h 2016-03-22 13:55:38.620347598 +0100 +@@ -293,7 +293,7 @@ typedef struct + // fault_buffer_ops: id is a hardware class + uvm_fault_buffer_hal_t fault_buffer_ops; + } u; +-} uvm_hal_class_ops_t; ++} __do_const uvm_hal_class_ops_t; + + // When UVM next support is enabled support for future chips in the hal is + // enabled by providing additional hal table entries below. +diff -urp work.orig/kernel/nvidia-uvm/uvm8_mmu.h work/kernel/nvidia-uvm/uvm8_mmu.h +--- work.orig/kernel/nvidia-uvm/uvm8_mmu.h 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm8_mmu.h 2016-03-22 13:57:44.255581049 +0100 +@@ -24,7 +24,6 @@ + #ifndef __UVM8_MMU_H__ + #define __UVM8_MMU_H__ + +-#include "uvm8_forward_decl.h" + #include "uvm8_hal_types.h" + #include "uvm8_pmm_gpu.h" + #include "uvmtypes.h" +diff -urp work.orig/kernel/nvidia-uvm/uvm_common.c work/kernel/nvidia-uvm/uvm_common.c +--- work.orig/kernel/nvidia-uvm/uvm_common.c 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm_common.c 2016-03-22 13:59:20.045675359 +0100 +@@ -54,7 +54,6 @@ + #include "uvm8_forward_decl.h" + + static dev_t g_uvmBaseDev; +-struct UvmOpsUvmEvents g_exportedUvmOps; + + static char* uvm_driver_mode = "lite"; + +@@ -171,10 +170,16 @@ static NV_STATUS uvmSetupGpuProvider(voi + { + NV_STATUS status = NV_OK; + +- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device; +- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device; +- if (uvmfull_activated()) +- g_exportedUvmOps.isrTopHalf = uvmfull_isr_top_half; ++ static struct UvmOpsUvmEvents g_exportedUvmOps = { ++ .startDevice = uvm_gpu_event_start_device, ++ .stopDevice = uvm_gpu_event_stop_device, ++ }; ++ ++ if (uvmfull_activated()) { ++ pax_open_kernel(); ++ *(void **)&g_exportedUvmOps.isrTopHalf = uvmfull_isr_top_half; ++ pax_close_kernel(); ++ } + + // call RM to exchange the function pointers. + status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps); +diff -urp work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h work/kernel/nvidia-uvm/uvm_full_fault_buffer.h +--- work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-03-22 13:51:58.645297533 +0100 +@@ -31,6 +31,7 @@ + #define _UVM_FULL_FAULT_BUFFER_H_ + + #include "uvmtypes.h" ++#include "linux/compiler.h" + + #define MAXWELL_FAULT_BUFFER_A (0xb069) + #define MEM_RD32(a) (*(const volatile NvU32 *)(a)) +@@ -303,7 +304,7 @@ typedef struct + NvUvmControlPrefetch_t controlPrefetch; + NvUvmTestFaultBufferOverflow_t testFaultBufferOverflow; + NvUvmClearFaultBufferOverflow_t clearFaultBufferOverflow; +-} UvmFaultBufferOps; ++} __no_const UvmFaultBufferOps; + + /****************************************************************************** + uvmfull_fault_buffer_init +diff -urp work.orig/kernel/nvidia-uvm/uvm_linux.h work/kernel/nvidia-uvm/uvm_linux.h +--- work.orig/kernel/nvidia-uvm/uvm_linux.h 2016-03-17 03:59:59.000000000 +0100 ++++ work/kernel/nvidia-uvm/uvm_linux.h 2016-03-22 14:09:14.810534336 +0100 +@@ -485,7 +485,7 @@ static inline NvU64 NV_GETTIME(void) + + // WRITE_ONCE/READ_ONCE have incompatible definitions across versions, which produces warnings. + // Therefore, we define our own macros +-#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val)) ++#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE_RW(x) = (val)) + #define UVM_READ_ONCE(x) ACCESS_ONCE(x) + + // Added in 3.11 diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml index a96a53b9dbaf..daf4a1c26481 100644 --- a/x11-drivers/nvidia-drivers/metadata.xml +++ b/x11-drivers/nvidia-drivers/metadata.xml @@ -2,7 +2,10 @@ - jer@gentoo.org + jer@gentoo.org + + + hardened@gentoo.org Nvidia provides different branches of its drivers for different batches of its diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-364.12.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-364.12-r1.ebuild similarity index 98% rename from x11-drivers/nvidia-drivers/nvidia-drivers-364.12.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-364.12-r1.ebuild index ce6436188291..d71ecbfbe309 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-364.12.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-364.12-r1.ebuild @@ -124,7 +124,7 @@ pkg_setup() { if use driver && use kernel_linux; then MODULE_NAMES="nvidia(video:${S}/kernel)" use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)" - use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel)" + use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)" # This needs to run after MODULE_NAMES (so that the eclass checks # whether the kernel supports loadable modules) but before BUILD_PARAMS @@ -172,7 +172,7 @@ src_prepare() { ewarn "Using PAX patches is not supported. You will be asked to" ewarn "use a standard kernel should you have issues. Should you" ewarn "need support with these patches, contact the PaX team." - epatch "${FILESDIR}"/${PN}-361.26-pax.patch + epatch "${FILESDIR}"/${PN}-364.12-pax.patch fi # Allow user patches so they can support RC kernels and whatever else @@ -385,6 +385,9 @@ src_install() { exeinto /etc/X11/xinit/xinitrc.d newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings + + insinto /etc/vulkan/icd.d + doins nvidia_icd.json fi dobin ${NV_OBJ}/nvidia-bug-report.sh diff --git a/x11-libs/motif/motif-2.3.5.ebuild b/x11-libs/motif/motif-2.3.5.ebuild index 7cdb19dc4eec..5963a13f7d4a 100644 --- a/x11-libs/motif/motif-2.3.5.ebuild +++ b/x11-libs/motif/motif-2.3.5.ebuild @@ -46,6 +46,9 @@ src_prepare() { # add X.Org vendor string to aliases for virtual bindings echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias + # remove header file which shouldn't be in the tarball #578168 + rm lib/Xm/Xm.h || die + AT_M4DIR=. eautoreconf # get around some LANG problems in make (#15119) diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 37adb31edce1..f6485f05c0a8 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1,2 +1 @@ -DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869 DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d diff --git a/x11-misc/dmenu/dmenu-4.5-r3.ebuild b/x11-misc/dmenu/dmenu-4.5-r3.ebuild deleted file mode 100644 index 2b209722c411..000000000000 --- a/x11-misc/dmenu/dmenu-4.5-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" -HOMEPAGE="http://tools.suckless.org/dmenu/" -SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd" -IUSE="xft xinerama" - -RDEPEND=" - x11-libs/libX11 - xft? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - xft? ( virtual/pkgconfig ) - xinerama? ( virtual/pkgconfig ) -" - -src_prepare() { - # Respect our flags - sed -i \ - -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \ - -e '/^LDFLAGS/s|= -s|+=|' \ - config.mk || die - # Make make verbose - sed -i \ - -e 's|^ @| |g' \ - -e '/^ echo/d' \ - Makefile || die - use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-2.patch - - epatch_user -} - -src_compile() { - emake CC=$(tc-getCC) \ - "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \ - "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/dmenu/dmenu-4.5-r4.ebuild b/x11-misc/dmenu/dmenu-4.5-r4.ebuild deleted file mode 100644 index 7844730f9c80..000000000000 --- a/x11-misc/dmenu/dmenu-4.5-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" -HOMEPAGE="http://tools.suckless.org/dmenu/" -SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="xft xinerama" - -RDEPEND=" - x11-libs/libX11 - xft? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - xft? ( virtual/pkgconfig ) - xinerama? ( virtual/pkgconfig ) -" - -src_prepare() { - # Respect our flags - sed -i \ - -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \ - -e '/^LDFLAGS/s|= -s|+=|' \ - config.mk || die - # Make make verbose - sed -i \ - -e 's|^ @| |g' \ - -e '/^ echo/d' \ - Makefile || die - use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-3.patch - - epatch_user -} - -src_compile() { - emake CC=$(tc-getCC) \ - "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \ - "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild index d76b496396c1..c15460373c97 100644 --- a/x11-misc/dmenu/dmenu-4.6.ebuild +++ b/x11-misc/dmenu/dmenu-4.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd" IUSE="xinerama" RDEPEND=" diff --git a/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch b/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch deleted file mode 100644 index 4e3f32c6aabb..000000000000 --- a/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch +++ /dev/null @@ -1,410 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -12,9 +12,13 @@ - XINERAMALIBS = -lXinerama - XINERAMAFLAGS = -DXINERAMA - -+# Xft, comment if you don't want it -+XFTINC = $(shell pkg-config --cflags xft) -+XFTLIBS = $(shell pkg-config --libs xft) -+ - # includes and libs --INCS = -I${X11INC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} -+INCS = -I${X11INC} ${XFTINC} -+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} - - # flags - CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ---- a/dmenu.1 -+++ b/dmenu.1 -@@ -53,7 +53,7 @@ - defines the prompt to be displayed to the left of the input field. - .TP - .BI \-fn " font" --defines the font or font set used. -+defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font) - .TP - .BI \-nb " color" - defines the normal background color. ---- a/dmenu.c -+++ b/dmenu.c -@@ -17,6 +17,7 @@ - * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) - #define MIN(a,b) ((a) < (b) ? (a) : (b)) - #define MAX(a,b) ((a) > (b) ? (a) : (b)) -+#define DEFFONT "fixed" /* xft example: "Monospace-11" */ - - typedef struct Item Item; - struct Item { -@@ -26,6 +27,7 @@ - - static void appenditem(Item *item, Item **list, Item **last); - static void calcoffsets(void); -+static void cleanup(void); - static char *cistrstr(const char *s, const char *sub); - static void drawmenu(void); - static void grabkeyboard(void); -@@ -50,10 +52,12 @@ - static const char *selbgcolor = "#005577"; - static const char *selfgcolor = "#eeeeee"; - static unsigned int lines = 0; --static unsigned long normcol[ColLast]; --static unsigned long selcol[ColLast]; -+static ColorSet *normcol; -+static ColorSet *selcol; - static Atom clip, utf8; - static Bool topbar = True; -+static Bool running = True; -+static int ret = 0; - static DC *dc; - static Item *items = NULL; - static Item *matches, *matchend; -@@ -104,7 +108,9 @@ - usage(); - - dc = initdc(); -- initfont(dc, font); -+ initfont(dc, font ? font : DEFFONT); -+ normcol = initcolor(dc, normfgcolor, normbgcolor); -+ selcol = initcolor(dc, selfgcolor, selbgcolor); - - if(fast) { - grabkeyboard(); -@@ -117,7 +123,8 @@ - setup(); - run(); - -- return 1; /* unreachable */ -+ cleanup(); -+ return ret; - } - - void -@@ -160,6 +167,15 @@ - } - - void -+cleanup(void) { -+ freecol(dc, normcol); -+ freecol(dc, selcol); -+ XDestroyWindow(dc->dpy, win); -+ XUngrabKeyboard(dc->dpy, CurrentTime); -+ freedc(dc); -+} -+ -+void - drawmenu(void) { - int curpos; - Item *item; -@@ -167,7 +183,7 @@ - dc->x = 0; - dc->y = 0; - dc->h = bh; -- drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); -+ drawrect(dc, 0, 0, mw, mh, True, normcol->BG); - - if(prompt) { - dc->w = promptw; -@@ -178,7 +194,7 @@ - dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; - drawtext(dc, text, normcol); - if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) -- drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); -+ drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG); - - if(lines > 0) { - /* draw vertical list */ -@@ -321,7 +337,8 @@ - sel = matchend; - break; - case XK_Escape: -- exit(EXIT_FAILURE); -+ ret = EXIT_FAILURE; -+ running = False; - case XK_Home: - if(sel == matches) { - cursor = 0; -@@ -359,7 +376,8 @@ - case XK_Return: - case XK_KP_Enter: - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); -- exit(EXIT_SUCCESS); -+ ret = EXIT_SUCCESS; -+ running = False; - case XK_Right: - if(text[cursor] != '\0') { - cursor = nextrune(+1); -@@ -490,7 +508,7 @@ - run(void) { - XEvent ev; - -- while(!XNextEvent(dc->dpy, &ev)) { -+ while(running && !XNextEvent(dc->dpy, &ev)) { - if(XFilterEvent(&ev, win)) - continue; - switch(ev.type) { -@@ -524,11 +542,6 @@ - XineramaScreenInfo *info; - #endif - -- normcol[ColBG] = getcolor(dc, normbgcolor); -- normcol[ColFG] = getcolor(dc, normfgcolor); -- selcol[ColBG] = getcolor(dc, selbgcolor); -- selcol[ColFG] = getcolor(dc, selfgcolor); -- - clip = XInternAtom(dc->dpy, "CLIPBOARD", False); - utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); - -@@ -582,7 +595,7 @@ - - /* create menu window */ - swa.override_redirect = True; -- swa.background_pixel = normcol[ColBG]; -+ swa.background_pixel = normcol->BG; - swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0, - DefaultDepth(dc->dpy, screen), CopyFromParent, ---- a/draw.c -+++ b/draw.c -@@ -9,9 +9,6 @@ - - #define MAX(a, b) ((a) > (b) ? (a) : (b)) - #define MIN(a, b) ((a) < (b) ? (a) : (b)) --#define DEFAULTFN "fixed" -- --static Bool loadfont(DC *dc, const char *fontstr); - - void - drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) { -@@ -23,7 +20,7 @@ - } - - void --drawtext(DC *dc, const char *text, unsigned long col[ColLast]) { -+drawtext(DC *dc, const char *text, ColorSet *col) { - char buf[BUFSIZ]; - size_t mn, n = strlen(text); - -@@ -35,19 +32,24 @@ - if(mn < n) - for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.'); - -- drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col)); -+ drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG); - drawtextn(dc, buf, mn, col); - } - - void --drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) { -+drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) { - int x = dc->x + dc->font.height/2; - int y = dc->y + dc->font.ascent+1; - -- XSetForeground(dc->dpy, dc->gc, FG(dc, col)); -- if(dc->font.set) -+ XSetForeground(dc->dpy, dc->gc, col->FG); -+ if(dc->font.xft_font) { -+ if (!dc->xftdraw) -+ eprintf("error, xft drawable does not exist"); -+ XftDrawStringUtf8(dc->xftdraw, &col->FG_xft, -+ dc->font.xft_font, x, y, (unsigned char*)text, n); -+ } else if(dc->font.set) { - XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n); -- else { -+ } else { - XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid); - XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n); - } -@@ -69,16 +71,33 @@ - } - - void -+freecol(DC *dc, ColorSet *col) { -+ if(col) { -+ if(&col->FG_xft) -+ XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), -+ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft); -+ free(col); -+ } -+} -+ -+void - freedc(DC *dc) { -+ if(dc->font.xft_font) { -+ XftFontClose(dc->dpy, dc->font.xft_font); -+ XftDrawDestroy(dc->xftdraw); -+ } - if(dc->font.set) - XFreeFontSet(dc->dpy, dc->font.set); -- if(dc->font.xfont) -+ if(dc->font.xfont) - XFreeFont(dc->dpy, dc->font.xfont); -- if(dc->canvas) -+ if(dc->canvas) - XFreePixmap(dc->dpy, dc->canvas); -- XFreeGC(dc->dpy, dc->gc); -- XCloseDisplay(dc->dpy); -- free(dc); -+ if(dc->gc) -+ XFreeGC(dc->dpy, dc->gc); -+ if(dc->dpy) -+ XCloseDisplay(dc->dpy); -+ if(dc) -+ free(dc); - } - - unsigned long -@@ -91,6 +110,20 @@ - return color.pixel; - } - -+ColorSet * -+initcolor(DC *dc, const char * foreground, const char * background) { -+ ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet)); -+ if(!col) -+ eprintf("error, cannot allocate memory for color set"); -+ col->BG = getcolor(dc, background); -+ col->FG = getcolor(dc, foreground); -+ if(dc->font.xft_font) -+ if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), -+ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft)) -+ eprintf("error, cannot allocate xft font color '%s'\n", foreground); -+ return col; -+} -+ - DC * - initdc(void) { - DC *dc; -@@ -109,23 +142,11 @@ - - void - initfont(DC *dc, const char *fontstr) { -- if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) { -- if(fontstr != NULL) -- fprintf(stderr, "cannot load font '%s'\n", fontstr); -- if(fontstr == NULL || !loadfont(dc, DEFAULTFN)) -- eprintf("cannot load font '%s'\n", DEFAULTFN); -- } -- dc->font.height = dc->font.ascent + dc->font.descent; --} -- --Bool --loadfont(DC *dc, const char *fontstr) { - char *def, **missing, **names; - int i, n; - XFontStruct **xfonts; - -- if(!*fontstr) -- return False; -+ missing = NULL; - if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) { - n = XFontsOfFontSet(dc->font.set, &xfonts, &names); - for(i = 0; i < n; i++) { -@@ -133,15 +154,21 @@ - dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent); - dc->font.width = MAX(dc->font.width, xfonts[i]->max_bounds.width); - } -- } -- else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { -- dc->font.ascent = dc->font.xfont->ascent; -+ } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { -+ dc->font.ascent = dc->font.xfont->ascent; - dc->font.descent = dc->font.xfont->descent; - dc->font.width = dc->font.xfont->max_bounds.width; -+ } else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) { -+ dc->font.ascent = dc->font.xft_font->ascent; -+ dc->font.descent = dc->font.xft_font->descent; -+ dc->font.width = dc->font.xft_font->max_advance_width; -+ } else { -+ eprintf("cannot load font '%s'\n", fontstr); - } - if(missing) - XFreeStringList(missing); -- return dc->font.set || dc->font.xfont; -+ dc->font.height = dc->font.ascent + dc->font.descent; -+ return; - } - - void -@@ -151,20 +178,29 @@ - - void - resizedc(DC *dc, unsigned int w, unsigned int h) { -+ int screen = DefaultScreen(dc->dpy); - if(dc->canvas) - XFreePixmap(dc->dpy, dc->canvas); - - dc->w = w; - dc->h = h; - dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h, -- DefaultDepth(dc->dpy, DefaultScreen(dc->dpy))); -+ DefaultDepth(dc->dpy, screen)); -+ if(dc->font.xft_font && !(dc->xftdraw)) { -+ dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen)); -+ if(!(dc->xftdraw)) -+ eprintf("error, cannot create xft drawable\n"); -+ } - } - - int - textnw(DC *dc, const char *text, size_t len) { -- if(dc->font.set) { -+ if(dc->font.xft_font) { -+ XGlyphInfo gi; -+ XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi); -+ return gi.width; -+ } else if(dc->font.set) { - XRectangle r; -- - XmbTextExtents(dc->font.set, text, len, NULL, &r); - return r.width; - } ---- a/draw.h -+++ b/draw.h -@@ -1,9 +1,6 @@ - /* See LICENSE file for copyright and license details. */ - --#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG]) --#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG]) -- --enum { ColBG, ColFG, ColBorder, ColLast }; -+#include - - typedef struct { - int x, y, w, h; -@@ -11,6 +8,7 @@ - Display *dpy; - GC gc; - Pixmap canvas; -+ XftDraw *xftdraw; - struct { - int ascent; - int descent; -@@ -18,15 +16,24 @@ - int width; - XFontSet set; - XFontStruct *xfont; -+ XftFont *xft_font; - } font; - } DC; /* draw context */ - -+typedef struct { -+ unsigned long FG; -+ XftColor FG_xft; -+ unsigned long BG; -+} ColorSet; -+ - void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color); --void drawtext(DC *dc, const char *text, unsigned long col[ColLast]); --void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]); -+void drawtext(DC *dc, const char *text, ColorSet *col); -+void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col); -+void freecol(DC *dc, ColorSet *col); - void eprintf(const char *fmt, ...); - void freedc(DC *dc); - unsigned long getcolor(DC *dc, const char *colstr); -+ColorSet *initcolor(DC *dc, const char *foreground, const char *background); - DC *initdc(void); - void initfont(DC *dc, const char *fontstr); - void mapdc(DC *dc, Window win, unsigned int w, unsigned int h); diff --git a/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch b/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch deleted file mode 100644 index e97629a69871..000000000000 --- a/x11-misc/dmenu/files/dmenu-4.5-xft-3.patch +++ /dev/null @@ -1,412 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -12,9 +12,13 @@ - XINERAMALIBS = -lXinerama - XINERAMAFLAGS = -DXINERAMA - -+# Xft, comment if you don't want it -+XFTINC = $(shell pkg-config --cflags xft) -+XFTLIBS = $(shell pkg-config --libs xft) -+ - # includes and libs --INCS = -I${X11INC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} -+INCS = -I${X11INC} ${XFTINC} -+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} - - # flags - CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ---- a/dmenu.1 -+++ b/dmenu.1 -@@ -53,7 +53,7 @@ - defines the prompt to be displayed to the left of the input field. - .TP - .BI \-fn " font" --defines the font or font set used. -+defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font) - .TP - .BI \-nb " color" - defines the normal background color. ---- a/dmenu.c -+++ b/dmenu.c -@@ -17,6 +17,7 @@ - * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) - #define MIN(a,b) ((a) < (b) ? (a) : (b)) - #define MAX(a,b) ((a) > (b) ? (a) : (b)) -+#define DEFFONT "fixed" /* xft example: "Monospace-11" */ - - typedef struct Item Item; - struct Item { -@@ -26,6 +27,7 @@ - - static void appenditem(Item *item, Item **list, Item **last); - static void calcoffsets(void); -+static void cleanup(void); - static char *cistrstr(const char *s, const char *sub); - static void drawmenu(void); - static void grabkeyboard(void); -@@ -50,10 +52,12 @@ - static const char *selbgcolor = "#005577"; - static const char *selfgcolor = "#eeeeee"; - static unsigned int lines = 0; --static unsigned long normcol[ColLast]; --static unsigned long selcol[ColLast]; -+static ColorSet *normcol; -+static ColorSet *selcol; - static Atom clip, utf8; - static Bool topbar = True; -+static Bool running = True; -+static int ret = 0; - static DC *dc; - static Item *items = NULL; - static Item *matches, *matchend; -@@ -104,7 +108,9 @@ - usage(); - - dc = initdc(); -- initfont(dc, font); -+ initfont(dc, font ? font : DEFFONT); -+ normcol = initcolor(dc, normfgcolor, normbgcolor); -+ selcol = initcolor(dc, selfgcolor, selbgcolor); - - if(fast) { - grabkeyboard(); -@@ -117,7 +123,8 @@ - setup(); - run(); - -- return 1; /* unreachable */ -+ cleanup(); -+ return ret; - } - - void -@@ -160,6 +167,15 @@ - } - - void -+cleanup(void) { -+ freecol(dc, normcol); -+ freecol(dc, selcol); -+ XDestroyWindow(dc->dpy, win); -+ XUngrabKeyboard(dc->dpy, CurrentTime); -+ freedc(dc); -+} -+ -+void - drawmenu(void) { - int curpos; - Item *item; -@@ -167,7 +183,7 @@ - dc->x = 0; - dc->y = 0; - dc->h = bh; -- drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); -+ drawrect(dc, 0, 0, mw, mh, True, normcol->BG); - - if(prompt) { - dc->w = promptw; -@@ -178,7 +194,7 @@ - dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; - drawtext(dc, text, normcol); - if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) -- drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); -+ drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG); - - if(lines > 0) { - /* draw vertical list */ -@@ -321,7 +337,9 @@ - sel = matchend; - break; - case XK_Escape: -- exit(EXIT_FAILURE); -+ ret = EXIT_FAILURE; -+ running = False; -+ break; - case XK_Home: - if(sel == matches) { - cursor = 0; -@@ -359,7 +377,9 @@ - case XK_Return: - case XK_KP_Enter: - puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); -- exit(EXIT_SUCCESS); -+ ret = EXIT_SUCCESS; -+ running = False; -+ break; - case XK_Right: - if(text[cursor] != '\0') { - cursor = nextrune(+1); -@@ -490,7 +510,7 @@ - run(void) { - XEvent ev; - -- while(!XNextEvent(dc->dpy, &ev)) { -+ while(running && !XNextEvent(dc->dpy, &ev)) { - if(XFilterEvent(&ev, win)) - continue; - switch(ev.type) { -@@ -524,11 +544,6 @@ - XineramaScreenInfo *info; - #endif - -- normcol[ColBG] = getcolor(dc, normbgcolor); -- normcol[ColFG] = getcolor(dc, normfgcolor); -- selcol[ColBG] = getcolor(dc, selbgcolor); -- selcol[ColFG] = getcolor(dc, selfgcolor); -- - clip = XInternAtom(dc->dpy, "CLIPBOARD", False); - utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); - -@@ -582,7 +597,7 @@ - - /* create menu window */ - swa.override_redirect = True; -- swa.background_pixel = normcol[ColBG]; -+ swa.background_pixel = normcol->BG; - swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0, - DefaultDepth(dc->dpy, screen), CopyFromParent, ---- a/draw.c -+++ b/draw.c -@@ -9,9 +9,6 @@ - - #define MAX(a, b) ((a) > (b) ? (a) : (b)) - #define MIN(a, b) ((a) < (b) ? (a) : (b)) --#define DEFAULTFN "fixed" -- --static Bool loadfont(DC *dc, const char *fontstr); - - void - drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) { -@@ -23,7 +20,7 @@ - } - - void --drawtext(DC *dc, const char *text, unsigned long col[ColLast]) { -+drawtext(DC *dc, const char *text, ColorSet *col) { - char buf[BUFSIZ]; - size_t mn, n = strlen(text); - -@@ -35,19 +32,24 @@ - if(mn < n) - for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.'); - -- drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col)); -+ drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG); - drawtextn(dc, buf, mn, col); - } - - void --drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) { -+drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) { - int x = dc->x + dc->font.height/2; - int y = dc->y + dc->font.ascent+1; - -- XSetForeground(dc->dpy, dc->gc, FG(dc, col)); -- if(dc->font.set) -+ XSetForeground(dc->dpy, dc->gc, col->FG); -+ if(dc->font.xft_font) { -+ if (!dc->xftdraw) -+ eprintf("error, xft drawable does not exist"); -+ XftDrawStringUtf8(dc->xftdraw, &col->FG_xft, -+ dc->font.xft_font, x, y, (unsigned char*)text, n); -+ } else if(dc->font.set) { - XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n); -- else { -+ } else { - XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid); - XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n); - } -@@ -69,16 +71,33 @@ - } - - void -+freecol(DC *dc, ColorSet *col) { -+ if(col) { -+ if(&col->FG_xft) -+ XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), -+ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft); -+ free(col); -+ } -+} -+ -+void - freedc(DC *dc) { -+ if(dc->font.xft_font) { -+ XftFontClose(dc->dpy, dc->font.xft_font); -+ XftDrawDestroy(dc->xftdraw); -+ } - if(dc->font.set) - XFreeFontSet(dc->dpy, dc->font.set); -- if(dc->font.xfont) -+ if(dc->font.xfont) - XFreeFont(dc->dpy, dc->font.xfont); -- if(dc->canvas) -+ if(dc->canvas) - XFreePixmap(dc->dpy, dc->canvas); -- XFreeGC(dc->dpy, dc->gc); -- XCloseDisplay(dc->dpy); -- free(dc); -+ if(dc->gc) -+ XFreeGC(dc->dpy, dc->gc); -+ if(dc->dpy) -+ XCloseDisplay(dc->dpy); -+ if(dc) -+ free(dc); - } - - unsigned long -@@ -91,6 +110,20 @@ - return color.pixel; - } - -+ColorSet * -+initcolor(DC *dc, const char * foreground, const char * background) { -+ ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet)); -+ if(!col) -+ eprintf("error, cannot allocate memory for color set"); -+ col->BG = getcolor(dc, background); -+ col->FG = getcolor(dc, foreground); -+ if(dc->font.xft_font) -+ if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), -+ DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft)) -+ eprintf("error, cannot allocate xft font color '%s'\n", foreground); -+ return col; -+} -+ - DC * - initdc(void) { - DC *dc; -@@ -109,23 +142,11 @@ - - void - initfont(DC *dc, const char *fontstr) { -- if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) { -- if(fontstr != NULL) -- fprintf(stderr, "cannot load font '%s'\n", fontstr); -- if(fontstr == NULL || !loadfont(dc, DEFAULTFN)) -- eprintf("cannot load font '%s'\n", DEFAULTFN); -- } -- dc->font.height = dc->font.ascent + dc->font.descent; --} -- --Bool --loadfont(DC *dc, const char *fontstr) { - char *def, **missing, **names; - int i, n; - XFontStruct **xfonts; - -- if(!*fontstr) -- return False; -+ missing = NULL; - if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) { - n = XFontsOfFontSet(dc->font.set, &xfonts, &names); - for(i = 0; i < n; i++) { -@@ -133,15 +154,21 @@ - dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent); - dc->font.width = MAX(dc->font.width, xfonts[i]->max_bounds.width); - } -- } -- else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { -- dc->font.ascent = dc->font.xfont->ascent; -+ } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) { -+ dc->font.ascent = dc->font.xfont->ascent; - dc->font.descent = dc->font.xfont->descent; - dc->font.width = dc->font.xfont->max_bounds.width; -+ } else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) { -+ dc->font.ascent = dc->font.xft_font->ascent; -+ dc->font.descent = dc->font.xft_font->descent; -+ dc->font.width = dc->font.xft_font->max_advance_width; -+ } else { -+ eprintf("cannot load font '%s'\n", fontstr); - } - if(missing) - XFreeStringList(missing); -- return dc->font.set || dc->font.xfont; -+ dc->font.height = dc->font.ascent + dc->font.descent; -+ return; - } - - void -@@ -151,20 +178,29 @@ - - void - resizedc(DC *dc, unsigned int w, unsigned int h) { -+ int screen = DefaultScreen(dc->dpy); - if(dc->canvas) - XFreePixmap(dc->dpy, dc->canvas); - - dc->w = w; - dc->h = h; - dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h, -- DefaultDepth(dc->dpy, DefaultScreen(dc->dpy))); -+ DefaultDepth(dc->dpy, screen)); -+ if(dc->font.xft_font && !(dc->xftdraw)) { -+ dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen)); -+ if(!(dc->xftdraw)) -+ eprintf("error, cannot create xft drawable\n"); -+ } - } - - int - textnw(DC *dc, const char *text, size_t len) { -- if(dc->font.set) { -+ if(dc->font.xft_font) { -+ XGlyphInfo gi; -+ XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi); -+ return gi.width; -+ } else if(dc->font.set) { - XRectangle r; -- - XmbTextExtents(dc->font.set, text, len, NULL, &r); - return r.width; - } ---- a/draw.h -+++ b/draw.h -@@ -1,9 +1,6 @@ - /* See LICENSE file for copyright and license details. */ - --#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG]) --#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG]) -- --enum { ColBG, ColFG, ColBorder, ColLast }; -+#include - - typedef struct { - int x, y, w, h; -@@ -11,6 +8,7 @@ - Display *dpy; - GC gc; - Pixmap canvas; -+ XftDraw *xftdraw; - struct { - int ascent; - int descent; -@@ -18,15 +16,24 @@ - int width; - XFontSet set; - XFontStruct *xfont; -+ XftFont *xft_font; - } font; - } DC; /* draw context */ - -+typedef struct { -+ unsigned long FG; -+ XftColor FG_xft; -+ unsigned long BG; -+} ColorSet; -+ - void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color); --void drawtext(DC *dc, const char *text, unsigned long col[ColLast]); --void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]); -+void drawtext(DC *dc, const char *text, ColorSet *col); -+void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col); -+void freecol(DC *dc, ColorSet *col); - void eprintf(const char *fmt, ...); - void freedc(DC *dc); - unsigned long getcolor(DC *dc, const char *colstr); -+ColorSet *initcolor(DC *dc, const char *foreground, const char *background); - DC *initdc(void); - void initfont(DC *dc, const char *fontstr); - void mapdc(DC *dc, Window win, unsigned int w, unsigned int h); diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml index f1f09f92928c..b4a38aa72629 100644 --- a/x11-misc/dmenu/metadata.xml +++ b/x11-misc/dmenu/metadata.xml @@ -8,7 +8,4 @@ desktop-misc@gentoo.org Gentoo Desktop Miscellaneous Project - - Enable unofficial x11-libs/libXft support - diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest new file mode 100644 index 000000000000..94e32557654f --- /dev/null +++ b/x11-wm/lumina/Manifest @@ -0,0 +1 @@ +DIST lumina-0.8.8_p1.tar.gz 53783856 SHA256 52bd8ec956e0a9f89c87bd957e308705aab3ac8c72130a606746af982bf361b7 SHA512 5fbfb6ad19a10b286001252cb2c93e92d4e2ed12a94c29f178afd777d0f2ff5f4d44b0300a40446f89d6c73237155d5963cda966c3fe16d4e9f07fcd4bddc6bb WHIRLPOOL 2e772fe413610ec7814c0e1de9c263c0d84afc45d9a308759ae442f8951fec7c82b16d5c8cb7eba5ce0e6f96f35a5410873370b1732e572ed469133089ad6906 diff --git a/x11-wm/lumina/lumina-0.8.8_p1.ebuild b/x11-wm/lumina/lumina-0.8.8_p1.ebuild new file mode 100644 index 000000000000..fbc0e74602af --- /dev/null +++ b/x11-wm/lumina/lumina-0.8.8_p1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit qmake-utils vcs-snapshot + +COMMIT_ID="248abdd" +DESCRIPTION="Lumina desktop environment" +HOMEPAGE="http://lumina-desktop.org/" +SRC_URI="https://github.com/pcbsd/lumina/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libxcb:0 + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-wm" + +RDEPEND="${DEPEND} + kde-frameworks/oxygen-icons + x11-misc/numlockx + x11-wm/fluxbox + x11-apps/xbacklight + media-sound/alsa-utils + sys-power/acpi + app-admin/sysstat" + +src_configure(){ + eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" +} + +src_install(){ + default + mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die + mv "${D}"/?umina-* "${D}"/usr/bin || die +} diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild new file mode 100644 index 000000000000..606868b17714 --- /dev/null +++ b/x11-wm/lumina/lumina-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit git-r3 qmake-utils + +DESCRIPTION="Lumina desktop environment" +HOMEPAGE="http://lumina-desktop.org/" +EGIT_REPO_URI="https://github.com/pcbsd/lumina" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="" + +DEPEND="dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libxcb:0 + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-wm" + +RDEPEND="${DEPEND} + kde-frameworks/oxygen-icons + x11-misc/numlockx + x11-wm/fluxbox + x11-apps/xbacklight + media-sound/alsa-utils + sys-power/acpi + app-admin/sysstat" + +src_configure(){ + eqmake5 PREFIX="${ROOT}usr" L_ETCDIR="${ROOT}etc" LIBPREFIX="${ROOT}usr/$(get_libdir)" DESTDIR="${D}" CONFIG+="NO_I18N" +} + +src_install(){ + default + mv "${D}"/etc/luminaDesktop.conf.dist "${D}"/etc/luminaDesktop.conf || die + mv "${D}"/?umina-* "${D}"/usr/bin || die +} diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml new file mode 100644 index 000000000000..cd37de95715d --- /dev/null +++ b/x11-wm/lumina/metadata.xml @@ -0,0 +1,28 @@ + + + + + proxy-maint@gentoo.org + Gentoo Proxy Maintainers Project + + + rubin@xs4all.nl + Rubin Simons + Proxied maintainer; set to assignee in all bugs + + + + ken@pcbsd.org + Ken Moore + + pcbsd/lumina + https://github.com/pcbsd/lumina/issues + http://lumina-desktop.org/handbook/ + + The Lumina Desktop Environment is a lightweight system interface that is designed for use on any Unix-like operating system. It takes a plugin-based approach, allowing the entire interface to be assembled/arranged by each individual user as desired, with a system-wide default layout which was setup by the system administrator. This allows every system (or user session) to be designed to maximize the individual user's productivity. + + The Lumina desktop developers understand that the point of a computer system is to run applications, so Lumina was designed to require as few system dependencies/requirements as possible. This allows it to be used to revitalize older systems or to allow the user to run applications that may need a higher percentage of the system resources than were previously available with other desktop environments. + + Lumina is created/distributed under the 3-clause BSD license, allowing it to be used by anyone, anywhere (including in proprietary distributions). It has been written from scratch in C++/Qt5 and is not based on any existing desktop's code-base. It also does not use any of the Linux-based desktop frameworks (ConsoleKit, PolicyKit, D-Bus, systemd, etc), instead using a simple built-in interface layer for communicating directly with the operating system. + +