summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/keepassx/Manifest2
-rw-r--r--app-admin/keepassx/keepassx-2.0.ebuild (renamed from app-admin/keepassx/keepassx-2.0_alpha6.ebuild)3
-rw-r--r--app-admin/logrotate/logrotate-3.9.1-r1.ebuild2
-rw-r--r--app-admin/logstash-bin/Manifest4
-rw-r--r--app-admin/logstash-bin/files/agent.conf.sample-r220
-rw-r--r--app-admin/logstash-bin/files/logstash.confd2
-rw-r--r--app-admin/logstash-bin/files/logstash.confd-r29
-rw-r--r--app-admin/logstash-bin/files/logstash.initd33
-rw-r--r--app-admin/logstash-bin/files/logstash.initd-r249
-rw-r--r--app-admin/logstash-bin/logstash-bin-1.4.5.ebuild50
-rw-r--r--app-admin/logstash-bin/logstash-bin-2.1.0.ebuild (renamed from app-admin/logstash-bin/logstash-bin-1.5.4.ebuild)19
-rw-r--r--app-admin/logstash-bin/metadata.xml16
-rw-r--r--app-admin/restart_services/Manifest3
-rw-r--r--app-admin/restart_services/restart_services-0.11.0.ebuild28
-rw-r--r--app-admin/restart_services/restart_services-0.12.0.ebuild28
-rw-r--r--app-admin/restart_services/restart_services-0.13.1.ebuild (renamed from app-admin/restart_services/restart_services-0.13.0.ebuild)9
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.7.2.ebuild2
-rw-r--r--app-arch/dpkg/dpkg-1.17.26.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.0.24-r2.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.0.36-r2.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.0.40.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.1.4.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.1.8.ebuild2
-rw-r--r--app-backup/backintime/metadata.xml12
-rw-r--r--app-backup/bareos/bareos-15.2.2.ebuild2
-rw-r--r--app-backup/obnam/Manifest3
-rw-r--r--app-backup/obnam/files/obnam-1.9-setup-man.diff11
-rw-r--r--app-backup/obnam/obnam-1.18.2.ebuild (renamed from app-backup/obnam/obnam-1.16.ebuild)19
-rw-r--r--app-backup/obnam/obnam-1.9.ebuild54
-rw-r--r--app-crypt/acme/Manifest1
-rw-r--r--app-crypt/acme/acme-0.1.0-r1.ebuild43
-rw-r--r--app-crypt/acme/acme-9999.ebuild18
-rw-r--r--app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild37
-rw-r--r--app-crypt/gnupg/Manifest1
-rw-r--r--app-crypt/gnupg/gnupg-2.1.10.ebuild173
-rw-r--r--app-crypt/gnupg/metadata.xml4
-rw-r--r--app-editors/nano/Manifest1
-rw-r--r--app-editors/nano/nano-2.5.0.ebuild83
-rw-r--r--app-editors/neovim/Manifest2
-rw-r--r--app-editors/neovim/files/automagic-jemalloc.patch35
-rw-r--r--app-editors/neovim/files/nvimrc105
-rw-r--r--app-editors/neovim/neovim-0.1.1-r1.ebuild (renamed from app-editors/neovim/neovim-0.0.0_pre20151025.ebuild)18
-rw-r--r--app-emulation/docker-machine/Manifest1
-rw-r--r--app-emulation/docker-machine/docker-machine-0.5.2.ebuild41
-rw-r--r--app-emulation/libcacard/Manifest1
-rw-r--r--app-emulation/libcacard/libcacard-2.5.1.ebuild29
-rw-r--r--app-emulation/libvirt/libvirt-1.2.18-r1.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-1.2.19-r1.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-1.2.20-r1.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-1.2.21.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild2
-rw-r--r--app-emulation/lxc/Manifest2
-rw-r--r--app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch35
-rw-r--r--app-emulation/lxc/lxc-1.0.8.ebuild189
-rw-r--r--app-emulation/lxc/lxc-1.1.5.ebuild198
-rw-r--r--app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch49
-rw-r--r--app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch37
-rw-r--r--app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch65
-rw-r--r--app-emulation/qemu/metadata.xml1
-rw-r--r--app-emulation/qemu/qemu-2.3.0-r5.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.3.0-r6.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.3.1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.4.0-r1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.4.0.1-r1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.4.0.1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-2.4.1-r1.ebuild644
-rw-r--r--app-emulation/qemu/qemu-2.4.1.ebuild2
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild8
-rw-r--r--app-emulation/runc/Manifest1
-rw-r--r--app-emulation/runc/runc-0.0.5.ebuild52
-rw-r--r--app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild53
-rw-r--r--app-emulation/xen/xen-4.6.0-r2.ebuild5
-rw-r--r--app-eselect/eselect-php/Manifest1
-rw-r--r--app-eselect/eselect-php/eselect-php-0.8.0.ebuild38
-rw-r--r--app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild2
-rw-r--r--app-misc/c_rehash/c_rehash-1.7-r1.ebuild2
-rw-r--r--app-mobilephone/yaps/yaps-0.96-r5.ebuild9
-rw-r--r--app-portage/elogviewer/elogviewer-2.6-r1.ebuild2
-rw-r--r--app-portage/kuroo4/kuroo4-0.90.4.ebuild2
-rw-r--r--app-portage/kuroo4/kuroo4-0.90.5.ebuild2
-rw-r--r--app-portage/porthole/porthole-0.6.1-r4.ebuild2
-rw-r--r--app-portage/ufed/ufed-0.92.ebuild2
-rw-r--r--app-shells/hstr/Manifest1
-rw-r--r--app-shells/hstr/files/hstr-1.18-tinfo.patch47
-rw-r--r--app-shells/hstr/hstr-1.18.ebuild32
-rw-r--r--app-text/sigil/Manifest1
-rw-r--r--app-text/sigil/sigil-0.9.1.ebuild (renamed from app-text/sigil/sigil-0.8.7.ebuild)41
-rw-r--r--app-text/tesseract/Manifest13
-rw-r--r--app-text/tesseract/files/tesseract-2.04-gcc44.patch15
-rw-r--r--app-text/tesseract/metadata.xml13
-rw-r--r--app-text/tesseract/tesseract-2.04-r1.ebuild71
-rw-r--r--app-text/tesseract/tesseract-3.03_rc1-r1.ebuild108
-rw-r--r--app-text/tesseract/tesseract-3.04.00-r3.ebuild (renamed from app-text/tesseract/tesseract-3.04.00-r1.ebuild)33
-rw-r--r--app-text/tesseract/tesseract-3.04.00.ebuild107
-rw-r--r--app-text/texlive/texlive-2014.ebuild2
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild2
-rw-r--r--dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild76
-rw-r--r--dev-db/couchdb/couchdb-1.6.1-r2.ebuild3
-rw-r--r--dev-db/redis/redis-3.0.4.ebuild2
-rw-r--r--dev-db/redis/redis-3.0.5.ebuild2
-rw-r--r--dev-db/sqlitebrowser/Manifest2
-rw-r--r--dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild71
-rw-r--r--dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild73
-rw-r--r--dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild (renamed from dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild)2
-rw-r--r--dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild14
-rw-r--r--dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild14
-rw-r--r--dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild14
-rw-r--r--dev-haskell/http/Manifest3
-rw-r--r--dev-haskell/http/http-4000.1.1.ebuild31
-rw-r--r--dev-haskell/http/http-4000.1.2.ebuild36
-rw-r--r--dev-haskell/http/http-4000.2.2.ebuild43
-rw-r--r--dev-haskell/monad-control/Manifest1
-rw-r--r--dev-haskell/monad-control/monad-control-0.2.0.3.ebuild35
-rw-r--r--dev-haskell/mtl/Manifest1
-rw-r--r--dev-haskell/mtl/mtl-2.0.1.0.ebuild24
-rw-r--r--dev-haskell/transformers/Manifest1
-rw-r--r--dev-haskell/transformers/transformers-0.2.2.0.ebuild23
-rw-r--r--dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild2
-rw-r--r--dev-haskell/transformers/transformers-0.3.0.0.ebuild21
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild19
-rw-r--r--dev-java/commons-lang/commons-lang-2.0-r3.ebuild34
-rw-r--r--dev-java/commons-lang/commons-lang-2.6-r1.ebuild2
-rw-r--r--dev-java/commons-lang/commons-lang-2.6.ebuild34
-rw-r--r--dev-java/glassfish-deployment-api/Manifest1
-rw-r--r--dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild23
-rw-r--r--dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch32
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild136
-rw-r--r--dev-java/guava/guava-18.0.ebuild2
-rw-r--r--dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild12
-rw-r--r--dev-java/jacl/jacl-1.4.1-r1.ebuild53
-rw-r--r--dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild22
-rw-r--r--dev-java/javax-inject/javax-inject-1-r1.ebuild2
-rw-r--r--dev-java/javolution/Manifest1
-rw-r--r--dev-java/javolution/javolution-2.2.4-r1.ebuild39
-rw-r--r--dev-java/javolution/javolution-2.2.4-r2.ebuild36
-rw-r--r--dev-java/javolution/javolution-4.0.2-r1.ebuild4
-rw-r--r--dev-java/javolution/javolution-4.0.2.ebuild37
-rw-r--r--dev-java/jaxme/jaxme-0.5.2-r2.ebuild (renamed from dev-java/jaxme/jaxme-0.5.2-r1.ebuild)21
-rw-r--r--dev-java/jcommon/Manifest1
-rw-r--r--dev-java/jcommon/jcommon-1.0.18.ebuild52
-rw-r--r--dev-java/jcommon/jcommon-1.0.23.ebuild2
-rw-r--r--dev-java/jettison/Manifest1
-rw-r--r--dev-java/jettison/files/build.xml63
-rw-r--r--dev-java/jettison/jettison-1.0.ebuild42
-rw-r--r--dev-java/jettison/jettison-1.3.7.ebuild3
-rw-r--r--dev-java/jfreechart/Manifest2
-rw-r--r--dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch58
-rw-r--r--dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch35
-rw-r--r--dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch24
-rw-r--r--dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch11
-rw-r--r--dev-java/jfreechart/jfreechart-1.0.13.ebuild64
-rw-r--r--dev-java/jfreechart/jfreechart-1.0.14.ebuild84
-rw-r--r--dev-java/jfreechart/jfreechart-1.0.19.ebuild3
-rw-r--r--dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild6
-rw-r--r--dev-java/jfreesvg/jfreesvg-3.0.ebuild2
-rw-r--r--dev-java/jsap/Manifest1
-rw-r--r--dev-java/jsap/jsap-2.1-r1.ebuild73
-rw-r--r--dev-java/json/json-20150729.ebuild4
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild249
-rw-r--r--dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild (renamed from dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild)2
-rw-r--r--dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild (renamed from dev-java/netbeans-java/netbeans-java-8.0.2-r3.ebuild)2
-rw-r--r--dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild (renamed from dev-java/netbeans-java/netbeans-java-8.1.ebuild)2
-rw-r--r--dev-java/tomcat-servlet-api/Manifest1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.30.ebuild36
-rw-r--r--dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild (renamed from dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild)12
-rw-r--r--dev-lang/python/Manifest2
-rw-r--r--dev-lang/python/python-2.7.11.ebuild371
-rw-r--r--dev-libs/libbsd/Manifest1
-rw-r--r--dev-libs/libbsd/libbsd-0.8.0.ebuild40
-rw-r--r--dev-libs/libpcre/libpcre-8.38.ebuild2
-rw-r--r--dev-libs/libressl/Manifest1
-rw-r--r--dev-libs/libressl/libressl-2.2.5.ebuild47
-rw-r--r--dev-libs/libtermkey/Manifest1
-rw-r--r--dev-libs/libtermkey/libtermkey-0.18.ebuild38
-rw-r--r--dev-libs/libxslt/libxslt-1.1.28-r5.ebuild2
-rw-r--r--dev-libs/nanomsg/Manifest1
-rw-r--r--dev-libs/nanomsg/nanomsg-0.8.ebuild49
-rw-r--r--dev-libs/openssl/openssl-0.9.8z_p8.ebuild2
-rw-r--r--dev-libs/openssl/openssl-1.0.2e.ebuild2
-rw-r--r--dev-ml/lablgtk/lablgtk-2.18.3.ebuild2
-rw-r--r--dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild2
-rw-r--r--dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild2
-rw-r--r--dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild2
-rw-r--r--dev-perl/PadWalker/PadWalker-2.100.0.ebuild2
-rw-r--r--dev-php/PEAR-PEAR/Manifest2
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1.ebuild (renamed from dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild)2
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf2
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf-r12
-rw-r--r--dev-php/pear/pear-1.10.1.ebuild (renamed from dev-php/pear/pear-1.10.0_alpha2.ebuild)5
-rw-r--r--dev-php/pecl-imagick/Manifest5
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild25
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild23
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.3.0.ebuild25
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.3.0_rc1.ebuild24
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild (renamed from dev-php/pecl-imagick/pecl-imagick-3.3.0_rc2.ebuild)9
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild36
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild2
-rw-r--r--dev-python/certifi/certifi-2015.11.20.ebuild2
-rw-r--r--dev-python/certifi/certifi-2015.9.6.2.ebuild2
-rw-r--r--dev-python/django-cms/Manifest1
-rw-r--r--dev-python/django-cms/django-cms-3.1.3.ebuild42
-rw-r--r--dev-python/django-filer/Manifest1
-rw-r--r--dev-python/django-filer/django-filer-1.0.4.ebuild30
-rw-r--r--dev-python/django-sekizai/Manifest1
-rw-r--r--dev-python/django-sekizai/django-sekizai-0.9.0.ebuild28
-rw-r--r--dev-python/flask-socketio/Manifest1
-rw-r--r--dev-python/flask-socketio/flask-socketio-1.1.ebuild33
-rw-r--r--dev-python/kombu/Manifest1
-rw-r--r--dev-python/kombu/kombu-3.0.30.ebuild107
-rw-r--r--dev-python/ldap3/Manifest1
-rw-r--r--dev-python/ldap3/ldap3-1.0.1.ebuild29
-rw-r--r--dev-python/mock/mock-1.3.0-r1.ebuild2
-rw-r--r--dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild4
-rw-r--r--dev-python/packaging/packaging-15.3-r2.ebuild2
-rw-r--r--dev-python/pbr/pbr-1.8.1.ebuild2
-rw-r--r--dev-python/placefinder/placefinder-0.3.ebuild2
-rw-r--r--dev-python/py-amqp/Manifest1
-rw-r--r--dev-python/py-amqp/py-amqp-1.4.8.ebuild66
-rw-r--r--dev-python/pylint/pylint-1.5.1.ebuild2
-rw-r--r--dev-python/pytest/Manifest1
-rw-r--r--dev-python/pytest/pytest-2.7.2.ebuild2
-rw-r--r--dev-python/pytest/pytest-2.8.2.ebuild2
-rw-r--r--dev-python/pytest/pytest-2.8.4.ebuild82
-rw-r--r--dev-python/python-engineio/Manifest1
-rw-r--r--dev-python/python-engineio/metadata.xml12
-rw-r--r--dev-python/python-engineio/python-engineio-0.8.1.ebuild38
-rw-r--r--dev-python/python-socketio/Manifest1
-rw-r--r--dev-python/python-socketio/metadata.xml12
-rw-r--r--dev-python/python-socketio/python-socketio-0.7.0.ebuild40
-rw-r--r--dev-python/reno/Manifest1
-rw-r--r--dev-python/reno/metadata.xml13
-rw-r--r--dev-python/reno/reno-1.2.0.ebuild28
-rw-r--r--dev-python/rfc3986/Manifest1
-rw-r--r--dev-python/rfc3986/rfc3986-0.3.1.ebuild28
-rw-r--r--dev-python/setuptools/setuptools-18.4.ebuild2
-rw-r--r--dev-python/setuptools_scm/Manifest1
-rw-r--r--dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild26
-rw-r--r--dev-python/six/six-1.10.0.ebuild4
-rw-r--r--dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild (renamed from dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild)1
-rw-r--r--dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild1
-rw-r--r--dev-ruby/addressable/Manifest2
-rw-r--r--dev-ruby/addressable/addressable-2.4.0.ebuild (renamed from dev-ruby/addressable/addressable-2.3.7.ebuild)15
-rw-r--r--dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild2
-rw-r--r--dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2014.ebuild2
-rw-r--r--dev-texlive/texlive-context/texlive-context-2014.ebuild2
-rw-r--r--dev-texlive/texlive-formatsextra/texlive-formatsextra-2014.ebuild2
-rw-r--r--dev-texlive/texlive-games/texlive-games-2014.ebuild2
-rw-r--r--dev-texlive/texlive-genericextra/texlive-genericextra-2014.ebuild2
-rw-r--r--dev-texlive/texlive-humanities/texlive-humanities-2014.ebuild2
-rw-r--r--dev-texlive/texlive-music/texlive-music-2014.ebuild2
-rw-r--r--dev-texlive/texlive-omega/texlive-omega-2014.ebuild2
-rw-r--r--dev-texlive/texlive-pstricks/texlive-pstricks-2014.ebuild2
-rw-r--r--dev-texlive/texlive-publishers/texlive-publishers-2014.ebuild2
-rw-r--r--dev-texlive/texlive-science/texlive-science-2014.ebuild2
-rw-r--r--dev-texlive/texlive-xetex/texlive-xetex-2014.ebuild2
-rw-r--r--dev-util/bustle/Manifest1
-rw-r--r--dev-util/bustle/bustle-0.5.1.ebuild2
-rw-r--r--dev-util/bustle/bustle-0.5.2.ebuild70
-rw-r--r--dev-util/checkstyle/Manifest1
-rw-r--r--dev-util/checkstyle/checkstyle-5.4.ebuild83
-rw-r--r--dev-util/checkstyle/checkstyle-5.5-r1.ebuild (renamed from dev-util/checkstyle/checkstyle-5.5.ebuild)20
-rw-r--r--dev-util/cmdtest/Manifest2
-rw-r--r--dev-util/cmdtest/cmdtest-0.18.ebuild (renamed from dev-util/cmdtest/cmdtest-0.10.ebuild)6
-rw-r--r--dev-util/dialog/dialog-1.2.20150920.ebuild2
-rw-r--r--dev-util/dwdiff/Manifest2
-rw-r--r--dev-util/dwdiff/dwdiff-2.0.10.ebuild41
-rw-r--r--dev-util/dwdiff/dwdiff-2.0.9.ebuild41
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.0.ebuild2
-rw-r--r--dev-util/pkgconf/Manifest1
-rw-r--r--dev-util/pkgconf/metadata.xml29
-rw-r--r--dev-util/pkgconf/pkgconf-0.9.12.ebuild58
-rw-r--r--dev-util/scala-ide/Manifest3
-rw-r--r--dev-util/scala-ide/scala-ide-4.3.0.ebuild (renamed from dev-util/scala-ide/scala-ide-4.1.1.ebuild)4
-rw-r--r--dev-vcs/qbzr/qbzr-0.23.1.ebuild2
-rw-r--r--eclass/.gitignore1
-rw-r--r--eclass/emboss-r1.eclass9
-rw-r--r--eclass/kde5.eclass35
-rw-r--r--eclass/virtualx.eclass123
-rw-r--r--games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild2
-rw-r--r--games-fps/rott/rott-1.1.2.ebuild2
-rw-r--r--games-roguelike/angband/angband-4.0.3.ebuild2
-rw-r--r--games-strategy/hedgewars/hedgewars-0.9.22.ebuild2
-rw-r--r--games-strategy/wesnoth/wesnoth-1.12.5.ebuild2
-rw-r--r--games-util/xqf/xqf-1.0.6.2.ebuild2
-rw-r--r--gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild55
-rw-r--r--gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild48
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild76
-rw-r--r--gnome-base/gnome-light/gnome-light-3.18.0.ebuild57
-rw-r--r--gnome-base/gnome/gnome-3.18.0.ebuild53
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild1
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild1
-rw-r--r--media-gfx/darktable/darktable-1.6.9.ebuild2
-rw-r--r--media-gfx/digikam/digikam-4.14.0.ebuild1
-rw-r--r--media-gfx/gimp/gimp-2.9.2.ebuild2
-rw-r--r--media-gfx/inkscape/inkscape-0.91-r1.ebuild166
-rw-r--r--media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild2
-rw-r--r--media-libs/lensfun/lensfun-0.3.1.ebuild2
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.26.ebuild2
-rw-r--r--media-libs/virglrenderer/Manifest1
-rw-r--r--media-libs/virglrenderer/metadata.xml5
-rw-r--r--media-libs/virglrenderer/virglrenderer-0.2.0.ebuild43
-rw-r--r--media-libs/virglrenderer/virglrenderer-9999.ebuild43
-rw-r--r--media-sound/forked-daapd/files/antlr-3.5.patch81
-rw-r--r--media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild (renamed from media-sound/forked-daapd/forked-daapd-23.2.ebuild)11
-rw-r--r--media-video/smtube/metadata.xml2
-rw-r--r--media-video/smtube/smtube-15.11.0-r1.ebuild56
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild (renamed from net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild)2
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild2
-rw-r--r--net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild (renamed from net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild)3
-rw-r--r--net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild (renamed from net-analyzer/openvas-scanner/openvas-scanner-5.0.4.ebuild)2
-rw-r--r--net-analyzer/openvas/openvas-8.0.5-r1.ebuild (renamed from net-analyzer/openvas/openvas-8.0.5.ebuild)6
-rw-r--r--net-dialup/accel-ppp/Manifest1
-rw-r--r--net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild86
-rw-r--r--net-dialup/accel-ppp/metadata.xml1
-rw-r--r--net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild2
-rw-r--r--net-dns/opendnssec/Manifest2
-rw-r--r--net-dns/opendnssec/opendnssec-1.4.8.2.ebuild (renamed from net-dns/opendnssec/opendnssec-1.4.6.ebuild)2
-rw-r--r--net-dns/unbound/Manifest2
-rw-r--r--net-dns/unbound/unbound-1.5.6.ebuild (renamed from net-dns/unbound/unbound-1.5.4.ebuild)0
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild14
-rw-r--r--net-firewall/ipsec-tools/Manifest2
-rw-r--r--net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild276
-rw-r--r--net-firewall/ipsec-tools/ipsec-tools-0.8.1-r1.ebuild276
-rw-r--r--net-firewall/ipsec-tools/ipsec-tools-0.8.2-r4.ebuild (renamed from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r3.ebuild)5
-rw-r--r--net-fs/davfs2/Manifest2
-rw-r--r--net-fs/davfs2/davfs2-1.4.5-r1.ebuild73
-rw-r--r--net-fs/davfs2/davfs2-1.4.7.ebuild63
-rw-r--r--net-fs/davfs2/davfs2-1.5.2.ebuild2
-rw-r--r--net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch60
-rw-r--r--net-fs/davfs2/files/davfs2-1.4.7-destdir.patch18
-rw-r--r--net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild2
-rw-r--r--net-misc/asterisk/Manifest2
-rw-r--r--net-misc/asterisk/asterisk-11.20.0.ebuild325
-rw-r--r--net-misc/asterisk/asterisk-13.6.0.ebuild326
-rw-r--r--net-misc/chrony/chrony-2.2.ebuild2
-rw-r--r--net-misc/cmst/Manifest1
-rw-r--r--net-misc/cmst/cmst-2015.12.03.ebuild45
-rw-r--r--net-misc/curl/curl-7.45.0.ebuild2
-rw-r--r--net-misc/icaclient/icaclient-13.2.0.322243.ebuild18
-rw-r--r--net-misc/icaclient/icaclient-13.2.1.328635.ebuild18
-rw-r--r--net-misc/ntp/ntp-4.2.8_p4-r1.ebuild133
-rw-r--r--net-misc/openvpn/Manifest2
-rw-r--r--net-misc/openvpn/openvpn-2.3.6-r1.ebuild133
-rw-r--r--net-misc/openvpn/openvpn-2.3.6-r2.ebuild134
-rw-r--r--net-misc/openvpn/openvpn-2.3.6.ebuild132
-rw-r--r--net-misc/openvpn/openvpn-2.3.8-r1.ebuild (renamed from net-misc/openvpn/openvpn-2.3.7.ebuild)14
-rw-r--r--net-misc/strongswan/strongswan-5.3.4.ebuild2
-rw-r--r--net-p2p/imule/metadata.xml1
-rw-r--r--net-proxy/polipo/files/polipo.initd-366
-rw-r--r--net-proxy/polipo/polipo-1.1.1-r2.ebuild62
-rw-r--r--profiles/base/package.use5
-rw-r--r--profiles/base/package.use.mask4
-rw-r--r--profiles/package.mask24
-rw-r--r--sci-biology/embassy-emnu/Manifest2
-rw-r--r--sci-biology/embassy-emnu/embassy-emnu-1.05.650-r1.ebuild (renamed from sci-biology/embassy-emnu/embassy-emnu-1.05.650.ebuild)2
-rw-r--r--sci-biology/phylip/phylip-3.696-r1.ebuild (renamed from sci-biology/phylip/phylip-3.696.ebuild)1
-rw-r--r--sci-calculators/units/units-2.12.ebuild2
-rw-r--r--sci-libs/cbflib/Manifest1
-rw-r--r--sci-libs/cbflib/cbflib-0.9.2.4.ebuild68
-rw-r--r--sci-libs/cbflib/cbflib-0.9.3.3.ebuild2
-rw-r--r--sci-libs/cbflib/files/0.9.2.3-Makefile.patch150
-rw-r--r--sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild6
-rw-r--r--sys-apps/busybox/busybox-1.24.1.ebuild2
-rw-r--r--sys-apps/gnome-disk-utility/Manifest1
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild47
-rw-r--r--sys-apps/net-tools/net-tools-1.60_p20141019041918-r1.ebuild2
-rw-r--r--sys-apps/openrc/openrc-0.18.4.ebuild2
-rw-r--r--sys-apps/portage/portage-2.2.24.ebuild2
-rw-r--r--sys-apps/usbredir/Manifest6
-rw-r--r--sys-apps/usbredir/usbredir-0.4.3.ebuild33
-rw-r--r--sys-apps/usbredir/usbredir-0.4.4.ebuild34
-rw-r--r--sys-apps/usbredir/usbredir-0.5.1.ebuild36
-rw-r--r--sys-apps/usbredir/usbredir-0.5.ebuild36
-rw-r--r--sys-apps/usbredir/usbredir-0.7.1.ebuild (renamed from sys-apps/usbredir/usbredir-0.6.ebuild)8
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.19.ebuild2
-rw-r--r--sys-cluster/neutron/Manifest1
-rw-r--r--sys-cluster/neutron/neutron-2015.2.9999.ebuild14
-rw-r--r--sys-cluster/neutron/neutron-7.0.1.ebuild298
-rw-r--r--sys-fs/archivemount/Manifest1
-rw-r--r--sys-fs/archivemount/archivemount-0.8.7.ebuild18
-rw-r--r--sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild2
-rw-r--r--sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild2
-rw-r--r--sys-fs/bcache-tools/bcache-tools-9999.ebuild2
-rw-r--r--sys-fs/bcache-tools/metadata.xml2
-rw-r--r--sys-fs/bindfs/Manifest4
-rw-r--r--sys-fs/bindfs/bindfs-1.12.2.ebuild32
-rw-r--r--sys-fs/bindfs/bindfs-1.12.3.ebuild32
-rw-r--r--sys-fs/bindfs/bindfs-1.13.0.ebuild (renamed from sys-fs/bindfs/bindfs-1.12.5.ebuild)2
-rw-r--r--sys-fs/bindfs/files/bindfs-1.12.2-ac-config-headers.patch25
-rw-r--r--sys-kernel/genkernel/genkernel-3.4.52.2.ebuild4
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.1.12.ebuild2
-rw-r--r--sys-kernel/git-sources/Manifest1
-rw-r--r--sys-kernel/git-sources/git-sources-4.4_rc4.ebuild40
-rw-r--r--sys-kernel/spl/spl-0.6.5.3-r1.ebuild4
-rw-r--r--sys-process/criu/Manifest1
-rw-r--r--sys-process/criu/criu-1.8.ebuild72
-rw-r--r--sys-process/criu/files/criu-1.8-makefile.patch25
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-48.0.2564.23.ebuild (renamed from www-client/chromium/chromium-48.0.2560.0.ebuild)12
-rw-r--r--www-client/chromium/files/chromium-system-icu-r0.patch11
-rw-r--r--www-misc/shellinabox/Manifest1
-rw-r--r--www-misc/shellinabox/shellinabox-2.19.ebuild108
-rw-r--r--www-servers/tomcat/Manifest1
-rw-r--r--www-servers/tomcat/files/tomcat-8.0.30-build.xml.patch265
-rw-r--r--www-servers/tomcat/tomcat-8.0.30.ebuild155
405 files changed, 7435 insertions, 3930 deletions
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index af1ab374b504..6b0d44c773ca 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,3 +1,3 @@
DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b
-DIST keepassx-2.0_alpha6.tar.gz 1366929 SHA256 592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0 SHA512 76cf2e9617217b4f38ecd0027a88768c5a06c51e796f32e4939ba3a4506583ce6793c107293ee87c0ff1d18eaf6030096cab4da644cf0bef35ff09d5a46cd5ca WHIRLPOOL 37283e66bb285656ff2992552ce6e745603f27685a8a2e87fec42e391b484b2bf1697da011ec0ef86ff1ba5053abd803f38ad8ba77f0d295d901bd5ecf38d1e3
+DIST keepassx-2.0.tar.gz 1524638 SHA256 0eb40fac3a44d8283dfc1ee28cc6de5c660b22ab975472de82c2b04675c822e6 SHA512 6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788 WHIRLPOOL d325c491687b70e256f9312548451250dadfdda0c659b9b16a6fd8e0d39bdf5ced905e11646730619cf217e3afe3ad885428bf4cff3204dcf68bdd33510cb467
DIST keepassx-2.0_beta2.tar.gz 1479599 SHA256 5828261226c441856bd12e2f4f73af1a5fc3b1981b2cff40fbc2403e344f4e52 SHA512 e63431a55536fccc8dd4e441863081f533cac6608ce393ad4d641fc57fce815232aff1fdf777374464b3ad6bedb16392d578ff39bf9230d4cb0cd62b11869a5f WHIRLPOOL 69e1de023b5090640747b332642559ea0d0fdbe04bffdf4805475f29eb100c2e8d2744c3b9222c3c63a938e33e470ad9b5a6812d09c249eb09af7006728c7866
diff --git a/app-admin/keepassx/keepassx-2.0_alpha6.ebuild b/app-admin/keepassx/keepassx-2.0.ebuild
index 79aaa66c37f5..dba04533f09b 100644
--- a/app-admin/keepassx/keepassx-2.0_alpha6.ebuild
+++ b/app-admin/keepassx/keepassx-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,6 @@ IUSE="test"
DEPEND="
dev-libs/libgcrypt:0=
dev-qt/qtcore:4
- dev-qt/qtdbus:4
dev-qt/qtgui:4
dev-qt/qttest:4
sys-libs/zlib
diff --git a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
index 0832b90e473b..6f8448ca6a03 100644
--- a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6e4440eb2f9d..6eed22e80256 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
-DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
-DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0
+DIST logstash-2.1.0.tar.gz 73512846 SHA256 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc SHA512 218355af77957a050bff262c1f0f9b516a9c8223a22a768d1c1a3c222c4d9e3ac67871608e6f34787a1926ac2ad2374ca0280a8a122a93b4e846c780c517984a WHIRLPOOL c22840cfadbc63490ee8e0a9ed101dcd9f3c06eca4d7b3359ae84073da6d9bb5712af1599357ff875b67eb55ad5d3e6e39634266e7e57024b4f97c23667e3b4a
+DIST logstash-all-plugins-2.1.0.tar.gz 126053307 SHA256 090cca8b1d7584ed7f3a60abd4e5f4329cf36f41481de80982fee709e2febf58 SHA512 31232bdac13b8d342ac5d688c2fe0f60e6eede71e70c97d0a1e08527e1283ef348666f87d86f37e0c3208f56dc08595af18c924642fa94911f6fd19a39dab7f0 WHIRLPOOL 532676042bee4c120fdaf60c3d6cc528d6f9960d0c770bebfba773dd422663532c3f7de7b28baa085d3faaacd830a74e1f73f5020a5a9b7d48998dbdf931c117
diff --git a/app-admin/logstash-bin/files/agent.conf.sample-r2 b/app-admin/logstash-bin/files/agent.conf.sample-r2
new file mode 100644
index 000000000000..96781bd3327b
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample-r2
@@ -0,0 +1,20 @@
+input {
+ stdin {
+ type => "stdin"
+ }
+
+ file {
+ type => "syslog"
+ path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+ }
+}
+
+output {
+ stdout {
+ codec => rubydebug
+ }
+
+ elasticsearch {
+ hosts => localhost
+ }
+}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
deleted file mode 100644
index 29f4d1c016ae..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#LOGSTASH_USER=""
-#LOGSTASH_GROUP=""
diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd-r2
new file mode 100644
index 000000000000..cb6839569537
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r2
@@ -0,0 +1,9 @@
+#LS_USER="root"
+#LS_GROUP="root"
+#LS_CONFDIR="/etc/logstash/conf.d"
+#LS_LOGFILE="/var/log/logstash/logstash.log"
+#LS_PIDFILE="/run/logstash/logstash.pid"
+#LS_HEAP_SIZE="500m"
+#LS_NICE=19
+#LS_OPEN_FILES=16384
+#LS_OPTS=""
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
deleted file mode 100644
index 08b063fe7044..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LOGSTASH_USER=${LOGSTASH_USER:-root}
-LOGSTASH_GROUP=${LOGSTASH_GROUP:-root}
-LOGFILE="/var/log/logstash/logstash.log"
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config /etc/logstash/conf.d/*.conf --log ${LOGFILE}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user=\"${LOGSTASH_USER}\""
-pidfile="/run/logstash/logstash.pid"
-
-depend() {
- use net
- after elasticsearch
-}
-
-checkconfig() {
- ebegin "Checking your configuration"
- ${command} ${command_args} --configtest
- eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
- checkconfig || return 1
-
- checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${pidfile}")"
- checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${LOGFILE}")"
- checkpath -f -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m640 "${LOGFILE}"
-}
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
new file mode 100644
index 000000000000..e4abf59b0fa0
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER="${LS_USER:-root}"
+LS_GROUP="${LS_GROUP:-root}"
+LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
+LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
+LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
+LS_NICE="${LS_NICE:-19}"
+LS_OPEN_FILES="${LS_OPEN_FILES:-16384}"
+LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--nicelevel ${LS_NICE} \
+ --user ${LS_USER}:${LS_GROUP} \
+ --env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
+pidfile="${LS_PIDFILE}"
+
+depend() {
+ use net
+ after elasticsearch
+}
+
+checkconfig() {
+ ebegin "Checking your configuration"
+ ${command} ${command_args} --configtest
+ eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+ checkconfig || return 1
+
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
+ checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
+ checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+
+ rc_ulimit="-n ${LS_OPEN_FILES}"
+}
+
+stop() {
+ ebegin "Stopping logstash"
+ start-stop-daemon --stop \
+ --pidfile="${LS_PIDFILE}" \
+ --retry=TERM/5/KILL/5
+}
diff --git a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
deleted file mode 100644
index 027faae0d39d..000000000000
--- a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
- keepdir "/var/log/${MY_PN}"
-
- insinto "/etc/${MY_PN}/conf.d"
- doins "${FILESDIR}/agent.conf.sample"
-
- insinto "/opt/${MY_PN}"
- doins -r .
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}"
-
- insinto /etc/logrotate.d
- doins "${FILESDIR}/${MY_PN}.logrotate"
-
- newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
- einfo "Getting started with logstash:"
- einfo " https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
- einfo ""
- einfo "Packages that might be interesting:"
- einfo " app-misc/elasticsearch"
- einfo " dev-python/elasticsearch-curator"
- einfo " www-apps/kibana-bin"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
index 18df7a31ce3f..f165b2a1a9de 100644
--- a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
@@ -9,12 +9,13 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Tool for managing events and logs"
HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="standard? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
+ all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="+standard all-plugins"
RESTRICT="strip"
QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
@@ -24,22 +25,28 @@ RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ if use standard && use all-plugins; then
+ die "Both standard and all-plugins USE selected, please pick just one."
+ fi
+}
+
src_install() {
keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
keepdir "/var/log/${MY_PN}"
insinto "/etc/${MY_PN}/conf.d"
- doins "${FILESDIR}/agent.conf.sample"
+ newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
insinto "/opt/${MY_PN}"
doins -r .
fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
insinto /etc/logrotate.d
- doins "${FILESDIR}/${MY_PN}.logrotate"
+ newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
- newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+ newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
}
pkg_postinst() {
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index df4f52042dae..f82fc0180ff6 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -5,10 +5,14 @@
<maintainer>
<email>idella4@gentoo.org</email>
<name>Ian Delaney</name>
- </maintainer>
- <maintainer>
- <email>hydrapolic@gmail.com</email>
- <name>Tomas Mozes</name>
- <description>Proxy maintainer</description>
- </maintainer>
+ </maintainer>
+ <maintainer>
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomas Mozes</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <use>
+ <flag name="standard">standard distribution package</flag>
+ <flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
+ </use>
</pkgmetadata>
diff --git a/app-admin/restart_services/Manifest b/app-admin/restart_services/Manifest
index bc538894f22a..25fab978caf1 100644
--- a/app-admin/restart_services/Manifest
+++ b/app-admin/restart_services/Manifest
@@ -1,3 +1,2 @@
-DIST restart_services-0.11.0.tgz 20259 SHA256 60a14c500126782704fc016f09fce708da53c4f4e786f5630e789e4166d50620 SHA512 f5b987938e9f2e04febd1a8e9009696aba05e087f6cfd2f2b9eb15f95067c17de696357b0c91360f9591e9376870bf867e1455ac74a6024cbaa864825a811856 WHIRLPOOL 0d5b6b4e5e8f00c75cabeb7bcc1e9b369937fa46a0804e6061ed3dfbd4040c9836da725a55475b1231d1b867f47b782ec5bcb70dd4b4fa2caf31ff55515a3f92
-DIST restart_services-0.12.0.tgz 20536 SHA256 68637f5c6accb003dc86eca019fb430d2b26016d4302b5e66198249d992e21e4 SHA512 d25cff31653ecccfa466d37631320879679d4e8347c45dc5e180a5a8b1f5755a77525ca1a941bd9933536c8f84f197f432662a929ed39c5e58e3e82b1cd0f90b WHIRLPOOL 63af03b46dec904d0c6f610fbadd1489c990810b8db7f68e0579774bbd7c4c5bb2e1ec1e439937a9a350dce8e517a6692baa8c7890f3c3d3d85469397e461cda
DIST restart_services-0.13.0.tgz 20790 SHA256 b975450f24c72aa52ea9bf1a73514d7806604323ad1f29f2c03b922421a67aa2 SHA512 778139f724f0e8f5f5a4a146ea19808f1d58717e2158570e829ed15950cf4394ecce1c2d3fe7afd6c9324b255186b9d740928c973a48aafeb4df3a38faa814ba WHIRLPOOL 74309e2272ec1e7ecf51bcc83ec308b5b33ac4c0e675005e6302a7117fc38b16a2d4566a1517b6466894a3d57b5ec3f7d65959edf4dc1ebad4e751c028105d11
+DIST restart_services-0.13.1.tgz 20860 SHA256 c14759fbbbebc31500495194a749a4ef5a5d8e7049af79d8a81cb70883c7d2ce SHA512 29983382ddf217865b4e2cde62caaba4f6a54ac20223a1fe8019e39ad0fdb61c491013444a684a0a5941965417b87abf1c25f52036649205cb16a0f12bf397ef WHIRLPOOL 22ec5681e758d0a541b1d1ea47aa977260931ffb291174549213ebc534d2f25bd740e697ec5a1a368d0082597e29e3c484da2584351b61027666d3758e31a8da
diff --git a/app-admin/restart_services/restart_services-0.11.0.ebuild b/app-admin/restart_services/restart_services-0.11.0.ebuild
deleted file mode 100644
index 29ad58440629..000000000000
--- a/app-admin/restart_services/restart_services-0.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- app-admin/lib_users
- sys-apps/openrc
-"
-
-src_install() {
- dosbin restart_services
- doman restart_services.1
- insinto /etc
- doins restart_services.conf
- dodoc README CHANGES
-}
diff --git a/app-admin/restart_services/restart_services-0.12.0.ebuild b/app-admin/restart_services/restart_services-0.12.0.ebuild
deleted file mode 100644
index 29ad58440629..000000000000
--- a/app-admin/restart_services/restart_services-0.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- app-admin/lib_users
- sys-apps/openrc
-"
-
-src_install() {
- dosbin restart_services
- doman restart_services.1
- insinto /etc
- doins restart_services.conf
- dodoc README CHANGES
-}
diff --git a/app-admin/restart_services/restart_services-0.13.0.ebuild b/app-admin/restart_services/restart_services-0.13.1.ebuild
index 8e73ec8622f5..87fa490cff64 100644
--- a/app-admin/restart_services/restart_services-0.13.0.ebuild
+++ b/app-admin/restart_services/restart_services-0.13.1.ebuild
@@ -26,4 +26,13 @@ src_install() {
insinto /etc
doins restart_services.conf
dodoc README CHANGES
+
+ sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
+ cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
+ # You may put your local changes here or in any other *.conf file
+ # in this directory so you can leave /etc/restart_services.conf as is.
+ # Example:
+ # *extend* SV_ALWAYS to match 'myservice'
+ # SV_ALWAYS+=( myservice )
+ EOF
}
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
index f7916efabc63..aafcebae7257 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
RESTRICT="test"
diff --git a/app-arch/dpkg/dpkg-1.17.26.ebuild b/app-arch/dpkg/dpkg-1.17.26.ebuild
index 980678252bf6..899b821105f7 100644
--- a/app-arch/dpkg/dpkg-1.17.26.ebuild
+++ b/app-arch/dpkg/dpkg-1.17.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
RDEPEND="
diff --git a/app-backup/backintime/backintime-1.0.24-r2.ebuild b/app-backup/backintime/backintime-1.0.24-r2.ebuild
index c6d232e9aed2..d99ed9dd00e9 100644
--- a/app-backup/backintime/backintime-1.0.24-r2.ebuild
+++ b/app-backup/backintime/backintime-1.0.24-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1
-DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
HOMEPAGE="http://backintime.le-web.org/"
SRC_URI="http://${PN}.le-web.org/wp-content/uploads/2009/03/${P}.tar.gz"
diff --git a/app-backup/backintime/backintime-1.0.36-r2.ebuild b/app-backup/backintime/backintime-1.0.36-r2.ebuild
index 0d592ba443cf..39036f9f0a32 100644
--- a/app-backup/backintime/backintime-1.0.36-r2.ebuild
+++ b/app-backup/backintime/backintime-1.0.36-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1
-DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
HOMEPAGE="http://backintime.le-web.org/"
SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
diff --git a/app-backup/backintime/backintime-1.0.40.ebuild b/app-backup/backintime/backintime-1.0.40.ebuild
index c69ef3fcffdd..186bb32a7c4e 100644
--- a/app-backup/backintime/backintime-1.0.40.ebuild
+++ b/app-backup/backintime/backintime-1.0.40.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1
-DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
HOMEPAGE="http://backintime.le-web.org/"
SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index b2b9997eae20..8bfb2c0767b8 100644
--- a/app-backup/backintime/backintime-1.1.4.ebuild
+++ b/app-backup/backintime/backintime-1.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_2 python3_3 python3_4 )
inherit eutils python-single-r1
-DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
HOMEPAGE="http://backintime.le-web.org/"
SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
diff --git a/app-backup/backintime/backintime-1.1.8.ebuild b/app-backup/backintime/backintime-1.1.8.ebuild
index b1e66ecf2524..256656d864cf 100644
--- a/app-backup/backintime/backintime-1.1.8.ebuild
+++ b/app-backup/backintime/backintime-1.1.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_2 python3_3 python3_4 )
inherit eutils python-single-r1
-DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
HOMEPAGE="http://backintime.le-web.org/"
SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
diff --git a/app-backup/backintime/metadata.xml b/app-backup/backintime/metadata.xml
index b1f5e35e552f..34b87b36efe7 100644
--- a/app-backup/backintime/metadata.xml
+++ b/app-backup/backintime/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>xmw@gentoo.org</email>
- <name>Michael Weber</name>
-</maintainer>
-<longdescription lang="en">
+ <maintainer>
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <longdescription lang="en">
Back In Time is a simple backup tool for Linux inspired from “flyback project” and “TimeVault”. The backup is done by taking snapshots of a specified set of directories.
-Currently there are two GUI available: Gnome and KDE 4 (>= 4.1).
+Currently there are two GUI available: Gnome and KDE 4 (&gt;= 4.1).
All you have to do is configure:
Where to save snapshot
diff --git a/app-backup/bareos/bareos-15.2.2.ebuild b/app-backup/bareos/bareos-15.2.2.ebuild
index 49be43dfdccc..e4ef164b475f 100644
--- a/app-backup/bareos/bareos-15.2.2.ebuild
+++ b/app-backup/bareos/bareos-15.2.2.ebuild
@@ -146,6 +146,8 @@ src_prepare() {
src_configure() {
local myconf=''
+ addpredict /var/lib/logrotate.status
+
if use clientonly; then
myconf="${myconf} \
$(use_enable clientonly client-only) \
diff --git a/app-backup/obnam/Manifest b/app-backup/obnam/Manifest
index 6498fe02d969..d960c2074498 100644
--- a/app-backup/obnam/Manifest
+++ b/app-backup/obnam/Manifest
@@ -1,3 +1,2 @@
-DIST obnam-1.16.tar.gz 362372 SHA256 4c3e525aeef87f4beba55bd8ab7459e33bc2c14c4fa7fc35b74beafc8beb25d0 SHA512 e495991c7277f6cb121900441a191bab9c58da7cd796afe47b24c62e081b281337a414ec43bac0c117c837e4195d4d8d911aa037280679aaba2b43ae109db085 WHIRLPOOL 942b8ad8e7f1852283eefee5bb371e71a160e65b0430428800dc8253650b7128fe0715786743fe30beaa2a1db84197326c377d30914700f022b177805d254f12
DIST obnam-1.17.tar.gz 362512 SHA256 d340bdf6a5ebbc7c0a039501832c78257c57caa701bd29f5ef6fb841f16cbcf9 SHA512 63926ee62c5dae90cd653cee69a793f43098ed91a3fdb4cff7af1ed98994f54807c3d2c6b1bc3995bbda9a3ce9b319fa2a8e0e9c841b597a92c677bb01f549f1 WHIRLPOOL 442eae740c29064a188566cfe48a4091de29f22f41a6fabf0917c186dc683f9c19233bc3dc30c7f7339e8e7efc77feca0cc1d928e81f32b0a88920ba4dbfde43
-DIST obnam-1.9.tar.gz 340103 SHA256 7e0182efb16597d63916d052ac36546e7c597ee75ba40ae23b2dc9afbb959f82 SHA512 f170a4223b84d2b26617c412524e9ec6efcf3b7bb7bb1a4bfc7333c138e9b9066658c54da9aa8c41b4ea3c3335da3bcd1c26b911b2cce7eb98eabf52d72af67f WHIRLPOOL 73b72c8fe7bbf2958714ef05dba518839471aea91aa02d60f8015481c30440de985f2db0a610bcf08d29eaa86e074cf7b39e975c3847cb1e78c0adf27d793b31
+DIST obnam-1.18.2.tar.gz 361576 SHA256 515aa3eaf9946f5f7beee1e3285d2822e67a43d209b34e57bf0e1ea809551895 SHA512 f375a3e8769775b2b3d5679d68d031f13d950ac6b2d50231b791f9625384f830ccaee3434f18eacdbc95ed6de2d1e4b33b1adac39ad8b8f96842ecc8e4664f91 WHIRLPOOL 17afe8d35f455decb0bcec3f1708e4f74cf6d14ee8a60bb6f9c53d17341d8d298d042c769571f458093d994053a5a293356716e423844c3bd69356ae4838cf73
diff --git a/app-backup/obnam/files/obnam-1.9-setup-man.diff b/app-backup/obnam/files/obnam-1.9-setup-man.diff
deleted file mode 100644
index 66bc077b2de5..000000000000
--- a/app-backup/obnam/files/obnam-1.9-setup-man.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig 2015-03-23 00:11:50.833110091 +0100
-+++ setup.py 2015-03-23 00:12:19.892915511 +0100
-@@ -78,7 +78,7 @@
- env['MANWIDTH'] = '80'
- with open('%s.1.txt' % program, 'w') as f:
- cliapp.runcmd(
-- ['man', '-l', '%s.1' % program],
-+ ['man', './%s.1' % program],
- ['col', '-b'],
- stdout=f,
- env=env)
diff --git a/app-backup/obnam/obnam-1.16.ebuild b/app-backup/obnam/obnam-1.18.2.ebuild
index cd42b25e8071..8b909251b952 100644
--- a/app-backup/obnam/obnam-1.16.ebuild
+++ b/app-backup/obnam/obnam-1.18.2.ebuild
@@ -7,7 +7,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit eutils distutils-r1
+inherit distutils-r1
DESCRIPTION="A backup program that supports encryption and deduplication"
HOMEPAGE="http://obnam.org/"
@@ -19,19 +19,16 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="${PYTHON_DEPS}
- dev-python/cliapp
- dev-python/fuse-python
- dev-python/larch
- !=dev-python/paramiko-1.13.0
- || ( <dev-python/paramiko-1.13.0 >dev-python/paramiko-1.13.0 )
- dev-python/pyyaml
- dev-python/tracing
- dev-python/ttystatus
+ dev-python/cliapp[${PYTHON_USEDEP}]
+ dev-python/fuse-python[${PYTHON_USEDEP}]
+ dev-python/larch[${PYTHON_USEDEP}]
+ >dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/tracing[${PYTHON_USEDEP}]
+ dev-python/ttystatus[${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}"
-PATCHES=( )
-
src_compile() {
addwrite /proc/self/comm
distutils-r1_src_compile
diff --git a/app-backup/obnam/obnam-1.9.ebuild b/app-backup/obnam/obnam-1.9.ebuild
deleted file mode 100644
index 9620fcc7582f..000000000000
--- a/app-backup/obnam/obnam-1.9.ebuild
+++ /dev/null
@@ -1,54 +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="threads"
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A backup program that supports encryption and deduplication"
-HOMEPAGE="http://obnam.org/"
-SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
- dev-python/cliapp
- dev-python/fuse-python
- dev-python/larch
- !=dev-python/paramiko-1.13.0
- || ( <dev-python/paramiko-1.13.0 >dev-python/paramiko-1.13.0 )
- dev-python/pyyaml
- dev-python/tracing
- dev-python/ttystatus
- "
-RDEPEND="${DEPEND}"
-
-PATCHES=( ${FILESDIR}/${P}-setup-man.diff )
-
-src_compile() {
- addwrite /proc/self/comm
- distutils-r1_src_compile
-}
-
-src_install() {
- distutils-r1_src_install
- find "${D}" -name "obnam-viewprof*" -delete
- insinto /etc
- doins "${FILESDIR}"/obnam.conf
- keepdir /var/log/obnam
-}
-
-pkg_postinst() {
- if [[ $REPLACING_VERSIONS < "1.2" ]]; then
- elog "You will need to setup a config file before running obnam for the first time."
- elog "For details, please see the obnam(1) manual page."
- elog "An example file has been installed as /etc/obnam.conf for your convenience."
- fi
-}
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
new file mode 100644
index 000000000000..327e5a25d101
--- /dev/null
+++ b/app-crypt/acme/Manifest
@@ -0,0 +1 @@
+DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
diff --git a/app-crypt/acme/acme-0.1.0-r1.ebuild b/app-crypt/acme/acme-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..1df4590ea219
--- /dev/null
+++ b/app-crypt/acme/acme-0.1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+ inherit git-r3
+ KEYWORDS=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
+ KEYWORDS="~amd64"
+ S=${WORKDIR}/letsencrypt-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ nosetests -w ${PN} || die
+}
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 1f9364034341..1df4590ea219 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -5,16 +5,24 @@
EAPI=5
PYTHON_COMPAT=(python{2_7,3_4,3_5})
-EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
-
-inherit git-r3 distutils-r1
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git"
+ inherit git-r3
+ KEYWORDS=""
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
+ KEYWORDS="~amd64"
+ S=${WORKDIR}/letsencrypt-${PV}/acme
+fi
+
+inherit distutils-r1
DESCRIPTION="An implementation of the ACME protocol"
HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
IUSE="test"
RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
@@ -30,8 +38,6 @@ RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
-S=${WORKDIR}/${P}/${PN}
-
python_test() {
nosetests -w ${PN} || die
}
diff --git a/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..a3cbd8c1258b
--- /dev/null
+++ b/app-crypt/easy-rsa/easy-rsa-2.2.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="EasyRSA-${PV}"
+
+DESCRIPTION="Small RSA key management package, based on OpenSSL"
+HOMEPAGE="http://openvpn.net/"
+SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+ !<net-misc/openvpn-2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-pkcs11.patch"
+}
+
+src_install() {
+ exeinto /usr/share/easy-rsa
+ doexe build-* clean-all inherit-inter list-crl pkitool revoke-full sign-req whichopensslcnf
+ insinto /usr/share/easy-rsa
+ doins vars openssl-*.cnf
+ doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index cc2ac11ac8a7..f8bcc9c853d4 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,5 +3,6 @@ DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea
DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
+DIST gnupg-2.1.10.tar.bz2 5173253 SHA256 93bd58d81771a4fa488566e5d2e13b1fd7afc86789401eb41731882abfd26cf9 SHA512 ceea93a7e7d30e07839bcc52d4246fd5be1ec81a8c4d4d62059e2b0c0e58fab07a1531016f82bcc506340653d66c73541dd3f5897df7691abeb4068d94957003 WHIRLPOOL 01f92f6020b79b373d4d6879cc39913c575c67a52c1bd425770322de0ce5a9fbd796d800cbb41a15553fd30a6c8f85a794e0b4c09420a2b49f6cb0542cdb52fb
DIST gnupg-2.1.8.tar.bz2 4900705 SHA256 a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3 SHA512 80176fda032c921d3716fba3d3a264f9951464fd578a9d8d60673585efef17e20eec4d026921ab7ab2d7bd4dbf0a2b94a33a58c07acb747eebcb758e42bafd57 WHIRLPOOL 32e2e959363529cfd9ca857f823970b6cdd6497a72515aa9e75c2a680c83acea55a38d8de19b16c7327f92c0ab326e76a37952014b317afe2689c211c0d1965b
DIST gnupg-2.1.9.tar.bz2 4925167 SHA256 1cb7633a57190beb66f9249cb7446603229b273d4d89331b75c652fa4a29f7b6 SHA512 c19b8cac42b7060caada230b77f36a0b0ed0a05efd519818c5b4057ef0fcb16602f2f3ade2409de2ef353a9e2acc3e5fa106a4449c6929a36a599a82194c0ee0 WHIRLPOOL 105b83e82330a00084a0e9f3d96c8788ac2c9e7831beea0ea42786df4e378dc9e8f2c1a31f12af9c53d363aa71810cd231afdf8f20eab424fea5f59b103033a9
diff --git a/app-crypt/gnupg/gnupg-2.1.10.ebuild b/app-crypt/gnupg/gnupg-2.1.10.ebuild
new file mode 100644
index 000000000000..a1c4aba5291d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.10.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb"
+
+COMMON_DEPEND_LIBS="
+ dev-libs/npth
+ >=dev-libs/libassuan-2.4.1
+ >=dev-libs/libgcrypt-1.6.2[threads]
+ >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libksba-1.2.0
+ >=net-misc/curl-7.10
+ gnutls? ( >=net-libs/gnutls-3.0 )
+ sys-libs/zlib
+ ldap? ( net-nds/openldap )
+ bzip2? ( app-arch/bzip2 )
+ readline? ( sys-libs/readline:= )
+ smartcard? ( usb? ( virtual/libusb:0 ) )
+ tofu? ( >=dev-db/sqlite-3.7 )
+ "
+COMMON_DEPEND_BINS="app-crypt/pinentry
+ !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+ ${COMMON_DEPEND_BINS}
+ static? (
+ >=dev-libs/libassuan-2[static-libs]
+ >=dev-libs/libgcrypt-1.6.2[static-libs]
+ >=dev-libs/libgpg-error-1.17[static-libs]
+ >=dev-libs/libksba-1.0.7[static-libs]
+ dev-libs/npth[static-libs]
+ >=net-misc/curl-7.10[static-libs]
+ sys-libs/zlib[static-libs]
+ bzip2? ( app-arch/bzip2[static-libs] )
+ )
+ nls? ( sys-devel/gettext )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+ ${COMMON_DEPEND_BINS}
+ selinux? ( sec-policy/selinux-gpg )
+ nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ local myconf=()
+
+ # 'USE=static' support was requested:
+ # gnupg1: bug #29299
+ # gnupg2: bug #159623
+ use static && append-ldflags -static
+
+ if use smartcard; then
+ myconf+=(
+ --enable-scdaemon
+ $(use_enable usb ccid-driver)
+ )
+ else
+ myconf+=( --disable-scdaemon )
+ fi
+
+ if use elibc_SunOS || use elibc_AIX; then
+ myconf+=( --disable-symcryptrun )
+ else
+ myconf+=( --enable-symcryptrun )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-gpg \
+ --enable-gpgsm \
+ --enable-large-secmem \
+ --without-adns \
+ "${myconf[@]}" \
+ $(use_enable bzip2) \
+ $(use_enable gnutls) \
+ $(use_with ldap) \
+ $(use_enable nls) \
+ $(use_with readline) \
+ $(use_enable tofu) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd doc
+ emake html
+ fi
+}
+
+src_install() {
+ default
+
+ use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+ emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+ # The help*txt files are read from the datadir by GnuPG directly.
+ # They do not work if compressed or moved!
+ #rm "${ED}"/usr/share/gnupg/help* || die
+
+ dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+ doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+ dosym gpg2 /usr/bin/gpg
+ dosym gpgv2 /usr/bin/gpgv
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+ if use doc; then
+ dohtml doc/gnupg.html/* doc/*.png
+ fi
+}
+
+pkg_postinst() {
+ elog "If you wish to view images emerge:"
+ elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+ elog "Remember to use photo-viewer option in configuration file to activate"
+ elog "the right viewer."
+ elog
+
+ if use smartcard; then
+ elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+ use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+ elog " - sys-apps/pcsc-lite and a compatible reader device;"
+ elog " - dev-libs/openct and a compatible reader device;"
+ elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+ elog ""
+ elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+ elog "app-crypt/ccid first."
+ fi
+
+ ewarn "Please remember to restart gpg-agent if a different version"
+ ewarn "of the agent is currently used. If you are unsure of the gpg"
+ ewarn "agent you are using please run 'killall gpg-agent',"
+ ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "If upgrading from a version prior than 2.1 you might have to re-import"
+ elog "secret keys after restarting the gpg-agent as the new version is using"
+ elog "a new storage mechanism."
+ elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+ fi
+}
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index de969bccd57d..462b87d9f848 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -24,6 +24,10 @@
Build mta support using
<pkg>virtual/mta</pkg>.
</flag>
+ <flag name='tofu'>
+ Enable support for Trust of First use trust model; requires
+ <pkg>dev-db/sqlite</pkg>.
+ </flag>
<flag name='tools'>
Install extra tools.
</flag>
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index d3145f21d8fb..7a92ae0aae7f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -3,3 +3,4 @@ DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420a
DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a
DIST nano-2.4.2.tar.gz 1898633 SHA256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 SHA512 487b03b33ac8fac4a774223e038b00463ca03e08093c506b10f4df56795039eff1c23518c1a4f32695cee1bb9bb5eb0a2dd3e1f8a9befcc573e7fca3d69fa9d3 WHIRLPOOL ac5942114a48d428e64db47afb919feef506e18da8b21627ea421e59bf3c235083b17ffaf7a6e510193b6617c0e2ad9d2460f64d5d8bbd6b828547bcd41b5c7c
DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
+DIST nano-2.5.0.tar.gz 1909625 SHA256 ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee SHA512 f05f1afa6a79ff6b87359c46fbdaf6161eacdc265ac6be155a0173e3ab5a17023e205d0b9667a942e754556182a9007fe4438f337a830d20b9546aad9d522ba6 WHIRLPOOL 29fbb67ce561da8255dca70d7554d604094a21e89e39ce94fadb67bc3236550ea1ee3f08838616deed8a4e37657df0ef6d320c701cc77a086d8d1ce2dae43d1d
diff --git a/app-editors/nano/nano-2.5.0.ebuild b/app-editors/nano/nano-2.5.0.ebuild
new file mode 100644
index 000000000000..48d87ed39596
--- /dev/null
+++ b/app-editors/nano/nano-2.5.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
+ inherit subversion autotools
+else
+ MY_P=${PN}-${PV/_}
+ SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="http://www.nano-editor.org/ https://www.gentoo.org/doc/en/nano-basics-guide.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+ sys-libs/ncurses:0=[static-libs(+)]
+ magic? ( sys-apps/file[static-libs(+)] )
+ nls? ( virtual/libintl )
+ !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+ static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ fi
+ epatch_user
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myconf=()
+ case ${CHOST} in
+ *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
+ esac
+ econf \
+ --bindir="${EPREFIX}"/bin \
+ --htmldir=/trash \
+ $(use_enable !minimal color) \
+ $(use_enable !minimal multibuffer) \
+ $(use_enable !minimal nanorc) \
+ --disable-wrapping-as-root \
+ $(use_enable magic libmagic) \
+ $(use_enable spell speller) \
+ $(use_enable justify) \
+ $(use_enable debug) \
+ $(use_enable nls) \
+ $(use_enable unicode utf8) \
+ $(use_enable minimal tiny) \
+ $(usex ncurses --without-slang $(use_with slang)) \
+ "${myconf[@]}"
+}
+
+src_install() {
+ default
+ rm -rf "${D}"/trash
+
+ dodoc doc/nanorc.sample
+ dohtml doc/faq.html
+ insinto /etc
+ newins doc/nanorc.sample nanorc
+ if ! use minimal ; then
+ # Enable colorization by default.
+ sed -i \
+ -e '/^# include /s:# *::' \
+ "${ED}"/etc/nanorc || die
+ fi
+
+ dodir /usr/bin
+ dosym /bin/nano /usr/bin/nano
+}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index cf57844bce5f..ebbad181c973 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,2 @@
-DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e852217dddd3e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1
DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551
+DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f
diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch
deleted file mode 100644
index a08fc07b28c7..000000000000
--- a/app-editors/neovim/files/automagic-jemalloc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit bb3c3cbee65ef42b2b3048afae008c719bc2056a
-Author: Ole Reifschneider <mail@ole-reifschneider.de>
-Date: Sat Oct 24 18:48:01 2015 +0200
-
- Make jemalloc optional
-
- Don't enable it automagically if it exists
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 348e138..53e3873 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
- message(FATAL_ERROR "Sanitizers are only supported for Clang.")
- endif()
-
--if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
-- message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
--else()
-- find_package(JeMalloc)
-- if(JEMALLOC_FOUND)
-- include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
-+option(ENABLE_JEMALLOC "enable jemalloc" OFF)
-+
-+if (ENABLE_JEMALLOC)
-+ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
-+ message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
-+ else()
-+ find_package(JeMalloc)
-+ if(JEMALLOC_FOUND)
-+ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
-+ endif()
- endif()
- endif()
-
diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
deleted file mode 100644
index 635fc62a0c27..000000000000
--- a/app-editors/neovim/files/nvimrc
+++ /dev/null
@@ -1,105 +0,0 @@
-" Default Gentoo configuration file for neovim
-" Based on the default vimrc shipped by Gentoo with app-editors/vim-core
-" $Id$
-
-" You can override any of these settings on a global basis via the
-" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
-" You may need to create these.
-
-" Neovim comes with sensible defaults, see:
-" https://github.com/neovim/neovim/issues/2676
-" Most of the general settings from Gentoo's vimrc have been dropped here.
-" We add only some necessary fixes and a few Gentoo specific settings.
-
-" {{{ Locale settings
-" If we have a BOM, always honour that rather than trying to guess.
-if &fileencodings !~? "ucs-bom"
- set fileencodings^=ucs-bom
-endif
-
-" Always check for UTF-8 when trying to determine encodings.
-if &fileencodings !~? "utf-8"
- " If we have to add this, the default encoding is not Unicode.
- let g:added_fenc_utf8 = 1
- set fileencodings+=utf-8
-endif
-" }}}
-
-" {{{ Fix &shell, see bug #101665.
-if "" == &shell
- if executable("/bin/bash")
- set shell=/bin/bash
- elseif executable("/bin/sh")
- set shell=/bin/sh
- endif
-endif
-"}}}
-
-" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh
-" files should default to bash. See :help sh-syntax and bug #101819.
-if has("eval")
- let is_bash=1
-endif
-" }}}
-
-" {{{ Autocommands
-if has("autocmd")
-
-augroup gentoo
- au!
-
- " Gentoo-specific settings for ebuilds. These are the federally-mandated
- " required tab settings. See the following for more information:
- " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml
- " Note that the rules below are very minimal and don't cover everything.
- " Better to emerge app-vim/gentoo-syntax, which provides full syntax,
- " filetype and indent settings for all things Gentoo.
- au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab
-
- " In text files, limit the width of text to 78 characters, but be careful
- " that we don't override the user's setting.
- autocmd BufNewFile,BufRead *.txt
- \ if &tw == 0 && ! exists("g:leave_my_textwidth_alone") |
- \ setlocal textwidth=78 |
- \ endif
-
- " When editing a file, always jump to the last cursor position
- autocmd BufReadPost *
- \ if ! exists("g:leave_my_cursor_position_alone") |
- \ if line("'\"") > 0 && line ("'\"") <= line("$") |
- \ exe "normal g'\"" |
- \ endif |
- \ endif
-
- " When editing a crontab file, set backupcopy to yes rather than auto. See
- " :help crontab and bug #53437.
- autocmd FileType crontab set backupcopy=yes
-
- " If we previously detected that the default encoding is not UTF-8
- " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no
- " characters at all) isn't a Unicode file, but is in the default encoding.
- " Except of course if a byte-order mark is in effect.
- autocmd BufReadPost *
- \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
- \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
- \ set fileencoding= |
- \ endif
-
- " Strip trailing spaces on write
- autocmd BufWritePre *.e{build,class}
- \ if ! exists("g:leave_my_trailing_space_alone") |
- \ :%s/\s\+$//e |
- \ endif
-
-augroup END
-
-endif " has("autocmd")
-" }}}
-
-" {{{ nvimrc.local
-if filereadable("/etc/vim/nvimrc.local")
- source /etc/vim/nvimrc.local
-endif
-" }}}
-
-" vim: set tw=80 sw=2 sts=2 et foldmethod=marker :
diff --git a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild b/app-editors/neovim/neovim-0.1.1-r1.ebuild
index c084410b7ae6..303098a54a5a 100644
--- a/app-editors/neovim/neovim-0.0.0_pre20151025.ebuild
+++ b/app-editors/neovim/neovim-0.1.1-r1.ebuild
@@ -3,21 +3,21 @@
# $Id$
EAPI=5
-inherit cmake-utils eutils flag-o-matic
+inherit cmake-utils flag-o-matic
DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://github.com/neovim/neovim"
+HOMEPAGE="https://neovim.io"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="git://github.com/neovim/neovim.git"
else
- SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+ SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="Apache-2.0 vim"
SLOT="0"
-IUSE="+nvimpager perl python jemalloc"
+IUSE="+nvimpager perl python +jemalloc"
CDEPEND="dev-lang/luajit:2
>=dev-libs/libtermkey-0.17
@@ -36,10 +36,12 @@ RDEPEND="${CDEPEND}
perl? ( dev-lang/perl )
python? ( dev-python/neovim-python-client )"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
src_prepare() {
# use our system vim dir
sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
- -i src/nvim/os/unix_defs.h || die
+ -i src/nvim/globals.h || die
# add eclass to bash filetypes
sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
@@ -47,9 +49,6 @@ src_prepare() {
# make less.sh macro actually work with neovim
sed -e 's|vim |nvim |g' -i runtime/macros/less.sh || die
- # make sure the jemalloc dependency is not automagic
- epatch "${FILESDIR}"/automagic-jemalloc.patch
-
cmake-utils_src_prepare
}
@@ -58,7 +57,6 @@ src_configure() {
append-cflags "-Wno-error"
local mycmakeargs=(
$(cmake-utils_use_enable jemalloc JEMALLOC)
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-DLIBUNIBILIUM_USE_STATIC=OFF
-DLIBTERMKEY_USE_STATIC=OFF
-DLIBVTERM_USE_STATIC=OFF
@@ -71,7 +69,7 @@ src_install() {
# install a default configuration file
insinto /etc/vim
- doins "${FILESDIR}"/nvimrc
+ doins "${FILESDIR}"/sysinit.vim
# conditionally install a symlink for nvimpager
if use nvimpager; then
diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index 7e184a71d982..d6a93c85e804 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1 +1,2 @@
DIST docker-machine-0.4.1.tar.gz 1620966 SHA256 f089657b2de7a3ce15374e69be3f654b0866f75eb077ca363f8a5933ccf51cda SHA512 29b21c075c7964cce00cda484bb31768988c95d6e1a9c4aa625619bead49aebe5b756fdaee7be07baa469c2a675538e69c1e2d3a33cfd32c0c8b79dd4dc8b6b7 WHIRLPOOL 8f200b43f4d40b170646cd3b96b8dac7ae56014641d30ed82ab53eb38be537a408a45fcef7d1f97eba632c86f471516ca3c7f19c121072a72b19847b9d04fe82
+DIST docker-machine-0.5.2.tar.gz 1452215 SHA256 2dd6ed03e546a7c733ec6964b47b85b6d328e830ebca318240f6ddfcaed6f98a SHA512 4a724cc4ad867a2b3b79bd0006b554ae072c142daa7ca29c6430bb6614bc6b971eeca79d93cae98b8f38d97b5a1a5e872f9015cc09200b69551732998b1ba601 WHIRLPOOL 249d9e2456ad79867a0c380c549704b88275a177a78ae610ae207bed5189f20f6279e1f604dc10cbf9fc1feb75bff7460d2eb4a39aaabcc427e8bbaa419e7940
diff --git a/app-emulation/docker-machine/docker-machine-0.5.2.ebuild b/app-emulation/docker-machine/docker-machine-0.5.2.ebuild
new file mode 100644
index 000000000000..22922f647220
--- /dev/null
+++ b/app-emulation/docker-machine/docker-machine-0.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN=github.com/docker/machine/...
+
+if [[ ${PV} = *9999* ]]; then
+ inherit golang-vcs
+else
+ KEYWORDS="~amd64"
+ EGIT_COMMIT="v${PV}"
+ SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Machine management for a container-centric world"
+HOMEPAGE="https://docs.docker.com/machine/ "
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+DEPEND=">=dev-lang/go-1.5:="
+RDEPEND=""
+S=${WORKDIR}/${P}/src/${EGO_PN%/*}
+
+src_prepare() {
+ # don't pre-strip binaries
+ sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
+}
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake build || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
+}
diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest
index 3385cd7ae564..474b0c8b5cf7 100644
--- a/app-emulation/libcacard/Manifest
+++ b/app-emulation/libcacard/Manifest
@@ -1 +1,2 @@
DIST libcacard-0.1.2.tar.bz2 276430 SHA256 ca100118865ee24f16cf39367f74434cddbbb003a12a1adc8645f3dc34791daf SHA512 a3622b29fe3a059e069ad6f7da428278a915cec362a6aae3c7cad0d47dfadba67308631435993c0f41cabe92a05874b339518dc503b71b8d86db4976bb6987f6 WHIRLPOOL 9e1a156fbbff34148a1debc1f4a6d23aea687213a45cac7feb57134dcbd59fa95a22558e15e5c237ae6c3a7851282c72b49ee6e94c9fff8940feee13d42f08ad
+DIST libcacard-2.5.1.tar.xz 325692 SHA256 4bc29c98bea1defc168205652f4ad203ea5746519b4bef8f04ff7cbe099c4e4e SHA512 88e66745f649f52c3fcc7745834d628e76abc21cef1b300e8750e6c0641f65d0e11224da30fa13dea20d6ebe5d36d7a8680d029e15149fddaea43558216ccc21 WHIRLPOOL 5affa8ad2f047553b0a241a123b89d0db5b7620860da1fafb6123f26efafb7680bfd4d971b3b67e82674664daddf45fe0d973153e97944955e8417ea591d412a
diff --git a/app-emulation/libcacard/libcacard-2.5.1.ebuild b/app-emulation/libcacard/libcacard-2.5.1.ebuild
new file mode 100644
index 000000000000..b4994a56273a
--- /dev/null
+++ b/app-emulation/libcacard/libcacard-2.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="virtual Common Access Card (CAC) library emulator"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/nss-3.13
+ >=dev-libs/glib-2.22
+ >=sys-apps/pcsc-lite-1.8"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}"/usr/ -name 'lib*.la' -delete
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
index 9ffa581469db..ed48d834628b 100644
--- a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
@@ -104,7 +104,7 @@ RDEPEND="sys-libs/readline:=
systemd? ( sys-apps/systemd )
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
+ xen? ( app-emulation/xen-tools:= app-emulation/xen )
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
virt-network? ( net-dns/dnsmasq[script]
net-misc/radvd
diff --git a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
index cb757f002e64..cd93dced3c76 100644
--- a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
@@ -109,7 +109,7 @@ RDEPEND="
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
- app-emulation/xen-tools
+ app-emulation/xen-tools:=
)
udev? (
virtual/udev
diff --git a/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
index 724342a1bb13..1c2ba1a9f6ce 100644
--- a/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
@@ -109,7 +109,7 @@ RDEPEND="
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
- app-emulation/xen-tools
+ app-emulation/xen-tools:=
)
udev? (
virtual/udev
diff --git a/app-emulation/libvirt/libvirt-1.2.21.ebuild b/app-emulation/libvirt/libvirt-1.2.21.ebuild
index 724342a1bb13..1c2ba1a9f6ce 100644
--- a/app-emulation/libvirt/libvirt-1.2.21.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21.ebuild
@@ -109,7 +109,7 @@ RDEPEND="
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
- app-emulation/xen-tools
+ app-emulation/xen-tools:=
)
udev? (
virtual/udev
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 928b9d519a41..92f4454f980c 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -109,7 +109,7 @@ RDEPEND="
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
- app-emulation/xen-tools
+ app-emulation/xen-tools:=
)
udev? (
virtual/udev
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 59c2136be75a..4e61c43acbcb 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,7 +1,9 @@
DIST lxc-1.0.6.tar.gz 561249 SHA256 2aea199a89e2cd946f93406af6c3f62844f36954b79a6991b36d2c33022cb11c SHA512 fe85ccb57865d86704df6b4b79d60f31892785b07dc9dd2580cc6c384c89c29c23516e906b7a16bc03c6582c1fb2432bb8ff11bd17c09efa8f6a035fb41f46b1 WHIRLPOOL 9e77453fbe31523a2e8f39cfaba6f09fef68d00b54549167a0cde56c00934f827f5b4190b9fb64242f36782a9fcda63e6796c35fd47420870c2cee7b9bc0a1c8
DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b78ca39a30f8956b0a8f2 SHA512 e6ff42a7b41177e1be0d2cd47d4c554565c7fc35355f3aa8aeba00d4adc7a0f364ecd060ddb6c97b2fe5968329c4e4c4b3cb022bffd2da145f30880f077264a8 WHIRLPOOL f07e5e9efb8ff394aa9cdd6c3e725b453c8137ec221399cbf910d57dbc9268fc84e7227273567792821415dc14e774942b76a58a1a478de57d5c82e545702000
+DIST lxc-1.0.8.tar.gz 575127 SHA256 399ac3eb4e0a89d657fb2e2a57f686ed061d3f1ea4733e7521b1539e9906c7ee SHA512 f552a4f48bb47d26c6b9ddaf8221a439c0848e3f54ec41b77d54717c21bddd56193941046cc96c699790e8265e762a926469c25ee687adcf7795f2906b1c260a WHIRLPOOL 72cd0b8b0345692dd9a3ed8785ee27f5e575794a96c515db1f1d073c29be4c06ae8c1ee24fa375a5ede2bba2494704916710b2e8814ed991d43330a40dff3d56
DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6faee94cda848a0b949155 SHA512 160da88d6dc96cd9f0679f948bfed057c024adcd459fa4b79e872d12284fa3774ac33a13923c6e150072886a371ccfcdf7ab2c4587efa7f6175fc91a67525c4a WHIRLPOOL 2caf81418850ea8b1ecf25b25e799895563ecf1819f32310fcbb4efe88f711eafe2bcb16a0d3b8ee59072c770a5520b4df90a5962215b932e68a4705c4a56d61
DIST lxc-1.1.1.tar.gz 594112 SHA256 64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549 WHIRLPOOL 4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a
DIST lxc-1.1.2.tar.gz 597158 SHA256 f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 SHA512 7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa WHIRLPOOL 2b657a9195b6357a367f6aa7609952d9162aae7d7be3f2c5e4cda4b2e81f2c7411835e75af5740cca053d445a3cf7dc7457f9e76ca866de7265e99ed42c744e9
DIST lxc-1.1.3.tar.gz 599889 SHA256 b75fb8e376d3313e152f31fb7372b68f33a953a12191a39de4cded04fff94300 SHA512 cafa4fbe4fe23b8c0b98007a79f20899c4a3b98c51d797b9c16e38dfec1eee5a513b58621308fe6551707d38028d9e5bd78ade8822691ffe4a7a369b10a48dda WHIRLPOOL 04ad57d8b189ab089b27adad8e511dcc2e5c563505f8134323ac9d738283bd5d0d929ebadeb69cd49ea68ea3e182f22c72590505cbf6f9d8438112e46909e1b5
DIST lxc-1.1.4.tar.gz 604167 SHA256 b087baf5ac4b94618388e6e759d9cdafcf5c98ed67bf9012ee9660076f9fb0d1 SHA512 b239c285b68ddb25c165e998307d69b368bb802e89c1e26de9daab956ffc05cb8e80bf7c796233552b08a57d1cc37c22777bb7a7469db111582184ee13272c93 WHIRLPOOL 2d69d0540c15274627cdbd0f1944a119b601e1298b9328ba336beae0aa6bffd62dfdf85af82f54c3926489e19b4cee7eaa6c35bcfb72e4b3904f85102055ae85
+DIST lxc-1.1.5.tar.gz 607219 SHA256 eefce4cc679656cb8636bf0849f3ba6981c48167884e13dbcb377820a717c09c SHA512 e48ab549f1317afcb5f7768ab988ba27a3e9f1458504e1d70b2e27c502233e7b3538b8ce0b79940140a59a37681bcd8e459416e814f9e4814a4ed86b89e8df1c WHIRLPOOL 0d65ec400913b3298517ba0cb50e064b894d8b26cbd331662e11caee285a37aa1e0d1e4623b69e75585c4369544ca02ff97db90d5127c697cd53fde87d2bc968
diff --git a/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch b/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch
new file mode 100644
index 000000000000..e9e0e6c98dfd
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch
@@ -0,0 +1,35 @@
+Index: lxc-lxc-1.0.8/config/bash/Makefile.am
+===================================================================
+--- lxc-lxc-1.0.8.orig/config/bash/Makefile.am
++++ lxc-lxc-1.0.8/config/bash/Makefile.am
+@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
+
+ if ENABLE_BASH
+ install-bash:
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
+- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
++ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
++ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
+
+ uninstall-bash:
+- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
+- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
++ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
++ rmdir $(DESTDIR)$(datarootdir)/bash-completion// || :
+
+ install-data-local: install-bash
+ uninstall-local: uninstall-bash
+Index: lxc-lxc-1.0.8/config/bash/lxc.in
+===================================================================
+--- lxc-lxc-1.0.8.orig/config/bash/lxc.in
++++ lxc-lxc-1.0.8/config/bash/lxc.in
+@@ -1,4 +1,3 @@
+-have lxc-start && {
+ _lxc_names() {
+ COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
+ }
+@@ -100,4 +99,3 @@ have lxc-start && {
+
+ complete -o default -F _lxc_generic_o lxc-clone
+ complete -o default -F _lxc_generic_o lxc-start-ephemeral
+-}
diff --git a/app-emulation/lxc/lxc-1.0.8.ebuild b/app-emulation/lxc/lxc-1.0.8.ebuild
new file mode 100644
index 000000000000..3eed768ba8c3
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.0.8.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+ sys-libs/libcap
+ lua? ( >=dev-lang/lua-5.1:= )
+ python? ( ${PYTHON_DEPS} )
+ seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-sgml-utils )
+ >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+ sys-apps/util-linux
+ app-misc/pax-utils
+ virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+ ~CPUSETS ~CGROUP_CPUACCT
+ ~RESOURCE_COUNTERS
+ ~CGROUP_SCHED
+
+ ~NAMESPACES
+ ~IPC_NS ~USER_NS ~PID_NS
+
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~CGROUP_FREEZER
+ ~UTS_NS ~NET_NS
+ ~VETH ~MACVLAN
+
+ ~POSIX_MQUEUE
+ ~!NETPRIO_CGROUP
+
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+ if [[ -n ${BACKPORTS} ]]; then
+ epatch "${WORKDIR}"/patches/*
+ fi
+
+ epatch "${FILESDIR}"/${PN}-1.0.8-bash-completion.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ econf \
+ --localstatedir=/var \
+ --bindir=/usr/sbin \
+ --docdir=/usr/share/doc/${PF} \
+ --with-config-path=/etc/lxc \
+ --with-rootfs-path=/usr/lib/lxc/rootfs \
+ --with-distro=gentoo \
+ $(use_enable doc) \
+ --disable-apparmor \
+ $(use_enable examples) \
+ $(use_enable lua) \
+ $(use_enable seccomp) \
+ --disable-python
+}
+
+python_compile() {
+ distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+ default
+
+ if use python; then
+ pushd "${S}/src/python-${PN}" > /dev/null
+ distutils-r1_src_compile
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ default
+
+ mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+ bashcomp_alias ${PN}-start \
+ ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+ if use python; then
+ pushd "${S}/src/python-lxc" > /dev/null
+ # Unset DOCS. This has been handled by the default target
+ unset DOCS
+ distutils-r1_src_install
+ popd > /dev/null
+ fi
+
+ keepdir /etc/lxc /usr/lib/lxc/rootfs /var/log/lxc
+
+ find "${D}" -name '*.la' -delete
+
+ # Gentoo-specific additions!
+ # Use initd.3 per #517144
+ newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
+
+ # lxc-devsetup script
+ exeinto /usr/libexec/${PN}
+ doexe config/init/systemd/${PN}-devsetup
+ # Use that script with the systemd service (Similar to upstream
+ # Makefile.am
+ cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
+ sed -i \
+ "/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
+ ${PN}_at.service \
+ || die "Failed to add ${PN}-devsetup to the systemd service file"
+ systemd_newunit ${PN}_at.service "lxc@.service"
+}
+
+pkg_postinst() {
+ elog "There is an init script provided with the package now; no documentation"
+ elog "is currently available though, so please check out /etc/init.d/lxc ."
+ elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+ elog "to start the container defined into /etc/lxc/configname.conf ."
+ elog "For further information about LXC development see"
+ elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+ elog ""
+ ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
+ ewarn "and previous versions. This means you'll have to use syntax like the following"
+ ewarn ""
+ ewarn " lxc.rootfs = /container"
+ ewarn " lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0"
+ ewarn ""
+ ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you"
+ ewarn "will need sys-apps/yum or dev-util/debootstrap."
+ ewarn ""
+ ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to"
+ ewarn "work, while others will actually make it much more secure. Please refer to"
+ ewarn "Diego Elio Pettenò's weblog at http://blog.flameeyes.eu/tag/lxc for further"
+ ewarn "details."
+}
diff --git a/app-emulation/lxc/lxc-1.1.5.ebuild b/app-emulation/lxc/lxc-1.1.5.ebuild
new file mode 100644
index 000000000000..12c175199343
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.5.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+ sys-libs/libcap
+ cgmanager? ( app-admin/cgmanager )
+ lua? ( >=dev-lang/lua-5.1:= )
+ python? ( ${PYTHON_DEPS} )
+ seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-sgml-utils )
+ >=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+ sys-process/criu
+ sys-apps/util-linux
+ app-misc/pax-utils
+ virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+ ~CPUSETS ~CGROUP_CPUACCT
+ ~CGROUP_SCHED
+
+ ~NAMESPACES
+ ~IPC_NS ~USER_NS ~PID_NS
+
+ ~NETLINK_DIAG ~PACKET_DIAG
+ ~INET_UDP_DIAG ~INET_TCP_DIAG
+ ~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~CGROUP_FREEZER
+ ~UTS_NS ~NET_NS
+ ~VETH ~MACVLAN
+
+ ~POSIX_MQUEUE
+ ~!NETPRIO_CGROUP
+
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS
+ ~!GRKERNSEC_PROC
+ ~!GRKERNSEC_SYSFS_RESTRICT
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+
+ epatch "${FILESDIR}"/${PN}-1.1.3-bash-completion.patch
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ if use python; then
+ #541932
+ python_setup "python3*"
+ export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+ fi
+
+ # I am not sure about the --with-rootfs-path
+ # /var/lib/lxc is probably more appropriate than
+ # /usr/lib/lxc.
+ econf \
+ --localstatedir=/var \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
+ --docdir=/usr/share/doc/${PF} \
+ --with-config-path=/var/lib/lxc \
+ --with-rootfs-path=/var/lib/lxc/rootfs \
+ --with-distro=gentoo \
+ --with-runtime-path=/run \
+ --disable-apparmor \
+ $(use_enable cgmanager) \
+ $(use_enable doc) \
+ $(use_enable examples) \
+ $(use_enable lua) \
+ $(use_enable python) \
+ $(use_enable seccomp)
+}
+
+python_compile() {
+ distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+ default
+
+ if use python; then
+ pushd "${S}/src/python-${PN}" > /dev/null
+ distutils-r1_src_compile
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ default
+
+ mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+ bashcomp_alias ${PN}-start \
+ ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+ if use python; then
+ pushd "${S}/src/python-lxc" > /dev/null
+ # Unset DOCS. This has been handled by the default target
+ unset DOCS
+ distutils-r1_src_install
+ popd > /dev/null
+ fi
+
+ keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+ find "${D}" -name '*.la' -delete
+
+ # Gentoo-specific additions!
+ # Use initd.3 per #517144
+ newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
+
+ # lxc-devsetup script
+ exeinto /usr/libexec/${PN}
+ doexe config/init/systemd/${PN}-devsetup
+ # Remember to compare our systemd unit file with the upstream one
+ # config/init/systemd/lxc.service.in
+ systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
+}
+
+pkg_postinst() {
+ elog ""
+ elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+ elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+ elog "please add the following to your /etc/lxc/default.conf"
+ elog "lxc.lxcpath = /etc/lxc"
+ elog ""
+ elog "There is an init script provided with the package now; no documentation"
+ elog "is currently available though, so please check out /etc/init.d/lxc ."
+ elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+ elog "to start the container defined into /etc/lxc/configname.conf ."
+ elog "For further information about LXC development see"
+ elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+ elog ""
+}
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch
new file mode 100644
index 000000000000..e86e0c639893
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7504.patch
@@ -0,0 +1,49 @@
+From 837f21aacf5a714c23ddaadbbc5212f9b661e3f7 Mon Sep 17 00:00:00 2001
+From: Prasad J Pandit <pjp@fedoraproject.org>
+Date: Fri, 20 Nov 2015 11:50:31 +0530
+Subject: [PATCH] net: pcnet: add check to validate receive data
+ size(CVE-2015-7504)
+
+In loopback mode, pcnet_receive routine appends CRC code to the
+receive buffer. If the data size given is same as the buffer size,
+the appended CRC code overwrites 4 bytes after s->buffer. Added a
+check to avoid that.
+
+Reported by: Qinghao Tang <luodalongde@gmail.com>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/pcnet.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
+index 0eb3cc4..309c40b 100644
+--- a/hw/net/pcnet.c
++++ b/hw/net/pcnet.c
+@@ -1084,7 +1084,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
+ uint32_t fcs = ~0;
+ uint8_t *p = src;
+
+- while (p != &src[size-4])
++ while (p != &src[size])
+ CRC(fcs, *p++);
+ crc_err = (*(uint32_t *)p != htonl(fcs));
+ }
+@@ -1233,8 +1233,10 @@ static void pcnet_transmit(PCNetState *s)
+ bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT);
+
+ /* if multi-tmd packet outsizes s->buffer then skip it silently.
+- Note: this is not what real hw does */
+- if (s->xmit_pos + bcnt > sizeof(s->buffer)) {
++ * Note: this is not what real hw does.
++ * Last four bytes of s->buffer are used to store CRC FCS code.
++ */
++ if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) {
+ s->xmit_pos = -1;
+ goto txdone;
+ }
+--
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch
new file mode 100644
index 000000000000..4fee9ef5da9d
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-7512.patch
@@ -0,0 +1,37 @@
+From 8b98a2f07175d46c3f7217639bd5e03f2ec56343 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Mon, 30 Nov 2015 15:00:06 +0800
+Subject: [PATCH] pcnet: fix rx buffer overflow(CVE-2015-7512)
+
+Backends could provide a packet whose length is greater than buffer
+size. Check for this and truncate the packet to avoid rx buffer
+overflow in this case.
+
+Cc: Prasad J Pandit <pjp@fedoraproject.org>
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/pcnet.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
+index 309c40b..1f4a3db 100644
+--- a/hw/net/pcnet.c
++++ b/hw/net/pcnet.c
+@@ -1064,6 +1064,12 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_)
+ int pktcount = 0;
+
+ if (!s->looptest) {
++ if (size > 4092) {
++#ifdef PCNET_DEBUG_RMD
++ fprintf(stderr, "pcnet: truncates rx packet.\n");
++#endif
++ size = 4092;
++ }
+ memcpy(src, buf, size);
+ /* no need to compute the CRC */
+ src[size] = 0;
+--
+2.6.2
+
diff --git a/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch
new file mode 100644
index 000000000000..f01d9ac3418b
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.1-CVE-2015-8345.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/566792
+
+From 00837731d254908a841d69298a4f9f077babaf24 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Fri, 20 Nov 2015 08:42:33 +0100
+Subject: [PATCH] eepro100: Prevent two endless loops
+
+http://lists.nongnu.org/archive/html/qemu-devel/2015-11/msg04592.html
+shows an example how an endless loop in function action_command can
+be achieved.
+
+During my code review, I noticed a 2nd case which can result in an
+endless loop.
+
+Reported-by: Qinghao Tang <luodalongde@gmail.com>
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+---
+ hw/net/eepro100.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
+index 60333b7..685a478 100644
+--- a/hw/net/eepro100.c
++++ b/hw/net/eepro100.c
+@@ -774,6 +774,11 @@ static void tx_command(EEPRO100State *s)
+ #if 0
+ uint16_t tx_buffer_el = lduw_le_pci_dma(&s->dev, tbd_address + 6);
+ #endif
++ if (tx_buffer_size == 0) {
++ /* Prevent an endless loop. */
++ logout("loop in %s:%u\n", __FILE__, __LINE__);
++ break;
++ }
+ tbd_address += 8;
+ TRACE(RXTX, logout
+ ("TBD (simplified mode): buffer address 0x%08x, size 0x%04x\n",
+@@ -855,6 +860,10 @@ static void set_multicast_list(EEPRO100State *s)
+
+ static void action_command(EEPRO100State *s)
+ {
++ /* The loop below won't stop if it gets special handcrafted data.
++ Therefore we limit the number of iterations. */
++ unsigned max_loop_count = 16;
++
+ for (;;) {
+ bool bit_el;
+ bool bit_s;
+@@ -870,6 +879,13 @@ static void action_command(EEPRO100State *s)
+ #if 0
+ bool bit_sf = ((s->tx.command & COMMAND_SF) != 0);
+ #endif
++
++ if (max_loop_count-- == 0) {
++ /* Prevent an endless loop. */
++ logout("loop in %s:%u\n", __FILE__, __LINE__);
++ break;
++ }
++
+ s->cu_offset = s->tx.link;
+ TRACE(OTHER,
+ logout("val=(cu start), status=0x%04x, command=0x%04x, link=0x%08x\n",
+--
+2.6.2
+
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 4a344007d8cb..d282a753b64a 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -42,6 +42,7 @@
<flag name="uuid">Enable UUID support in the vdi block driver</flag>
<flag name="vde">Enable VDE-based networking</flag>
<flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+ <flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag>
<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
diff --git a/app-emulation/qemu/qemu-2.3.0-r5.ebuild b/app-emulation/qemu/qemu-2.3.0-r5.ebuild
index 05e5b6ccd1e4..04f938ed4e10 100644
--- a/app-emulation/qemu/qemu-2.3.0-r5.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r5.ebuild
@@ -129,7 +129,7 @@ CDEPEND="
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.3.0-r6.ebuild b/app-emulation/qemu/qemu-2.3.0-r6.ebuild
index 5b6cd8229a07..753395dd3820 100644
--- a/app-emulation/qemu/qemu-2.3.0-r6.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r6.ebuild
@@ -129,7 +129,7 @@ CDEPEND="
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.3.1.ebuild b/app-emulation/qemu/qemu-2.3.1.ebuild
index 421e705bba17..bfd96d8f523d 100644
--- a/app-emulation/qemu/qemu-2.3.1.ebuild
+++ b/app-emulation/qemu/qemu-2.3.1.ebuild
@@ -129,7 +129,7 @@ CDEPEND="
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
index 8d50bd3e7b8f..cc05df3c1cc8 100644
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@@ -150,7 +150,7 @@ CDEPEND="
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
index 6b53c66421f6..38e2bb2e4a93 100644
--- a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
@@ -150,7 +150,7 @@ CDEPEND="
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild b/app-emulation/qemu/qemu-2.4.0.1.ebuild
index 50ceedb9901e..61703f8139e4 100644
--- a/app-emulation/qemu/qemu-2.4.0.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@@ -150,7 +150,7 @@ CDEPEND="
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-2.4.1-r1.ebuild b/app-emulation/qemu/qemu-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..6e3ff9ad24a4
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.4.1-r1.ebuild
@@ -0,0 +1,644 @@
+# 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 ~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 \
+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 tls usb usbredir +uuid vde +vhost-net \
+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"
+
+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.
+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(+)] )
+ 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? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ smartcard? ( dev-libs/nss !app-emulation/libcacard )
+ 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(+)] )
+ tls? ( net-libs/gnutls[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(+)] )
+ 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 <USER> kvm', then have <USER> 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-1.7.0-cflags.patch
+ epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-{7504,7512}.patch #567144
+ epatch "${FILESDIR}"/${PN}-2.4.1-CVE-2015-8345.patch #566792
+ epatch "${FILESDIR}"/${PN}-2.4-mips-* #563162
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
+
+ # 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
+ --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 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 smartcard-nss)
+ $(conf_softmmu snappy)
+ $(conf_softmmu spice)
+ $(conf_softmmu ssh libssh2)
+ $(conf_softmmu tls vnc-tls)
+ $(conf_softmmu usb libusb)
+ $(conf_softmmu usbredir usb-redir)
+ $(conf_softmmu uuid)
+ $(conf_softmmu vde)
+ $(conf_softmmu vhost-net)
+ $(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/qmp/"
+
+ 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
+ if use virtfs && [ -n "${softmmu_targets}" ]; then
+ local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+ fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+ fi
+}
+
+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-emulation/qemu/qemu-2.4.1.ebuild b/app-emulation/qemu/qemu-2.4.1.ebuild
index 63252bea4b27..10618a9ea3cf 100644
--- a/app-emulation/qemu/qemu-2.4.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1.ebuild
@@ -150,7 +150,7 @@ CDEPEND="
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index aa8b852d9551..e0446dbf654e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -34,7 +34,7 @@ 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 \
-virtfs +vnc vte xattr xen xfs"
+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
@@ -123,7 +123,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
)
)
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- smartcard? ( dev-libs/nss !app-emulation/libcacard )
+ smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? (
>=app-emulation/spice-protocol-0.12.3
@@ -134,6 +134,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
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}"
@@ -156,7 +157,7 @@ CDEPEND="
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
- xen? ( app-emulation/xen-tools )"
+ xen? ( app-emulation/xen-tools:= )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
@@ -395,6 +396,7 @@ qemu_src_configure() {
$(conf_softmmu uuid)
$(conf_softmmu vde)
$(conf_softmmu vhost-net)
+ $(conf_softmmu virgl virglrenderer)
$(conf_softmmu virtfs)
$(conf_softmmu vnc)
$(conf_softmmu vte)
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 1494296fb3d9..373325951652 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1 +1,2 @@
DIST runc-0.0.2.tar.gz 370712 SHA256 3d0aa68ebb1622853d0bbed432ebd4b6c9ef210881ac74f3a695b4e914d246dc SHA512 e0a44d5dd8a1b8eaeaf7d466cebc7dc8beaa26f49bd0e76d3a955cef9c5c266d2afe6652f28fa905a408b5b93966f52e345112fa7aef373216561ad7069181c5 WHIRLPOOL e7ed1ee3d159a81fb0b2b0f5fac9a9a66116035babc88f6f266a6c8455953ce372e93351baf7c621c42ab8c5907961fd899b1d158e7f7b1335f83fcef7252c71
+DIST runc-0.0.5.tar.gz 441874 SHA256 e80323412883e4afcfcf8e1b2eaefdcb74632628d02fd7f48618caf78e5e4aa0 SHA512 625d67ec02e23c66a3d1a97113a0c58f3f200404866839556bc3cd5b3e34342230b8091613d17ef4a38d05ca51df586cd7366dc6bddeeddd6b69bb9a2ae7efda WHIRLPOOL 862b08621b67fc57286940ad5e20557d90cfef63aae5be0a90fc6f5b764d032b187ba5ad5dcb1fa99fb5ec59d6217941aa19ca9048637bd02b64e52c8cecdce6
diff --git a/app-emulation/runc/runc-0.0.5.ebuild b/app-emulation/runc/runc-0.0.5.ebuild
new file mode 100644
index 000000000000..5cd38367f22d
--- /dev/null
+++ b/app-emulation/runc/runc-0.0.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+GITHUB_URI="github.com/opencontainers/runc"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://${GITHUB_URI}.git"
+ inherit git-r3
+else
+ SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND="seccomp? ( sys-libs/libseccomp )"
+
+src_prepare() {
+ epatch_user
+}
+
+src_compile() {
+ # Taken from app-emulation/docker-1.7.0-r1
+ export CGO_CFLAGS="-I${ROOT}/usr/include"
+ export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+ # Setup GOPATH so things build
+ rm -rf .gopath
+ mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
+ ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
+ export GOPATH="${PWD}/.gopath:${PWD}/vendor"
+
+ # build up optional flags
+ local options=( $(usex seccomp "seccomp") )
+
+ emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+ dobin runc
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
index b35cabeaae72..7e33d7a403d9 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
@@ -4,17 +4,20 @@
EAPI=5
-MY_PV=${PV/_/-}
-
PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit eutils bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
+ inherit git-r3
KEYWORDS=""
- REPO="xen-unstable.hg"
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
- live_eclass="mercurial"
else
KEYWORDS="~amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=0
@@ -51,14 +54,12 @@ else
S="${WORKDIR}/xen-${MY_PV}"
fi
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
+DESCRIPTION="Xen tools including QEMU and xl"
HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${MAJOR_V}"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead
@@ -85,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
api? ( dev-libs/libxml2
net-misc/curl )
- pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
!amd64? ( >=sys-apps/dtc-1.4.0 )
amd64? ( sys-devel/bin86
@@ -120,7 +120,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-lang/ocaml-4 )"
RDEPEND="${COMMON_DEPEND}
- sys-apps/iproute2
+ sys-apps/iproute2[-minimal]
net-misc/bridge-utils
screen? (
app-misc/screen
@@ -263,6 +263,11 @@ src_prepare() {
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags"
+ else
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
fi
if ! use pygrub; then
@@ -344,7 +349,9 @@ src_configure() {
$(use_enable api xenapi) \
$(use_enable ovmf) \
$(use_enable ocaml ocamltools) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
"
+
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
use qemu || myconf+=" --with-system-qemu"
use amd64 && myconf+=" --enable-qemu-traditional"
@@ -356,13 +363,10 @@ src_compile() {
local myopt
use debug && myopt="${myopt} debug=y"
- use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
- unset LDFLAGS
- unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html
@@ -437,19 +441,6 @@ pkg_postinst() {
elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install"
- # TODO: we need to have the current Python slot here.
- if ! has_version "dev-lang/python[ncurses]"; then
- echo
- ewarn "NB: Your dev-lang/python is built without USE=ncurses."
- ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
- fi
-
- if has_version "sys-apps/iproute2[minimal]"; then
- echo
- ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
- ewarn "will not work until you rebuild iproute2 without USE=minimal."
- fi
-
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
@@ -463,10 +454,4 @@ pkg_postinst() {
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi
-
- if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
- echo
- elog "xensv is broken upstream (Gentoo bug #142011)."
- elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
- fi
}
diff --git a/app-emulation/xen/xen-4.6.0-r2.ebuild b/app-emulation/xen/xen-4.6.0-r2.ebuild
index 492a696c2667..29d57effbac6 100644
--- a/app-emulation/xen/xen-4.6.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r2.ebuild
@@ -6,11 +6,10 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs versionator
+inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
MY_PV=${PV/_/-}
MY_P=${PN}-${PV/_/-}
-MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
inherit git-r3
@@ -39,7 +38,7 @@ fi
DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
-SLOT="0/${MAJOR_V}"
+SLOT="0"
IUSE="custom-cflags debug efi flask"
DEPEND="${PYTHON_DEPS}
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 27a9d1f6ede4..9c9280e473ee 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1 +1,2 @@
DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b
+DIST eselect-php-0.8.0.tar.xz 43932 SHA256 1ddc6aafe269ebbf3006737701403bd2c7b324b9eea0fcbdc91e85a856f8a10d SHA512 53c735275264742542d3909ae2994d0720bc961533a3df5373dbc7a7a1f04e91591f4e8356c268954420487d3ead4006cc5d6f361ef0ac2836f7f126556e960d WHIRLPOOL 94deba4a5bd4d0d85c8f3afc96ac30a69cca5db95014b2fd8701495cc83488389302f640065e923cabd40c95f97f792dd173337cc33c7d38441956049fb90cda
diff --git a/app-eselect/eselect-php/eselect-php-0.8.0.ebuild b/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
new file mode 100644
index 000000000000..ea571784c702
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php5.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+want_apache
+
+src_install() {
+ default
+
+ if use apache2 ; then
+ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+ newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
+ fi
+
+ if use fpm ; then
+ newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm"
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/php-fpm-launcher"
+ fi
+}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
index 35eca98425fc..9c7def0a6e95 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge.jp/freewnn/59257/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="X ipv6"
DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index ccdc33aceaaf..2c09619dfc4f 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-mobilephone/yaps/yaps-0.96-r5.ebuild b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
index 637640591a3a..0bf5625fee75 100644
--- a/app-mobilephone/yaps/yaps-0.96-r5.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,9 +26,10 @@ DEPEND="
lua? ( virtual/pkgconfig )
"
-if use capi; then
- S="${WORKDIR}"/${P}.c4
-fi
+src_unpack() {
+ default
+ use capi && S="${WORKDIR}"/${P}.c4
+}
src_prepare() {
# apply patches
diff --git a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
index 26adf42b37f2..74c7023af7de 100644
--- a/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="|| (
diff --git a/app-portage/kuroo4/kuroo4-0.90.4.ebuild b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
index 670bed836985..6550fb31a474 100644
--- a/app-portage/kuroo4/kuroo4-0.90.4.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.4.ebuild
@@ -20,5 +20,5 @@ DEPEND="dev-db/sqlite:3"
RDEPEND="${DEPEND}
app-portage/gentoolkit
$(add_kdeapps_dep kdesu)
- $(add_kdeapps_dep kompare)
+ kde-apps/kompare:*
"
diff --git a/app-portage/kuroo4/kuroo4-0.90.5.ebuild b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
index 670bed836985..6550fb31a474 100644
--- a/app-portage/kuroo4/kuroo4-0.90.5.ebuild
+++ b/app-portage/kuroo4/kuroo4-0.90.5.ebuild
@@ -20,5 +20,5 @@ DEPEND="dev-db/sqlite:3"
RDEPEND="${DEPEND}
app-portage/gentoolkit
$(add_kdeapps_dep kdesu)
- $(add_kdeapps_dep kompare)
+ kde-apps/kompare:*
"
diff --git a/app-portage/porthole/porthole-0.6.1-r4.ebuild b/app-portage/porthole/porthole-0.6.1-r4.ebuild
index d72b76f8e2d8..2b98cf82e9cf 100644
--- a/app-portage/porthole/porthole-0.6.1-r4.ebuild
+++ b/app-portage/porthole/porthole-0.6.1-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd"
IUSE="nls"
LANGS="de pl ru vi it fr tr"
for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 8524bb0348f4..e38cc9e3f89e 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="sys-libs/ncurses:0="
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 1e136474aea0..b11e1145bef2 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1 +1,2 @@
DIST hstr-1.17.tar.gz 37289 SHA256 9e4b6e74bb7852945e25727105c5339c49c9ce1218481845c8d0205514d85e70 SHA512 eb89496c8554eb29ebb30430aa01179f7265a8ec15b0b9452f7e3ac4867ae4349e6141e11f0af01a4d15ba06131c18ec9ab760c8e68100fa2b8f2a793b237f9b WHIRLPOOL 2b33f485525b2cb033a82b249976d7c670d8f02948e84e73f350b19bdc955e551014f14ad4cfc845144ff0e0d8c3690c50b4444a414c7909f0106242d13a9cc2
+DIST hstr-1.18.tar.gz 43672 SHA256 85eb071938c2e7314e5fbd245a81c7b0cd93a8864bf9cba5b5041acb5052ba73 SHA512 e0684a694a514a341c30bfa7fc596f858658f3be9db6c490f628b4c48d1bf08acd8b4b03361ceb6aef65d42a5b01a1c0a8ce94698b5f7f5193ef030d7dc896c4 WHIRLPOOL 1bd00be28623ea8e05c1cec3d95451b7f92e6b17bfb5bd2853560955fc5ace9226edefdee820e9cee6c3542180f699b56371b9766a65a8efc669987dd5e961fb
diff --git a/app-shells/hstr/files/hstr-1.18-tinfo.patch b/app-shells/hstr/files/hstr-1.18-tinfo.patch
new file mode 100644
index 000000000000..0ffbd0cff257
--- /dev/null
+++ b/app-shells/hstr/files/hstr-1.18-tinfo.patch
@@ -0,0 +1,47 @@
+diff --git a/configure.ac b/configure.ac
+index 9cf6a53..cbc649d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,17 +18,21 @@ AC_PROG_CC
+
+ # Platform specific ncurses check.
+ AC_CANONICAL_HOST
+-AS_CASE([$host_os],
+- [darwin*],
+- [
+- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
+- AC_CHECK_HEADER(curses.h)
+- ],
+- [
+- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
+- AC_CHECK_HEADER(ncursesw/curses.h)
+- ]
+-)
++PKG_CHECK_MODULES([NCURSES], [ncursesw], [], [
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++ AS_CASE([$host_os],
++ [darwin*],
++ [
++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
++ AC_CHECK_HEADER(curses.h)
++ ],
++ [
++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
++ AC_CHECK_HEADER(ncursesw/curses.h)
++ ]
++ )
++ ])
++])
+
+ # Checks for libraries.
+ AC_CHECK_LIB(m, cos, [], [AC_MSG_ERROR([Could not find m library])])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5765613..ee411a9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,3 +15,5 @@ hh_SOURCES = \
+ hstr_regexp.c include/hstr_regexp.h \
+ radixsort.c include/radixsort.h \
+ hstr.c
++
++hh_LDADD = $(NCURSES_LIBS)
diff --git a/app-shells/hstr/hstr-1.18.ebuild b/app-shells/hstr/hstr-1.18.ebuild
new file mode 100644
index 000000000000..57a6535441f2
--- /dev/null
+++ b/app-shells/hstr/hstr-1.18.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Shell history suggest box - easily view, navigate, search and manage your command history"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+ sed \
+ -e 's:-O2::g' \
+ -i src/Makefile.am || die
+ autotools-utils_src_prepare
+}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 36f5a1b0e0f4..70aa99ff223c 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
DIST sigil-0.9.0.tar.gz 17446877 SHA256 39887e1f76236e796d29c679f327c7183907c47b522794a00090eb1aa04dac92 SHA512 f83e5e8ae233e8784ad25345890a33424cf951a3d385d26a69b0efbabe87b22ab9466a6faed93f1106875642ef395c6f20c69b556661b6fe24388946d677746b WHIRLPOOL d6cca23116a428fc032538ab7fda1ab1d2afa703b8f665d58c03bcd5568e6174f1efbc43b7c5cb7f9e8b91866ea93d8cf01428fbd47748a26b4906152de972c8
+DIST sigil-0.9.1.tar.gz 17451106 SHA256 7ef13ae9f570ac51aa8d80890ff31bcdf8d1b488c1c4bbb315f1ca4b75237a63 SHA512 41327a67aea80f655f8662c0fcf7159db7d44a5cf89274777c719bcff2960e8ef11788c767c8ffba095c1fb4be320b055e1826bff8f6d0ca89999d52e750f7e0 WHIRLPOOL 49d3b4d10abebce045e55fac7350d7a7e09ebef9293593db6b5bc148507e289a9ab26ddaf6f0b53dfe7252be78f53fbcdc0c760b78ed642c74ee8f73a026a302
diff --git a/app-text/sigil/sigil-0.8.7.ebuild b/app-text/sigil/sigil-0.9.1.ebuild
index 027d5d0ee9a5..98abaadb2971 100644
--- a/app-text/sigil/sigil-0.8.7.ebuild
+++ b/app-text/sigil/sigil-0.9.1.ebuild
@@ -4,11 +4,11 @@
EAPI=5
CMAKE_MIN_VERSION="3.0"
-CMAKE_BUILD_TYPE="Release"
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
+# Sigil supports Python 3.5 already. Include it when our deps support it.
+PYTHON_COMPAT=( python3_4 )
-inherit eutils cmake-utils
+inherit eutils cmake-utils python-single-r1
MY_PN="Sigil"
@@ -22,10 +22,18 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
- >=app-text/hunspell-1.3.2
- >=dev-libs/boost-1.49[threads]
- >=dev-libs/libpcre-8.31[pcre16]
- >=dev-libs/xerces-c-3.1.1[icu]
+ app-text/hunspell
+ dev-libs/boost[threads,${PYTHON_USEDEP}]
+ dev-libs/libpcre[pcre16]
+ dev-libs/xerces-c[icu]
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/cssutils[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
>=dev-qt/qtconcurrent-5.4:5
>=dev-qt/qtcore-5.4:5
>=dev-qt/qtgui-5.4:5
@@ -36,30 +44,31 @@ RDEPEND="
>=dev-qt/qtwidgets-5.4:5
>=dev-qt/qtxml-5.4:5
>=dev-qt/qtxmlpatterns-5.4:5
- >=sys-libs/zlib-1.2.7[minizip]
+ sys-libs/zlib[minizip]
"
DEPEND="${RDEPEND}
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sys-devel/gcc-4.8
virtual/pkgconfig
>=dev-qt/linguist-tools-5.4:5
"
S="${WORKDIR}/${MY_PN}-${PV}"
-DOCS=( README.md )
+DOCS=( ChangeLog.txt README.md )
src_prepare() {
# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
- sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
+ sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
cmake-utils_src_prepare
}
src_configure() {
+ local mycmakeargs=(
+ -DUSE_SYSTEM_LIBS=1
+ -DSYSTEM_LIBS_REQUIRED=1
+ )
cmake-utils_src_configure
-
- cd "${WORKDIR}/${P}_build" || die "Where is the build dir?"
- for i in CMakeCache.txt src/Sigil/CMakeFiles/sigil.dir/link.txt $(find . -name '*.make')
- do
- sed -e 's/-O3 -DNDEBUG/-DNDEBUG/' -i ${i} || die "sed failed"
- done
}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 1a130969847b..6ec6df624bf0 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,4 +1,3 @@
-DIST 3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
DIST bul.traineddata.gz 848731 SHA256 fc3c650568d014f2337052658e9ddd8efaff6ac74c9a90952d740eafdf400e2d SHA512 69dca9b285da3985142fc3e8d2a75d7fb217308c077114004c274972491c8cd8aebd60e27ffb26c9906a6ae78e05e19bbc5fd24ab97b961df5882cbd295f747a WHIRLPOOL a331336952140946bae38c59f9005d131dc9f7976358ff06a4458311ac0e5e10102868d0c37a41eae3f73a27d6a9a253c599e53167dbdf6c7c086ba8418f0624
@@ -23,6 +22,7 @@ DIST deu_frak.traineddata-3.04.00 1978593 SHA256 cbb200e394485c5b515de203963c2a7
DIST ell.traineddata-3.04.00 5422512 SHA256 bbe0ed0758c69043114b13fc8f00a42342c647f27be352c05b4978e265380e64 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48 WHIRLPOOL 16d89cb546883bf75a8b75e55c0eb88d915d07cad0f4c5b3e0640385f4b7cb2a6aeeedce13cf48538f5a78ec39776ccdecef9c3264cd749e1d224cdcff5e310a
DIST ell.traineddata.gz 944284 SHA256 f8cb765c40733a677fa470370b935c34cfc53ba8de372b33e83ab59c7407195d SHA512 3657cc335e9e484f13ba360518cd3d9bf828a1c0e53a22c84a4085565ebbca0811b8d2a25edd2455c9b6707baa54896d132bcfdad210384b3025ae26506d7582 WHIRLPOOL 634e00d9f1d2d2cc67053efce2b937f7a1201b719ba902744e96ccbc72f682b7374dfa56f050956db39f5a191d1ed41e12d90e01bc87d406070acc0598aa9f71
DIST eng.traineddata-3.04.00 21876550 SHA256 c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a WHIRLPOOL e71cec7e7e8b9b8183f459741ce2eb1a33923e73802ab35dae81ab7939b980b028e4d4a3325205a52f67b8502323e9cd8dee6efd69ca40c0eb42b0961d5d8786
+DIST equ.traineddata-3.04.00 2251826 SHA256 3af43a2420ce927dbce68474d644625947189a82ce6ae4fd32106399146819db SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8 WHIRLPOOL 074d613cdb990703731deb228fbf4bec660e8e4be053bc8196ab639d14f84cb51e11a2ac285e4cbc4c362a90e2117d90a19b843cdf11f5ab3263d604ddd252b8
DIST fin.traineddata-3.04.00 13274908 SHA256 f830c625f635a637cb11a6a565126b1ae105c24ae9fd7cb92c8d5130c7184cf1 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789 WHIRLPOOL 9068bd4b23ac62d8b4cc846b10abb7bf536b786a8eefc32745ca99370eb6739b4ee9bd912b78cb0922e6111a0e8be2dc58285c0726dd2ebd92bb3349bf8344db
DIST fin.traineddata.gz 959833 SHA256 30c05d403295fb659048b5d82db0d87c9cbee5077314e2b52f6fdca9c9ec8520 SHA512 f7db41a5698ce51f8f103201f7dda67cf140a57d28da7bf3420847c60f847bc24c16571d63785b707e9d599017a0a29ab15914c4b413e4e9dd12b019643e9682 WHIRLPOOL 2adbe34d45050331ae3f7d7ba9739dd0dafb600cccd2713f38aa79bc83023898cf97e45c63b9edbb5014f5cffa02596be6ec75b34e45fda5d87f19bc9418db78
DIST fra.traineddata-3.04.00 14044118 SHA256 86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561 WHIRLPOOL edd6121dbfb52ca11ce86fcf54ec5f026d6b4341f824fbe1eab45af2e830bf1cf80615626b260c79343337fb61181e69b42281da78e6784dc28d244afd09a1fb
@@ -68,17 +68,6 @@ DIST srp.traineddata.gz 977674 SHA256 542b83f62389ff8cc34746dd765345566ab368b63d
DIST swe-frak.traineddata.gz 1503568 SHA256 2cf1a0e1eb8a0e3f8477ebcde44d99a9229f2c20b2d96ecb1ca6c25db5c6fdec SHA512 ad23fb3b4088a6e3c706ac54c940399b502d1e5e0a822f671e7e0682709323380eba6ae2e6a138702393450fea9ec3473c977d5bd9aa7550081a8c0aaeb3ae58 WHIRLPOOL b8e217a419cab817424f977a5a3650587afc91d9ddc5a929f89568c60930f61bd219305b36d7f84a9b07aae489e1f896f8e300fa474c098de03f03df92b8b2f7
DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd6220e7ab74e05e65bf16426ac8f2050 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167 WHIRLPOOL c95f12b64b1563d195b38cd8ad169f91e7608ba72c2e93fb49aebd7ec6bd065431b8ee892621cdd7d01922b99e71f52d1f1e5023b3af682eb2125419f0d529cd
DIST swe.traineddata.gz 959911 SHA256 25331ca1f41378a86336604476049810a0c5350417205e300cb2d11048cec2c1 SHA512 e38fe9fd7d26420ee1aab3db7f700d58210dbfaef45d03114679d2671bc1942d7b031499e763204e15ebeadafa2f8f063f78941f2299b2c74f635425ddce856a WHIRLPOOL db1225d47e2e3b26372689f96164d8286701dbb2e0f1a82368c784c8d127a0d11248924936abd05d0092ba8ad5ce222b6d113ceb0f440b85faaca37396781480
-DIST tesseract-2.00.deu.tar.gz 1373777 SHA256 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404 SHA512 e1792055d666c6090c4094b032d0143fd6bd5545c2d2e926f71bb360c6628ae5550f158df8efe47b69c987ac9cef8bd914fedcad2bd5b79901a41506ad8a60f2 WHIRLPOOL 77322db4454bddffa9f7b08bf8336ecddb0a71be9b7463427a7aa87e49716dc1aea4c8bb85ad836716bba03519827c051229a5cc37149d96558cdfe83ffc3445
-DIST tesseract-2.00.eng.tar.gz 1013090 SHA256 2fbd50a6cb352f847ebf3deadc914bbc12592539d4c368f7f7cff0a71f7d48e7 SHA512 f2aa2e1aa8f20c59faa664675f85ca8c1dcc922803f17cc00519f84a01c0c98ba431915ba5765d5de75200d828687507846af7e9e0096f3a4fdf1163e54cb83d WHIRLPOOL 178baaa6c73169a8b3e9276927bcf67bdd80fe114c8c3635aacd765cf9198dce2599c4f5493577b2ba9b1538ca8da69e6b2117fc7c9bb6451c129ee2efb71efe
-DIST tesseract-2.00.fra.tar.gz 1007776 SHA256 1201229bb8b377ab3d92255e0b0642a36304b99415091fb059f423c814cecd25 SHA512 46686d6296446c59d020731e2d36e015717a750f6a41401c38794e7e8067dbd0299b838260a9ea9d5da3ddc289e0320ed71437f67ea99f93e79895e4aaf9cdc8 WHIRLPOOL 9cb290cf260c40272223c75f1b575361cea2d51f462a10f4f82e20518531cbe1b908473b4d6a11f08c7461c4fbc8bd31256555964d39502676b035dc753da97a
-DIST tesseract-2.00.ita.tar.gz 977683 SHA256 3a1b9323ddfcda327780aba94ef724f35690d3cfdf8ef832c5709721b7e2999a SHA512 75cb670c1fe202878c220029d113e0795844f94901a6a0e31201c43d5694e1995c11760229ef6dc5222ff1fe49ee87ee1cdf073e80347e2862e71f045ce4a2db WHIRLPOOL c57ad7d994abc0c030ba68efff6c27eca8af9c78878f166d0fdad6564f916b6c30c1882c7447ce38752817489054bbed71ec49b07de70d1cf5e96080646fba2e
-DIST tesseract-2.00.nld.tar.gz 1408071 SHA256 26b9f7d80c4cfe19074c3c5dc55a37b489d89b6f7b13c026f9c2dc265120d859 SHA512 0a2b7f13d784d210f5284de1a02c9b3849c4b36a27cf6276b5d9d444607bf52b909f8edfa07b5b1e0ee6bf59504bb9c92a47297ce31efa351aaa6b81c038b0ef WHIRLPOOL 5c60260832af157cf4f07b79105187be6a1f9d5bd2bf4d8d0a0c8f43c36da3271225114e6d5d1e1b83e53e47bf67e0e8ec89ed0f22ba6c48c620c0c22da854d2
-DIST tesseract-2.00.spa.tar.gz 1365863 SHA256 b4b83e46be4602a361279c131da2c7f3ba8c51ac26c0e108f958406db6ae320e SHA512 a7efb46c5cc3812789f3dacf151e547007c3de1eed3d4a6a5c55cc18d4e1794377f34b55fd9e6a416f91a0ff62a66c0825a1993029ce4656ea64fcc18b9fa3fe WHIRLPOOL b6d474cf1bb9015cfe42214b3ca87e8f4c2ff193443a71fd0c1fd973a5a7683e4501e975354929f91c446a2bfb449f2cb535ca70f26ec35b527458450f0a8ee9
-DIST tesseract-2.01.deu-f.tar.gz 1312785 SHA256 410143cf5029b10d274909439de2c407706e4d601cd5e1bb1309dbd46288757e SHA512 76cc7da4f3a21581705bbae1975ae9a458ca61fa2691645f5b9f64d61ff0222e2c721ecd0c069c3540a65974129f58ae1a08b0d38c3f4d1f45f31d5969d63fb8 WHIRLPOOL 456e7d7f446c1cfca9e483dd85f5bf62c1b24c44535a0dd8600a6188096a1692484a60502bc6537262222cd94c8caae378a2bb698d3628a4223d15e559ad8cfd
-DIST tesseract-2.01.por.tar.gz 2107696 SHA256 0dc30b76814a7694246ca347ccb402bcd40e5e6f3bf70cca31e6d3ca06210baa SHA512 a7d2b3eb206f0cb9e8eee18f55476f8778a8839b3daaa9e10a8d77fec07ce3e37de58017b8fb09b90a4aef026f94df4a15ce77b4db9d6a12815353ee60fcadc7 WHIRLPOOL f15cf92aae31a28ae4c56a9730d6a8af6d87675b5a4eba5dbeadbd65fa609213fb919bb8334c7c430fe0907bbce3107a7d0efed3733487e00ae6b1282d6001d6
-DIST tesseract-2.01.vie.tar.gz 964277 SHA256 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f SHA512 568b91ffa79ca57b613d6548504adf37677fa04a7226d366bc7d4548d1480dc00b397b76f42ef96a2ca0d78b6ffc635fa5586b0cd251d54cf22eb960ab3c920e WHIRLPOOL c32c5e8a5b62f688df43a94a69f0d1326179866e6a9674b625d984ceed26b085764c9b7cd3980507546e23c567f350f9a0ccb3d2d4b2c8d2efe1a1a9ef98d430
-DIST tesseract-2.04.eus.tar.gz 1207994 SHA256 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe SHA512 613fedb033f3c678a15d71a7346ad7d2da7d0908f18b0450bc4c198b19e3671fdab025e44a4f6f73257848f626af58c144464ce349a3e5c4b91eebc8b4018c1f WHIRLPOOL 7c0f5556ff2acbc4aac3b60885dc15db22385135c43ea57ad8d4b4226b603e6aad6a346d57099429d3c92bffeda9c9604e621c8d9bc2c98c4b770634250d17e1
-DIST tesseract-2.04.tar.gz 1118386 SHA256 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8 SHA512 c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42 WHIRLPOOL 2ce585c295477d17de265bac563d50c249b036301058b98e552b79f040829facea778cfc7692ae06299fc6b55bf2d890e511300c9746be525f9439d0d93d1280
DIST tesseract-3.03-rc1.tar.gz 12812907 SHA256 d244956236f7491d74d7f342895f611a6c46c45fa9900173d5b7625d8461d2ea SHA512 4acd6a3c0db5568bd6cb199776a52fbf1643692cf2d9da7449644662461c0c3ef7e5941bb49be94135433a90de400413df062edd612ce9ec9c06e9206a57113f WHIRLPOOL 93f33f62aeb5a9f65a7642bc282138622076989618f787a044ad79463ab9cd9a9ebaeb5e34e52cf5c95c569b01fc552a44d2eda24e697d0c9a045fb626b9aa77
DIST tesseract-3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
DIST tesseract-ocr-3.01.heb-com.tar.gz 270977 SHA256 20a9d53172a8dbf1a4bbd7f7e9e3a523a9435c47c751533642e8a9becc8584ff SHA512 378dc49da535f70c860c29b9a43cae478f6d8403c93a623b1781194c02aad3ea12345f9ea6ebbac4fb2033179964d23fb075e6aa206ec79530b41947d5d44411 WHIRLPOOL cc6463928c05d5904af71ea6170e946e601639761eaab317f0570275e0eaee81cba2c0636dc5dec40f8ba6d16ad498e7177a0c2bf5a886f2598c99568f151fd6
diff --git a/app-text/tesseract/files/tesseract-2.04-gcc44.patch b/app-text/tesseract/files/tesseract-2.04-gcc44.patch
deleted file mode 100644
index 7d1f61c19acd..000000000000
--- a/app-text/tesseract/files/tesseract-2.04-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NrU5 tesseract-2.04.original/viewer/svutil.cpp tesseract-2.04/viewer/svutil.cpp
---- tesseract-2.04.original/viewer/svutil.cpp 2009-07-25 21:03:18.000000000 +0000
-+++ tesseract-2.04/viewer/svutil.cpp 2009-07-25 21:05:54.000000000 +0000
-@@ -41,10 +41,11 @@
- #include <sys/prctl.h>
- #endif
- #endif
-
- #include <iostream>
-+#include <cstdio>
-
- const int kBufferSize = 65536;
- const int kMaxMsgSize = 4096;
-
- // Signals a thread to exit.
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 5d984328b595..f9d811c29319 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -18,15 +18,12 @@
</upstream>
<use>
<flag name="webp"> Enable support for webp image format.</flag>
- <flag name="scrollview"> Enable graphics support
- (ScrollView).</flag>
+ <flag name="math"> Enable support for recognition of equations.</flag>
+ <flag name="scrollview"> Enable graphics support (ScrollView).</flag>
<flag name="linguas_chr"> Enable support for the Cherokee language.</flag>
<flag name="linguas_jp"> Enable support for Japanese.</flag>
- <flag name="osd"> Enable support orientation and script
- detection.</flag>
- <flag name="opencl">Enable opencl support for speedup using GPU
- computation.</flag>
- <flag name="training">Install training applications to add support
- for new languages.</flag>
+ <flag name="osd"> Enable support orientation and script detection.</flag>
+ <flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
+ <flag name="training">Install training applications to add support for new languages.</flag>
</use>
</pkgmetadata>
diff --git a/app-text/tesseract/tesseract-2.04-r1.ebuild b/app-text/tesseract/tesseract-2.04-r1.ebuild
deleted file mode 100644
index adcaca916cf1..000000000000
--- a/app-text/tesseract/tesseract-2.04-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
-HOMEPAGE="https://code.google.com/p/tesseract-ocr/"
-SRC_URI="https://tesseract-ocr.googlecode.com/files/${P}.tar.gz
- https://tesseract-ocr.googlecode.com/files/${PN}-2.00.eng.tar.gz
- linguas_de? (
- https://tesseract-ocr.googlecode.com/files/${PN}-2.00.deu.tar.gz
- https://tesseract-ocr.googlecode.com/files/${PN}-2.01.deu-f.tar.gz
- )
- linguas_eu? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.04.eus.tar.gz )
- linguas_es? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.spa.tar.gz )
- linguas_fr? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.fra.tar.gz )
- linguas_it? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.ita.tar.gz )
- linguas_nl? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.00.nld.tar.gz )
- linguas_pt_BR? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.01.por.tar.gz )
- linguas_vi? ( https://tesseract-ocr.googlecode.com/files/${PN}-2.01.vie.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 sparc x86"
-IUSE="examples tiff linguas_de linguas_eu linguas_es linguas_fr linguas_it linguas_nl linguas_pt_BR linguas_vi"
-
-DEPEND="tiff? ( media-libs/tiff )"
-RDEPEND="${DEPEND}"
-
-# NOTES:
-# english language files are always installed because they are used by default
-# that is a tesseract bug and if possible this workaround should be avoided
-# see bug 287373
-# deu-f corresponds to an old german graphic style named fraktur
-# that's the same language (german, de)
-# stuff in directory java/ seems useless...
-# in testing/, there is a way to test accuracy, not usable for src_test()
-# app-ocr/ would be a better category
-
-src_prepare() {
- # move language files to have them installed
- mv "${WORKDIR}"/tessdata/* tessdata/ || die "move language files failed"
-
- # remove obsolete makefile, install target only in uppercase Makefile
- rm "${S}/java/makefile" || die "remove obsolete java makefile failed"
-
- # fix gcc-4.4 compilation, bug 269320
- # fix gcc-4.7 compilation, bug 413937
- epatch \
- "${FILESDIR}"/${P}-gcc44.patch \
- "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_configure() {
- econf $(use_with tiff libtiff) \
- --disable-dependency-tracking
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README ReleaseNotes || die "dodoc failed"
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins eurotext.tif phototest.tif || die "doins failed"
- fi
-}
diff --git a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild b/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
deleted file mode 100644
index f80a9c527331..000000000000
--- a/app-text/tesseract/tesseract-3.03_rc1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-ocr"
-DL_P="${MY_PN}-3.02"
-URI_PREFIX="https://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools autotools-utils versionator
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
-
-DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
-HOMEPAGE="https://code.google.com/p/tesseract-ocr/"
-SRC_URI="https://dev.gentoo.org/~tomka/files/${PN}-3.03-rc1.tar.gz
- ${URI_PREFIX}/${DL_P}.eng.tar.gz
- doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
- linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
- linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
- linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
- linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
- linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
- linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
- ${URI_PREFIX}/deu-frak.traineddata.gz )
- linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
- ${URI_PREFIX}/dan-frak.traineddata.gz )
- linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
- linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
- linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
- linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
- linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
- ${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
- linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
- linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
- linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
- linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
- linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
- linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
- linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
- linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
- linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
- linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
- linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
- linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
- linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
- linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
- linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
- ${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
- linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
- linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
- linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
- ${URI_PREFIX}/swe-frak.traineddata.gz )
- linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
- linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
- linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
- linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
- linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
- linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
- linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
- osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-
-# With opencl tiff is necessary regardless of leptonica status
-DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
- opencl? ( virtual/opencl
- media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
- "${FILESDIR}/tesseract-2.04-gcc47.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable opencl) \
- $(use_enable scrollview graphics) \
- --disable-dependency-tracking
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins eurotext.tif phototest.tif
- fi
-
- if use doc; then
- dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
- fi
-
- # install language files
- insinto /usr/share/tessdata
- find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
- doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
-}
diff --git a/app-text/tesseract/tesseract-3.04.00-r1.ebuild b/app-text/tesseract/tesseract-3.04.00-r3.ebuild
index fa1e08ae22f0..76400019720b 100644
--- a/app-text/tesseract/tesseract-3.04.00-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r3.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="https://github.com/tesseract-ocr"
SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
+ math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${PV} )
linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
@@ -61,12 +62,20 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+IUSE="doc examples jpeg math opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-# With opencl tiff is necessary regardless of leptonica status <-- Check this
+# With opencl USE=tiff is necessary in leptonica
DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
opencl? ( virtual/opencl
- media-libs/tiff:0 )"
+ media-libs/tiff:0
+ >=media-libs/leptonica-1.71[zlib,tiff,jpeg?,png?,webp?]
+ )
+ training? (
+ dev-libs/icu
+ x11-libs/pango
+ x11-libs/cairo
+ )
+"
RDEPEND="${DEPEND}"
DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
@@ -86,15 +95,27 @@ src_unpack() {
src_configure() {
local myeconfargs=(
$(use_enable opencl) \
- $(use_enable scrollview graphics) \
- --disable-dependency-tracking
- )
+ $(use_enable scrollview graphics)
+ )
autotools-utils_src_configure
}
+src_compile() {
+ default
+ if use training; then
+ emake training
+ fi
+ }
+
src_install() {
autotools-utils_src_install
+ if use training; then
+ pushd "${BUILD_DIR}"
+ emake DESTDIR="${D}" training-install
+ popd
+ fi
+
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins testing/eurotext.tif testing/phototest.tif
diff --git a/app-text/tesseract/tesseract-3.04.00.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
deleted file mode 100644
index 6303c2db72fd..000000000000
--- a/app-text/tesseract/tesseract-3.04.00.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN}-ocr"
-DL_P="${MY_PN}-3.02"
-URI_PREFIX="https://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz
- ${URI_PREFIX}/${DL_P}.eng.tar.gz
- doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
- linguas_ar? ( ${URI_PREFIX}/${DL_P}.ara.tar.gz )
- linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
- linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
- linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
- linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
- linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
- ${URI_PREFIX}/deu-frak.traineddata.gz )
- linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
- ${URI_PREFIX}/dan-frak.traineddata.gz )
- linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
- linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
- linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
- linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
- linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
- ${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
- linguas_hi? ( ${URI_PREFIX}/${DL_P}.hin.tar.gz )
- linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
- linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
- linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
- linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
- linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
- linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
- linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
- linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
- linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
- linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
- linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
- linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
- linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
- linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
- ${URI_PREFIX}/${MY_PN}-3.01.slk-frak.tar.gz )
- linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
- linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
- linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
- ${URI_PREFIX}/swe-frak.traineddata.gz )
- linguas_th? ( ${URI_PREFIX}/${DL_P}.tha.tar.gz )
- linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
- linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
- linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
- linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
- linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
- linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
- osd? ( ${URI_PREFIX}/${MY_PN}-3.01.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
-
-# With opencl tiff is necessary regardless of leptonica status <-- Check this
-DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
- opencl? ( virtual/opencl
- media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
-
-PATCHES=(
- "${FILESDIR}/tesseract-2.04-gcc47.patch"
- "${FILESDIR}/${P}-fix-scrollview-disabled.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable opencl) \
- $(use_enable scrollview graphics) \
- --disable-dependency-tracking
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins testing/eurotext.tif testing/phototest.tif
- fi
-
- if use doc; then
- dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
- fi
-
- # install language files
- insinto /usr/share/tessdata
- find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
- doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
-}
diff --git a/app-text/texlive/texlive-2014.ebuild b/app-text/texlive/texlive-2014.ebuild
index 9ac679923611..f229da740352 100644
--- a/app-text/texlive/texlive-2014.ebuild
+++ b/app-text/texlive/texlive-2014.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cjk context detex dvi2tty extra epspdf games graphics
humanities jadetex luatex metapost music omega pdfannotextractor png pstricks publishers
science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
index a2696fd47e60..1e468c043089 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
new file mode 100644
index 000000000000..167b787a6ee8
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils flag-o-matic gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+COMMON_DEPEND="
+ >=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.28:2[${MULTILIB_USEDEP}]
+ >=dev-cpp/atkmm-2.22.7[${MULTILIB_USEDEP}]
+ >=dev-cpp/cairomm-1.10.0-r1[${MULTILIB_USEDEP}]
+ >=dev-cpp/pangomm-2.34.0:1.4[${MULTILIB_USEDEP}]
+ >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
+ !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ doc? (
+ media-gfx/graphviz
+ dev-libs/libxslt
+ app-doc/doxygen )
+"
+
+src_prepare() {
+ # Apply fixes from 2.24 branch
+ epatch "${FILESDIR}"/${P}-papersize.patch
+ epatch "${FILESDIR}"/${P}-missing-includes.patch
+ epatch "${FILESDIR}"/${P}-newer-glibmm.patch
+
+ if ! use test; then
+ # don't waste time building tests
+ sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed 1 failed"
+ fi
+
+ if ! use examples; then
+ # don't waste time building tests
+ sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+ || die "sed 2 failed"
+ fi
+
+ gnome2_src_prepare
+
+ append-cxxflags -std=c++11
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" gnome2_src_configure \
+ --enable-api-atkmm \
+ $(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog PORTING NEWS README"
+ einstalldocs
+}
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index 3f57ed7eab14..1aaffada805d 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -23,7 +23,8 @@ RDEPEND=">=dev-libs/icu-4.3.1:=
<dev-lang/spidermonkey-1.8.7
selinux? ( sec-policy/selinux-couchdb )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ sys-devel/autoconf-archive"
RESTRICT=test
S="${WORKDIR}/apache-${P}"
diff --git a/dev-db/redis/redis-3.0.4.ebuild b/dev-db/redis/redis-3.0.4.ebuild
index 8bfa196c7904..753f0af0ca70 100644
--- a/dev-db/redis/redis-3.0.4.ebuild
+++ b/dev-db/redis/redis-3.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc test"
SLOT="0"
diff --git a/dev-db/redis/redis-3.0.5.ebuild b/dev-db/redis/redis-3.0.5.ebuild
index 328adcbb44f8..c41142011a61 100644
--- a/dev-db/redis/redis-3.0.5.ebuild
+++ b/dev-db/redis/redis-3.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc test"
SLOT="0"
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index f555aba43558..17a24ddde547 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,3 +1 @@
-DIST sqlitebrowser-3.5.1.tar.gz 874540 SHA256 d7f3d1e54882ebabab3b2f7764a6bb921d4fe319db84a092147c941ce19feb8d SHA512 815665002932a606c7e1da8738be0d94a0b2bf330042af30d5b4033ce27c548fec1a05b51f2a11a7620d4e123961ba63595b60aec7eac716e5d3747bb90886e2 WHIRLPOOL 1b8984eefe730ef468fc64bff1465de3a5b273e3e1594916f05cbe07bec315126001b42cc05d6a3c153aaaccab39bdafa29d31f83fceba6aa7697df7ff870462
-DIST sqlitebrowser-3.6.0.tar.gz 1453029 SHA256 221a410a3ec8512a766ed8bc4cade1f3b1cde94e41e52743d5a6d2a33acb3a56 SHA512 ae4a0bb9ac8ff01ec965ae264a41fe7749672cd6562f0ce5e5b69007ea403fff5dcc4f90be3ffa4d9b7d1dc293767f2ca7757de55895f56efbe6b7be0e6721df WHIRLPOOL 93e053d8b6cf9e67f0294117995443865e29923c899a0263ce117979f982155e4020a88ba865a4b92d162fc8842f5b95c4b512575d153cb7f9fa9445880e1b5c
DIST sqlitebrowser-3.7.0.tar.gz 1509766 SHA256 3093a1dcf5b3138c1adf29857d62249ab2b068e70b001869a31151763e28cc3a SHA512 f4c2f517a0b04fb74d8ec656e34f93d467a233040b36fab8f6f172681eb213be5c08131ecdaaa542d833bf24ef564d8e6f800e861b9a20d53de7a585aa104533 WHIRLPOOL 3bbfaa99f179c10f542d344ce6fe55656aa750a52925b2de590e2ba24bcafa95604646e6b218bca4f461390268de2bc2fb29d0de1deaf06438b33cb660e614e8
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
deleted file mode 100644
index d30919bd97c7..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit eutils cmake-utils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-java/antlr:0[cxx]
- dev-libs/qcustomplot[qt5=]
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- )"
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
-
-src_prepare() {
- # https://github.com/qingfengxia/qhexedit still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5)
- )
- cmake-utils_src_configure
- if use test; then
- BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_configure
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use test; then
- BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_compile
- fi
-}
-
-src_test() {
- tests/sqlb-unittests || die
-}
-
-src_install() {
- cmake-utils_src_install
- doicon images/sqlitebrowser.svg
- domenu distri/sqlitebrowser.desktop
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
deleted file mode 100644
index c180287dd806..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit eutils cmake-utils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 test"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-java/antlr:0[cxx]
- dev-libs/qcustomplot[qt5=]
- x11-libs/qscintilla
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- )"
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )"
-
-PATCHES=( "${FILESDIR}"/${P}-unbundle-keep-qscintilla.patch )
-
-src_prepare() {
- # https://github.com/qingfengxia/qhexedit still bundled
- # x11-libs/qscintilla[qt4?,qt5?] still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5)
- )
- cmake-utils_src_configure
- if use test; then
- BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_configure
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use test; then
- BUILD_DIR="${S}"/tests CMAKE_USE_DIR="${S}"/tests cmake-utils_src_compile
- fi
-}
-
-src_test() {
- tests/sqlb-unittests || die
-}
-
-src_install() {
- cmake-utils_src_install
- doicon images/sqlitebrowser.svg
- domenu distri/sqlitebrowser.desktop
-}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
index b67ebaec098a..3ebd2cb4568b 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.7.0.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.7.0-r1.ebuild
@@ -20,8 +20,8 @@ IUSE="qt4 qt5 test"
REQUIRED_USE="^^ ( qt4 qt5 )"
RDEPEND="
+ dev-cpp/antlr-cpp:2=
dev-db/sqlite:3
- dev-java/antlr:0[cxx]
dev-libs/qcustomplot[qt5=]
x11-libs/qscintilla
qt4? (
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
index 555e2aa3cdf0..9c9125cc2ba9 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
@@ -33,11 +33,15 @@ RDEPEND="dev-libs/libaio
dev-libs/libgpg-error
dev-perl/DBD-mysql"
-if use amd64; then
- S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
- S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+ default
+
+ if use amd64; then
+ S="${WORKDIR}/${MY_P}-Linux-x86_64"
+ elif use x86; then
+ S="${WORKDIR}/${MY_P}-Linux-i686"
+ fi
+}
src_prepare() {
# bug 501904 - CVE-2014-2029
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
index c31eec49530c..8cd30efb424b 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
@@ -32,11 +32,15 @@ RDEPEND="dev-libs/libaio
dev-perl/DBD-mysql
sys-libs/zlib"
-if use amd64; then
- S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
- S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+ default
+
+ if use amd64; then
+ S="${WORKDIR}/${MY_P}-Linux-x86_64"
+ elif use x86; then
+ S="${WORKDIR}/${MY_P}-Linux-i686"
+ fi
+}
src_prepare() {
# bug 501904 - CVE-2014-2029
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
index 90b932955691..0b845e28f2e2 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
@@ -34,11 +34,15 @@ RDEPEND="dev-libs/libaio
dev-perl/DBD-mysql
sys-libs/zlib"
-if use amd64; then
- S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
- S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+ default
+
+ if use amd64; then
+ S="${WORKDIR}/${MY_P}-Linux-x86_64"
+ elif use x86; then
+ S="${WORKDIR}/${MY_P}-Linux-i686"
+ fi
+}
src_prepare() {
# bug 501904 - CVE-2014-2029
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index e0b02f2258c4..61a62730e1ed 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,9 +1,6 @@
-DIST HTTP-4000.1.1.tar.gz 59459 SHA256 c3b7f8815f5528c88a41a4d62c4a0586edde644f83ae514f036a1cb35ce97026 SHA512 ae2d28473cb5a17c19979487c3c4620e7bc6937b8ff7477f2ddede8b6d56f85fc41c959b01d4683b30d939ab4a6d3e8d13f2aefd85c26de38f88bd324cfdf439 WHIRLPOOL 1bd58f69fbb9cf927a28d7edeb386932dbec64e16100e5bafe5a212c2dcae07b3ca607c3b2d69f70a62e907a9f3983a23ee23a0a5017faa691403cb3388a07f9
-DIST HTTP-4000.1.2.tar.gz 59835 SHA256 c8725620a1566bcc6ded1304cced716b6d1f6e78da78aa580076671b3bf26ca7 SHA512 41c985d47132ced2e094f24ab0bdfff13f58f6a1dccf78965aec30844d9646e7d3d7526a211ccef0f480f94dc181e51923bcb5900ab3fce14f634b7a05ffee76 WHIRLPOOL 99b7c824416b539b7ec5d3a87712164bd73baa5f4c61efeb75d1801c70aa954b89e79373d5142bbbf3b7cad63579b418bcad8db225a0260db707f661e995d847
DIST HTTP-4000.2.17.tar.gz 69706 SHA256 a9ace28937d95951d3137ee29b87f11d0344bd41794e705ab700f017dcab019c SHA512 0c72f2f78aaa6da64c734f70e1c7e5454d0041eb0354a63b25a534614671df21433c30451ef8a54ed3e303fa105b7d0d998a4a55658933749fc77ec08d6ff8c2 WHIRLPOOL 2de9489702c83287c4ce08a70275793097da36e0b6e21695f8e21b9b7defde7f732b42dd6a67fbfbf8814b023c4cedc902b0d5de5f7867eda65fa56c97940a42
DIST HTTP-4000.2.18.tar.gz 71165 SHA256 93c8228f7521cdd85d0c0521071dafb037e0abbd55dbcb2516a341ded68cc0ca SHA512 3141daa2732bfe013f7f6a8d3017ee9e56d377af5615e1686c42acea9eb52b4b9c2212b3d3550ac2ca72b949b6a7c2abb8fba8f5669fe60fe176dc133ea3fa9b WHIRLPOOL 4713a5e4623d7f31773f4be81a84a3757ce2f1819985710927849fff1edd1b46ab2b8d76c2b7ce96ebd6d25152cc5fe09c6f4c37c81cba20aeb945e9e2beb8f9
DIST HTTP-4000.2.19.tar.gz 71287 SHA256 5ffb97b7a916a70e742d65273e4c7c7b50b281797db11e17e7e02158e343f5fb SHA512 f7133c36a86e71c5a44fea8f7c92b66aa0ce2b1a08121eafaaea6a40e8a00720e2c6130407ed8cbc0085c26a279bc8dc4affddbcf7d7aa93cf05ae9d1efcbb79 WHIRLPOOL 89403d27070d3cc6932d08b7095921eaf124cee239de0c70a77e438de2961f1efbb381ae96c7a389a75234e961826c062cb8f667d2cff1979124fd63f10b406f
-DIST HTTP-4000.2.2.tar.gz 65275 SHA256 709f8d94fbbd538f198e844541dcbb53a3470207bcdeeb62774d17211b4f3963 SHA512 a87ea719cbdb2318627d570ad6ca15cecf0f6342269daaa3b198353fbbaca1b9030c7a40af09b8ebb0359b0c7ac289f981bae5e57debd7b2bc27e72888351a64 WHIRLPOOL a099f3df766280831abd4c62ba0b14a41886c87e0000e4268090a50644d3a894bcc3500e92cd5db7e3a8685078ae351b568ff47dc8d3716cecb48cf590f3676a
DIST HTTP-4000.2.20.tar.gz 71475 SHA256 4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b SHA512 0f5927f0cfbc638c7ebce738c4f7b460b2c0b40f28dc137909c47f05dfea04e975482dcf626425f23f90f131689f1c03d9f8dc7d834e61b9e389a92f6c64f8f0 WHIRLPOOL fdebffd0a3d5b411c52717f964591e8a0b0772094044551656953bc0b4a60c7334a19e6fec62ae312ef15c0db0ae16e11b051dc245081a4b5c3ed4dcc626eea6
DIST HTTP-4000.2.3-test-suite.tar.gz 5117 SHA256 0487674fc7892754931df4e3efffefb9ef492dc8378179be287ea89fb3809ca2 SHA512 2b19171cfdb27d078091e15f9fb7b9ed56c8cc76f8a116216491742749b51e469b313523c49b1e693ee5cb4f9e28302661582649cce7d8d519a2044dbd933163 WHIRLPOOL 8218fae860e50d73524b7b95884324506fb95829cff6656ea46aefe84962252be8187a7bfe460599e3a1257469dd5a72221df24c7fa9ff6708e1ef2cb00a94f8
DIST HTTP-4000.2.3.tar.gz 60708 SHA256 00f59f751a53a0cd766d59cffb3a97fc001189797861ce4aa28d4bea672efafc SHA512 ea958e1dffbc6e12b587874ade27deca1a9451a6fd9887c04659ef63dbbdf489ddb77da3d517c325575349db2bbdd362791adf8221498f0029316df7c4813102 WHIRLPOOL 2563901137673867c1a839aaf23b2c62ddf6c7bdddf50bda290d7da08dfdc5774fdc09298c7f921aa72be60c6023afecd1d4cdecf9a7ed12de7dcb9876c8afd0
diff --git a/dev-haskell/http/http-4000.1.1.ebuild b/dev-haskell/http/http-4000.1.1.ebuild
deleted file mode 100644
index 3c18dcaf830e..000000000000
--- a/dev-haskell/http/http-4000.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="http://projects.haskell.org/http/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl
- dev-haskell/network
- dev-haskell/parsec
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/http/http-4000.1.2.ebuild b/dev-haskell/http/http-4000.1.2.ebuild
deleted file mode 100644
index ff1f72ae45a8..000000000000
--- a/dev-haskell/http/http-4000.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="http://projects.haskell.org/http/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-haskell/mtl[profile?]
- dev-haskell/network[profile?]
- dev-haskell/parsec[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -e 's@base >= 2 && < 4.5@base >= 2 \&\& < 4.6@' \
- -i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
-}
diff --git a/dev-haskell/http/http-4000.2.2.ebuild b/dev-haskell/http/http-4000.2.2.ebuild
deleted file mode 100644
index 3cda7aef8d40..000000000000
--- a/dev-haskell/http/http-4000.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-MY_PN="HTTP"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library for client-side HTTP"
-HOMEPAGE="https://github.com/haskell/HTTP"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="=dev-haskell/mtl-2.0*[profile?]
- dev-haskell/network[profile?]
- dev-haskell/parsec[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/cabal-1.10
- dev-haskell/hunit[profile?]
- dev-haskell/httpd-shed[profile?]
- =dev-haskell/split-0.1*[profile?]
- dev-haskell/test-framework[profile?]
- dev-haskell/test-framework-hunit[profile?]
- )
- "
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- cabal_src_configure $(use test && use_enable test tests) #395351
-}
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
index 673d3066b6fd..fd58019e4412 100644
--- a/dev-haskell/monad-control/Manifest
+++ b/dev-haskell/monad-control/Manifest
@@ -1,4 +1,3 @@
-DIST monad-control-0.2.0.3.tar.gz 13160 SHA256 d00e24e47be81bcf27d44d0d099104ac0e1b7c2b66f3fe84c6f09a9e6994fc7c SHA512 65456f2a8cd97fa5d6499496649199a2f4cfc2ff9aa3635509ac06c87796602237b91932713f94a545c0b1c4f4bc82bf2ad3a6da6b6dff225fa16727162fb170 WHIRLPOOL 2f35e731cca2dca42b057888d58b3b6fa0051f47203a6c2801cebf3d66653cd613b78f3a57570d6237f6d0c2764752495812a2d9b122376038df7815992d5ac0
DIST monad-control-0.3.1.4.tar.gz 10338 SHA256 c17fd5fa094044816ab79158a00fa7a9fd8b35dfea27e1eecc4d4049b3916c57 SHA512 b3acebe09a29c571f8e9ce768dcf314ff5ed761ca786d8053ca427eafbb8e652df11ac00dbb91fb97f45030f70fbfec943783ccf635860f0afe3753ba16ca2fa WHIRLPOOL c2a776f63a07d3aad4d6b0b355e010846c3834e39c13f789493fc3d9f695423c7b02f06dd5d0f622d709ee944e0d81e01e29cfc36b0e9c024db6dc396819c674
DIST monad-control-0.3.2.1.tar.gz 10685 SHA256 4395df5ea2b9278a96d7c8e93c81202b9441ba5fcfbd03b90c7d4ea1c66b8e9f SHA512 adcff15bbcda1cbf28e81bbe03cf6f0f4dd19735194081e88c1f9ba99335f1b275706b61be4af5fe7f234f9f59f6a96276457a7bb1ab7377483588cc320bb252 WHIRLPOOL 0aece4b3e4138e6e091d1695018172e6f571b107b129d9e3d143519cb2bf1689d9b58a099884a74220d70bfd1127faed077f8e09799b8a9549b3374570c53431
DIST monad-control-0.3.2.2.tar.gz 10684 SHA256 acef78a42ec8bb99efda077b36bb1db8f4b6a1d58aa3865cc7b27e0ba6e88cf3 SHA512 4ae7959347a83a781bef6275f4880b53d1c67a9ef5d1bc32c3337797bb991df71c4df71206073a12e46a1512e3290d474a03b0c4ae6496316f41f4248c0c8de9 WHIRLPOOL a6133340bfc8a2f75a524f2d359938578490470fc4dd6c5932626ffd80ea70f2ec9d6f72db1f5624a6028eca6c6f55e3d3dff6a2fd0f0973ecf6c1d57be1c45d
diff --git a/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild b/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild
deleted file mode 100644
index d8482e41bbfd..000000000000
--- a/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.14
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit base haskell-cabal
-
-DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
-HOMEPAGE="https://github.com/basvandijk/monad-control/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="<dev-haskell/base-unicode-symbols-0.3
- =dev-haskell/transformers-0.2*
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.9.2
- test? (
- >=dev-haskell/cabal-1.10
- <dev-haskell/test-framework-0.5
- <dev-haskell/test-framework-hunit-0.3
- )
- "
-
-src_configure() {
- cabal_src_configure $(use_enable test tests) $(cabal_flag test)
-}
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index 2b3de24b24b2..13fbd4a74f69 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -1,4 +1,3 @@
-DIST mtl-2.0.1.0.tar.gz 14124 SHA256 f36be461a0952905b60e750322b20105273f28e3fd99669f8db92240fdbfd2f0 SHA512 8fd6e6f3a3c51f618b78c21234e64f0646e9078f76cebf4c5109e87ec28f00039daf3c79df8e7533239c6ce1ad3f810fc2391f30a7a59397d26d6c57c7fea028 WHIRLPOOL 19495aae1ca9c43f5a56a8834a145b6d1177117d23903b00422eadcbb13790fc905e1d9098d1d0ca2b3afd36850be7f6643c324402e763e2762b575a846b9d7d
DIST mtl-2.1.1.tar.gz 13651 SHA256 9250831796b1678380d915d2953ce94fa466af8d5c92d0c569963f0f0b037a90 SHA512 2bd1d935f1f1ff0967c6b7f6d9f127b7173736a48a7684cfeb03d61c4299d8191636f963b749422d73e2b6fb5e5389d8ac712bda6860162a62282dd33fc4cbe4 WHIRLPOOL fb578e834c8a6d3b33b389a3466c9f2edecd59a70a080f35ee381d492573cb29fd548b3cbeac11ca64e4eb7556c2237adc7f582d70777154729c6802240ff6e6
DIST mtl-2.1.2.tar.gz 13723 SHA256 8c775764333420a4391823f9cb9b640306a262552280ea9bbdd2ca11194a8bef SHA512 ef8043adeb2746c770bebd4683c95c399bdc047c278b619d89230f342d13c33f0a9275c6be399e6da329f385ff209ff537e002b82d5075684202e8703fc5e29d WHIRLPOOL 99ba4725242d9baa0970e3594e041d4b092a56c846ce9c8d38a094dedc9586b444f27b427723fd047b9dbc8cad2fd2506bdc954ff8246c3a4888d688e5ea2478
DIST mtl-2.1.3.1.tar.gz 13955 SHA256 77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6 SHA512 dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62 WHIRLPOOL e9b80692c66765c1cddff0f5e20fea96c0e8ae8d6e17c48abce02cef4970c77efdf5067c9da32434afc32364d3e116b15dc20beaed5b058ae613c8d73dc5322f
diff --git a/dev-haskell/mtl/mtl-2.0.1.0.ebuild b/dev-haskell/mtl/mtl-2.0.1.0.ebuild
deleted file mode 100644
index a8f5124201d1..000000000000
--- a/dev-haskell/mtl/mtl-2.0.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Monad classes, using functional dependencies"
-HOMEPAGE="http://hackage.haskell.org/package/mtl"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="=dev-haskell/transformers-0.2*
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
index e43141953699..318f06253207 100644
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@@ -1,4 +1,3 @@
-DIST transformers-0.2.2.0.tar.gz 17148 SHA256 bf2d197dbcad9cf964f537b926719b41510b286134bc6d4e5385832b7cff6ada SHA512 8b591e78bc5e6f08028fe7cfbcf7898f072d7bf8c6bb67e0df1e1e18f6527440e01d97666ed74953721e30cd4b4c95e4871d14c7d840e83b9265092be6032795 WHIRLPOOL ff876123a0674406bf6124f02a1be98bc07c64d1d260f4c53ee766f6fcd5ee3a0d2f53676d69d0c794e9161088414d938762e9154324301c1f6dec55e7ed3ad7
DIST transformers-0.3.0.0.tar.gz 20087 SHA256 e5aa0c1ec97ad98c389e78f59aca25ab028980a7068a3e585e39564662739591 SHA512 aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93 WHIRLPOOL 8041f32430401e26dd7b6308f95c2ec955c6e69bd6a83a212359a7204328c5a66cfcfdcd8d2984e197d122031f92006d226cf4496f4bf1929b1525daf8affde2
DIST transformers-0.4.1.0.tar.gz 27287 SHA256 8ff3ac94dfe6ab234e2fa7881e7c67e28955f6fde1b9a8c96e561ee40cfa964a SHA512 bf6561e63e9e0108aa34d946f7e8ff4eb3b9a5539779dd064d27406d05997f038570b93fbbdd4bf7a1bbe9144c042ad5b89648896821e8c6527c619d02b074c3 WHIRLPOOL 7d6ea400ec76f4e68192ad7aca806a47a7eacc37a563827796ce80773b3a5ab4f7bc7e24ccd200a55a3dc0dc8fdaf27577fea412d1bfc0e6eb07f07bfb5f79cf
DIST transformers-0.4.2.0.tar.gz 27866 SHA256 79565425178a8e349fc6e100d3def6447b8d9014ba1206fc85f584cadc276628 SHA512 8b508731cbcbb3221ad6afa17b8ddb9b47db29bafe0fc4ee654538e20c2a0551394e8c7591f3b0abc01e02eaec271f44056629f0fbf26fb077c4499af1d6debf WHIRLPOOL 1ac5c892a60377fc132b3963545be2d2b9c3f170f1f144ac4ea9bb3c4edc472b41030ab968e14a193e1601b92a458847fe45f65a0dee5ecb5128acc4b34aa036
diff --git a/dev-haskell/transformers/transformers-0.2.2.0.ebuild b/dev-haskell/transformers/transformers-0.2.2.0.ebuild
deleted file mode 100644
index 754c77ec4dfc..000000000000
--- a/dev-haskell/transformers/transformers-0.2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.5.5"
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
index 0cca6dbf695e..f54eaa7a4dc7 100644
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0/${PV}"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
-RDEPEND=">=dev-lang/ghc-6.10.4:="
+RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/transformers/transformers-0.3.0.0.ebuild b/dev-haskell/transformers/transformers-0.3.0.0.ebuild
deleted file mode 100644
index c059732d50db..000000000000
--- a/dev-haskell/transformers/transformers-0.3.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Concrete functor and monad transformers"
-HOMEPAGE="http://hackage.haskell.org/package/transformers"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..af309973f7a9
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.9.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+src_install() {
+ ant-tasks_src_install
+ java-pkg_register-dependency antlr
+}
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
new file mode 100644
index 000000000000..ef47b3ce2f26
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta components to manipulate core java classes"
+HOMEPAGE="http://commons.apache.org/lang/"
+SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+ test? ( dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+src_install() {
+ java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+ dodoc RELEASE-NOTES.txt || die
+ java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index b6248b7c7644..ef6cb2bbd13b 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
SLOT="2.1"
IUSE=""
diff --git a/dev-java/commons-lang/commons-lang-2.6.ebuild b/dev-java/commons-lang/commons-lang-2.6.ebuild
deleted file mode 100644
index e7c5e719a63f..000000000000
--- a/dev-java/commons-lang/commons-lang-2.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit:0 )"
-RDEPEND=">=virtual/jre-1.4"
-
-LICENSE="Apache-2.0"
-SLOT="2.1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- dodoc RELEASE-NOTES.txt NOTICE.txt || die
- dohtml *.html || die
- use doc && java-pkg_dojavadoc target/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/glassfish-deployment-api/Manifest b/dev-java/glassfish-deployment-api/Manifest
index 493f09a69f36..632ae3722ad2 100644
--- a/dev-java/glassfish-deployment-api/Manifest
+++ b/dev-java/glassfish-deployment-api/Manifest
@@ -1 +1,2 @@
+DIST glassfish-deployment-api-3.1.1.jar 86511 SHA256 e45d07481c68a53b615ad064bdd4612ab08beba443b58147b4122799ca4c2bbf SHA512 9325d44da2258c84b879360fe92314b49c0b3ca7be2dd3b9016bf884e79ed66f9bf3fcec2b99a7b8baf3847e5d15376d10e3013bd4dd0f0cfaaf7859fa83a6ba WHIRLPOOL df7f1dfbcc7d9ecb86bc97f619bce4bffeb1c060d082b5caed8d22b5dd8bc3561c98be375a3e8e97a7f89b78a4ed90af6d49b8e902d508ab81898fe976a0fc40
DIST glassfish-v2ur2-b04-src.zip 39817113 SHA256 b554e618ed8edddd8f77de15a800b7d374edbfe1814196125c1e9ee7634ba388 SHA512 4ddf75ad1b81cfb8fc0b772fc75f9a81d74b6239282770d5da0ed70a7cd8b5fca2fd8c95782a2946ed054b43ee8e17edaf47d79c749e89280131bf1d15b1dcf8 WHIRLPOOL c3796120a85b2e370cb9fced56c166a554cd40ee2278c819ee6fa4eadce325373f1d2369cad77746f6e5b871c075d16adfdc9dbfb1bd20194e0f19e6ef0f0719
diff --git a/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
new file mode 100644
index 000000000000..827d491fe77c
--- /dev/null
+++ b/dev-java/glassfish-deployment-api/glassfish-deployment-api-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="J2EE Application Deployment Specification V.1.2"
+HOMEPAGE="https://glassfish.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/${PV}/javax.enterprise.deploy-${PV}-sources.jar -> ${P}.jar"
+
+LICENSE="|| ( CDDL GPL-2 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=virtual/jdk-1.6"
+
+RDEPEND="
+ >=virtual/jre-1.6"
diff --git a/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch b/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
new file mode 100644
index 000000000000..42828e2a4b8f
--- /dev/null
+++ b/dev-java/gnu-classpath/files/gnu-classpath-0.98-freetype-2.5.3-support.patch
@@ -0,0 +1,32 @@
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2014-03-18 10:35:50.904133661 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-03-18 10:37:03.808131298 +0100
+@@ -42,8 +42,9 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include "jcl.h"
+ #include "gdkfont.h"
+ #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"
+--- ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig 2014-03-18 10:37:12.048131031 +0100
++++ ./native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2014-03-18 10:37:58.416129528 +0100
+@@ -39,10 +39,11 @@
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+ #include <pango/pangofc-font.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/fttypes.h>
+-#include <freetype/tttables.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TYPES_H
++#include FT_TRUETYPE_TABLES_H
+ #include "gdkfont.h"
+ #include "gtkpeer.h"
+ #include "gnu_java_awt_peer_gtk_GdkFontPeer.h" \ No newline at end of file
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild
new file mode 100644
index 000000000000..2dc9217d778f
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 multilib
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0.98"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="alsa debug doc dssi examples gconf +gjdoc gmp gtk gstreamer qt4 xml"
+REQUIRED_USE="doc? ( gjdoc )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ dssi? ( >=media-libs/dssi-0.9 )
+ gconf? ( gnome-base/gconf:2= )
+ gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 )
+ gmp? ( >=dev-libs/gmp-4.2.4:0= )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10.10:0.10=
+ >=media-libs/gst-plugins-base-0.10.10:0.10=
+ x11-libs/gtk+:2=
+ )
+ gtk? (
+ >=x11-libs/gtk+-2.8:2=
+ dev-libs/glib:2=
+ media-libs/freetype:2=
+ >=x11-libs/cairo-1.1.9:=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango
+ )
+ qt4? ( dev-qt/qtgui:4= )
+ xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 )"
+
+DEPEND="app-arch/zip
+ dev-java/eclipse-ecj
+ gtk? (
+ x11-libs/libXrender
+ >=x11-libs/libXtst-1.1.0
+ x11-proto/xproto
+ )
+ >=virtual/jdk-1.5
+ ${RDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+ ${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+java_prepare() {
+ epatch "${FILESDIR}"/${P}-freetype-2.5.3-support.patch
+}
+
+src_configure() {
+ # We require ecj anyway, so force it to avoid problems with bad versions of javac
+ export JAVAC="${EPREFIX}/usr/bin/ecj"
+ export JAVA="${EPREFIX}/usr/bin/java"
+ # build takes care of them itself, duplicate -source -target kills ecj
+ export JAVACFLAGS="-nowarn"
+ # build system is passing -J-Xmx768M which ecj however ignores
+ # this will make the ecj launcher do it (seen case where default was not enough heap)
+ export gjl_java_args="-Xmx768M"
+
+ # don't use econf, because it ends up putting things under /usr, which may
+ # collide with other slots of classpath
+ local myconf
+ if use gjdoc; then
+ local antlr=$(java-pkg_getjar antlr antlr.jar)
+ myconf="--with-antlr-jar=${antlr}"
+ fi
+
+ if use doc; then
+ # Avoid a cyclic dependency on gjdoc by building gjdoc before
+ # the docs. First we need to trick configure. Hack alert!
+ echo -e "#!/bin/sh\necho gjdoc 0.8" > tools/gjdoc.build || die
+ chmod 755 tools/gjdoc.build || die
+ fi
+
+ ANTLR= ./configure \
+ $(use_enable alsa) \
+ $(use_enable debug ) \
+ $(use_enable examples) \
+ $(use_enable gconf gconf-peer) \
+ $(use_enable gjdoc) \
+ $(use_enable gmp) \
+ $(use_enable gtk gtk-peer) \
+ $(use_enable gstreamer gstreamer-peer) \
+ $(use_enable qt4 qt-peer) \
+ $(use_enable xml xmlj) \
+ $(use_enable dssi ) \
+ $(use_with doc gjdoc "${S}/tools/gjdoc.build") \
+ --enable-jni \
+ --disable-dependency-tracking \
+ --disable-plugin \
+ --host=${CHOST} \
+ --prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+ --with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
+ --disable-Werror \
+ ${myconf} || die "configure failed"
+}
+
+src_compile() {
+ if use doc; then
+ # Build gjdoc before the docs. We need to hack the real gjdoc
+ # script to run from the build directory instead.
+ sed -r "s:^(tools_dir=).*:\1${S}/tools:" tools/gjdoc > tools/gjdoc.build || die
+ emake -C lib
+ emake -C tools
+ fi
+
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+ java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
+
+ if use doc; then
+ # Strangely the Makefile doesn't install these.
+ insinto "/usr/${PN}-${SLOT}/share/classpath/api"
+ doins -r doc/api/html/*
+ fi
+}
diff --git a/dev-java/guava/guava-18.0.ebuild b/dev-java/guava/guava-18.0.ebuild
index 12979a4db65a..204ab4fbd7d2 100644
--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$
LICENSE="Apache-2.0"
SLOT="18"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
CDEPEND="
dev-java/javax-inject:0
diff --git a/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild
index 9baf695820c5..3a64550503ae 100644
--- a/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild
+++ b/dev-java/hp-jdk-bin/hp-jdk-bin-1.6.0.05.ebuild
@@ -38,13 +38,13 @@ SRC_URI="
S=${WORKDIR}
-# not for metadata use:
-use hppa-hpux && JDK_DIST=${PA_JDK_DIST}
-use ia64-hpux && JDK_DIST=${IA_JDK_DIST}
-#use hppa64-hpux && JDK_DIST=${PA_JDK_DIST}
-#use ia64w-hpux && JDK_DIST=${IA_JDK_DIST}
-
pkg_nofetch() {
+ # not for metadata use:
+ use hppa-hpux && JDK_DIST=${PA_JDK_DIST}
+ use ia64-hpux && JDK_DIST=${IA_JDK_DIST}
+ #use hppa64-hpux && JDK_DIST=${PA_JDK_DIST}
+ #use ia64w-hpux && JDK_DIST=${IA_JDK_DIST}
+
einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles."
einfo "Please visit"
einfo " ${DOWNLOADPAGE}"
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..ec050ff11460
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${P//-}"
+
+DESCRIPTION="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+CDEPEND=">=dev-lang/tcl-8.4.5:*"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CRDEPEND}
+ >=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ rm -rf src/{Test.java,empty,tests} || die
+ java-pkg-simple_src_compile
+ mv src/jacl/tcl src/ || die
+ java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+ dodoc README ChangeLog known_issues.txt || die
+}
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
new file mode 100644
index 000000000000..5da8d1a232f9
--- /dev/null
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Wrapper for java-config"
+HOMEPAGE="https://www.gentoo.org/proj/en/java"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!<dev-java/java-config-1.3"
+RDEPEND="app-portage/portage-utils"
+
+src_install() {
+ dobin src/shell/* || die
+ dodoc AUTHORS || die
+}
diff --git a/dev-java/javax-inject/javax-inject-1-r1.ebuild b/dev-java/javax-inject/javax-inject-1-r1.ebuild
index 7901434bbabe..221d2b63606a 100644
--- a/dev-java/javax-inject/javax-inject-1-r1.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://atinject.googlecode.com/files/${MY_P}-bundle.jar"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
DEPEND=">=virtual/jdk-1.5
app-arch/unzip"
diff --git a/dev-java/javolution/Manifest b/dev-java/javolution/Manifest
index 494417be587f..a874e4b03176 100644
--- a/dev-java/javolution/Manifest
+++ b/dev-java/javolution/Manifest
@@ -1,4 +1,3 @@
-DIST javolution-2.2.4-src.zip 391698 SHA256 72f117ec3e7d8772c67bb5114596e75edcb0ffb00a3824ed7a2b9516e11e3078 SHA512 9cdc9a97667fa3b112b01b6d8275ae09b4e6d7fbcc7587d4c347072883ba3cc7a4c7e308778a6e4a1bdcaf4d093b081b35f0776d4a9d589d15677bbe02516912 WHIRLPOOL ede988cb048156d65804f78ba65e6152a86dbd2d58e165fdbdc907fa4c2fb30c2c306c1d216760444ca6d23fb7d666492d64ca8c2c5f01feede7497a3386e890
DIST javolution-4.0.2-src.zip 556097 SHA256 fb5256c28b9f1de67e9be2ee3df16ff989f8f7bc4cd33946425f7e19370d4905 SHA512 562e0d364aa6b564341ce197941aaaf51e286712e6b71459ac12eccffbdf1d440f1910826cebf088176562b5dccb865f5d0e652a519814e1357094e253ee2efd WHIRLPOOL 7061f9debc2efe986e7f6d5615c11c5dab5809b3b3fe75daa466577b8d29194ccd71403739a2fe4bca7cdf049c8078577bf6aace555a2e018a023cb3d81ead53
DIST javolution-6.0.0-build.xml.tar.xz 2696 SHA256 2730a3cb2186de011bd1d5349ae151bafd9441c3b584aae1e2429c0774dea04c SHA512 5861e462f24817efec24a784625e240fd4e08117c7b11bf7145f8dae35bb90b0b9fc1e431895ef5d868a1f1d57d96967fd9f39a9b821b51875814f6e118dbdab WHIRLPOOL 69963b313441f8cad2256e62feb2756393aa813bc7cf7589f401eb79fd764f490a737bfa5c4802c2178b92bde51a480b8a1bd2249583042cbabd39d5cfe71f7e
DIST javolution-6.0.0.tar.xz 1308148 SHA256 0af6f9725d0e50ec323a79c8b726ee01a070d860980c080270a853739e41434a SHA512 86a7a19b13b74cca6ab4871e725a1143d6a1401cc7265390ee66b83f8a9b48f7879b8ccc2d7a3d660e523b64e3779eaf372519ee98268f1bf55df1d7b5a7f034 WHIRLPOOL b4bf337dff963b766a2aa0ad8a3a0c37e9569c14c1fe7acd66bff180c68e40294decb06a6d85add09eab486cb967c89c3224cc467d013fde15e180a823890e8c
diff --git a/dev-java/javolution/javolution-2.2.4-r1.ebuild b/dev-java/javolution/javolution-2.2.4-r1.ebuild
deleted file mode 100644
index 183df0c3a6f1..000000000000
--- a/dev-java/javolution/javolution-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-LICENSE="LGPL-2.1"
-SLOT="2.2.4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/javolution-${PV%.*}"
-
-EANT_BUILD_TARGET="init_1.4 compile jar"
-EANT_DOC_TARGET="doc"
-
-src_unpack() {
- unpack ${A}
- java-pkg_filter-compiler jikes
-}
-
-src_install() {
-
- java-pkg_dojar javolution.jar
-
- dodoc doc/coding_standard.txt
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc "${S}/src/javolution"
-
-}
diff --git a/dev-java/javolution/javolution-2.2.4-r2.ebuild b/dev-java/javolution/javolution-2.2.4-r2.ebuild
deleted file mode 100644
index c31d5de6ae18..000000000000
--- a/dev-java/javolution/javolution-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.2.4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/javolution-${PV%.*}"
-
-EANT_BUILD_TARGET="init_1.4 compile jar"
-EANT_DOC_TARGET="doc"
-EANT_FILTER_COMPILER="jikes"
-
-src_install() {
- java-pkg_dojar javolution.jar
-
- dodoc doc/coding_standard.txt
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc "${S}/src/javolution"
-}
diff --git a/dev-java/javolution/javolution-4.0.2-r1.ebuild b/dev-java/javolution/javolution-4.0.2-r1.ebuild
index c8f6382d8308..b4509bc25118 100644
--- a/dev-java/javolution/javolution-4.0.2-r1.ebuild
+++ b/dev-java/javolution/javolution-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ HOMEPAGE="http://javolution.org"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/javolution/javolution-4.0.2.ebuild b/dev-java/javolution/javolution-4.0.2.ebuild
deleted file mode 100644
index 564076264916..000000000000
--- a/dev-java/javolution/javolution-4.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/javolution-${PV%.*}"
-
-EANT_BUILD_TARGET="clean _init_1.5 _compile jar"
-EANT_DOC_TARGET="doc"
-
-src_test() {
- java -jar "${PN}.jar" test || die "test failed"
-}
-
-src_install() {
- java-pkg_dojar "${PN}.jar"
-
- dodoc doc/coding_standard.txt
- dohtml index.html
-
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc "${S}/src/${PN}"
-}
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index eb1e5ecbe992..63bb8da8737a 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI="5"
JAVA_PKG_IUSE="doc source"
@@ -19,14 +19,16 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-COMMON_DEP="dev-java/antlr:0[java]
- >=dev-java/xerces-2.7
- =dev-java/junit-3.8*
+COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0
>=dev-java/log4j-1.2.8:0
+ dev-java/junit:0
dev-java/xmldb:0"
-RDEPEND=">=virtual/jre-1.5
+
+RDEPEND=">=virtual/jre-1.6
+ dev-java/xerces:2
${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+
+DEPEND=">=virtual/jdk-1.6
dev-db/hsqldb:0
${COMMON_DEP}"
@@ -41,7 +43,6 @@ java_prepare() {
java-pkg_jarfrom antlr
java-pkg_jarfrom junit
java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
- java-pkg_jarfrom xerces-2
java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
@@ -76,13 +77,17 @@ src_compile() {
}
src_install() {
+ # Not entirely optional but this avoids a warning at build time and
+ # RDEPEND will enforce its presence anyway.
+ java-pkg_register-optional-dependency xerces-2
+
pushd dist > /dev/null
for jar in *.jar; do
java-pkg_newjar ${jar} ${jar/-${PV}/}
done
popd > /dev/null
- dodoc NOTICE || die
+ dodoc NOTICE
if use doc; then
java-pkg_dojavadoc dist/doc/api
diff --git a/dev-java/jcommon/Manifest b/dev-java/jcommon/Manifest
index c648bf84e2c6..19b7cb50fb73 100644
--- a/dev-java/jcommon/Manifest
+++ b/dev-java/jcommon/Manifest
@@ -1,2 +1 @@
-DIST jcommon-1.0.18.tar.gz 1133961 SHA256 a4daf9ed40712bfe9564dcd6eb8392711325aec78fa7c03e57c195f63413e3fd SHA512 83a4dfe7c7f631ee251cd1c133726060d8d380366ba0b39b043327c20e8128fd882b7374448738dcad3e1b6eadc0221242588c15c6feaa3c06101beafe2e79bb WHIRLPOOL cae9c1ff0d3658199378baf2ce58d25710aac17b7bca4d5e31136133868ebb41c6a71fd384a3ba1da2e800d364dd0bf5e70ef768148bbb56d440c78b8fe1e6d4
DIST jcommon-1.0.23.zip 1373666 SHA256 6351512b94fc2228034a5c43da52d9ef8ecb7781dcecdeba733441de7d7e18f1 SHA512 c358239da8b1ddf53ce94bebb00b6518456aa921dd3aa84fc6a23144d499f14a85ba421cd71f3880e8d10153a6ab816f54c1fa872a4ab694ce3c7b8d69bc2a4b WHIRLPOOL 467d7400a7009c38b86041977dd59f8a309f7a8ecf02226b80112d12aa3d472c9a42a9cc3e5620b64b0333d44f497f85d95a2184603df9eb21ad66a51ca7fa6c
diff --git a/dev-java/jcommon/jcommon-1.0.18.ebuild b/dev-java/jcommon/jcommon-1.0.18.ebuild
deleted file mode 100644
index c209a85a505e..000000000000
--- a/dev-java/jcommon/jcommon-1.0.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_P=${PN}-$(replace_version_separator 3 -)
-DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
-HOMEPAGE="http://www.jfree.org/jcommon"
-SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- >=virtual/jdk-1.4"
-DEPEND="
- >=virtual/jdk-1.4
- test? ( dev-java/junit:4 )"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
- find "${WORKDIR}" -name '*.jar' -print -delete || die
-}
-
-src_compile() {
- if ! use debug; then
- antflags="-Dbuild.debug=false -Dbuild.optimize=true"
- fi
- eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_test() {
- java-pkg_jar-from --into lib junit-4
- eant -f ant/build.xml compile-junit-tests
- ejunit4 -cp "./lib/jcommon-${PV}-junit.jar:$(java-pkg_getjars junit-4)" \
- org.jfree.junit.JCommonTestSuite
-}
-
-src_install() {
- java-pkg_newjar ${P}.jar ${PN}.jar
- dodoc README.txt
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc source/com source/org
-}
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
index 827b3f1788aa..592fe937423d 100644
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
LICENSE="LGPL-2"
SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
index e8bf7be54d6f..85fa811adcc6 100644
--- a/dev-java/jettison/Manifest
+++ b/dev-java/jettison/Manifest
@@ -1,2 +1 @@
-DIST jettison-1.0-sources.jar 54344 SHA256 4e52b63e8c84718ed6e7ab75618825e970df3169fb999f38ea54ea8a8d88e23b SHA512 f5eacfd15e43de61462413c6e7fde713c7baf632e26cd1c686818c9b992ac6734e4813ec5ad0ba6810e66bdd59d4007c73ad132e15c1ca0ae23a328916aa645c WHIRLPOOL a8fda2a165e06e39f87b7b6b8587f421451ca66334852844d81eb9c25cbe8d47a323fd2a6aee2a24d119fd35ed66fa5d815f0e8985681da23f8f6bacf08f00c0
DIST jettison-1.3.7.tar.gz 63200 SHA256 0fdf66e0607cc3ea130b4072d4f2b03dfa6e71248069c5232fea6deebb77b065 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4 WHIRLPOOL 638fe310d82cbc2daa3e655e0c3ac7e4ac912e7827d94fac8ba93da8ba231d18b53afc86a39896c724bfd16142c714bfd4e4ed8044a3bf624d4737ad1715cb03
diff --git a/dev-java/jettison/files/build.xml b/dev-java/jettison/files/build.xml
deleted file mode 100644
index b6b95dff7a2a..000000000000
--- a/dev-java/jettison/files/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="jettison" default="jar" basedir=".">
- <!-- some properties -->
- <property name="src.dir" value="org/codehaus/jettison" />
- <property name="build.dir" value="build" />
- <property name="docs.dir" value="docs" />
- <property name="lib.dir" value="lib"/>
- <property name="dist.dir" value="dist" />
- <property name="jarfile" value="${dist.dir}/jettison.jar" />
- <property name="pkg" value="${package.name}"/>
- <property name="target.jdk" value="1.5" />
-
-
- <available file="${lib}" type="dir" property="libdir.exists"/>
-
-
- <!-- init -->
- <target name="init">
- <tstamp/>
- <mkdir dir="${dist.dir}" />
- <mkdir dir="${build.dir}" />
- <mkdir dir="${docs.dir}" />
- </target>
-
- <!-- compile everything -->
- <target name="compile" depends="init">
- <mkdir dir="${build.dir}" />
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- source="${target.jdk}"
- target="${target.jdk}"
- classpath="${gentoo.classpath}">
- </javac>
- </target>
-
- <!-- build the jar file -->
- <target name="jar" depends="compile">
- <jar jarfile="${jarfile}" basedir="${build.dir}" />
- </target>
-
- <!-- generate javadocs -->
- <target name="javadoc" depends="compile">
- <javadoc packagenames="org.*"
- sourcepath="${src.dir}"
- defaultexcludes="yes"
- destdir="./${docs.dir}"
- author="true"
- version="true"
- use="true"
- windowtitle="${ant.project.name} API" >
- <fileset dir="${src.dir}"/>
- </javadoc>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${docs.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
-</project>
diff --git a/dev-java/jettison/jettison-1.0.ebuild b/dev-java/jettison/jettison-1.0.ebuild
deleted file mode 100644
index e526e90468b0..000000000000
--- a/dev-java/jettison/jettison-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A JSON StAX implementation"
-HOMEPAGE="http://jettison.codehaus.org/"
-SRC_URI="http://repository.codehaus.org/org/codehaus/${PN}/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-IUSE=""
-
-COMMON_DEP="java-virtuals/jaxp-virtual"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-#Don't need to make one
-S="${WORKDIR}"
-
-src_prepare(){
- #no supplied Build file
- cp -v "${FILESDIR}"/build.xml "${S}/build.xml" || die
-}
-
-EANT_GENTOO_CLASSPATH="jaxp-virtual"
-
-src_install() {
- java-pkg_dojar dist/"${PN}.jar"
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index 01b414bcdba2..15bbbb51b4c1 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.7.ebuild
@@ -3,7 +3,6 @@
# $Id$
EAPI=5
-
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
@@ -13,7 +12,7 @@ HOMEPAGE="https://github.com/codehaus/jettison"
SRC_URI="https://github.com/codehaus/${PN}/archive/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index 7c0cd27b6cb3..1faed668633a 100644
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,3 +1 @@
-DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175 SHA512 6b4e2079fa4eb4cebec709a95e7b1bff4d7233dbdd26c7e3173e75fc29facc9accc64039a62e5d89c83c3aedbd9cd9bc42d5de79f77de08d7027dba8ba9a4d68 WHIRLPOOL 0dbf55f4b53687eb31116c9ba6ab556296a7f915ffc859ddda739ca2bf633e31da6c692289a08859a315e7cb53e571c54fa117d666ed9ca3f789c891597444b6
-DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d
DIST jfreechart-1.0.19.zip 8050676 SHA256 bfe8d38fd48250dc04a3ff1aff477f2d226f49ba1ec2732ded981a3fccfc66f2 SHA512 6345e6a6b4a82862f3908794efb70a6f5413f313ba5bcff1dfb713d21948034d80c743a0cea61be81921c62736b07209ed4b942fedca0c76226b1202a4596b31 WHIRLPOOL 69a5d4c1851fd613a70cdc49904671f22cd7edd25b956c67cdcda5f5960228bfa0932907f0f4432685d4310851ffcd4e1e7283d2f2187a06666b296e84606cc0
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
deleted file mode 100644
index 8665a15aa0e2..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.13-build.xml.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur jfreechart-1.0.13/ant/build.xml jfreechart-1.0.13_patched/ant/build.xml
---- jfreechart-1.0.13/ant/build.xml 2009-04-20 11:23:40.000000000 +0300
-+++ jfreechart-1.0.13_patched/ant/build.xml 2009-05-11 23:36:27.000000000 +0300
-@@ -40,11 +40,9 @@
- <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
- <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
- <path id="build.classpath">
-- <fileset dir="${basedir}/lib/">
-- <include name="${jcommon.name}-${jcommon.version}.jar"/>
-- <include name="servlet.jar"/>
-- <include name="gnujaxp.jar" unless="JDK1.4+"/>
-- </fileset>
-+ <pathelement location="${jcommon.jar}"/>
-+ <pathelement location="${servlet.jar}"/>
-+ <pathelement location="${gnujaxp.jar}"/>
- </path>
-
- </target>
-@@ -324,7 +322,7 @@
-
- <!-- COMPILE THE JUNIT TESTS. -->
- <target name="compile-tests"
-- depends="compile,compile-experimental"
-+ depends="initialise"
- description="Compile the test code">
-
- <mkdir dir="${basedir}/build-tests"/>
-@@ -338,8 +336,8 @@
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${junit.jar}"/>
-- <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
-- <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-+ <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
-+ <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
- <pathelement location="${basedir}/build-tests"/>
- </classpath>
- </javac>
-@@ -357,7 +355,7 @@
- <junit printSummary="yes"
- haltonerror="true"
- haltonfailure="true"
-- fork="true"
-+ fork="false"
- dir=".">
-
- <sysproperty key="basedir" value="."/>
-@@ -365,8 +363,8 @@
- <classpath>
- <path refid="build.classpath"/>
- <pathelement location="${junit.jar}"/>
-- <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
-- <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
-+ <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
-+ <pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
- <pathelement location="${basedir}/build-tests"/>
- </classpath>
- <batchtest todir="${basedir}/build-tests-reports">
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
deleted file mode 100644
index f07e5be5df41..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/ant/build.xml 2011-11-20 22:40:13.000000000 +0100
-+++ b/ant/build.xml 2013-03-09 14:10:53.987970148 +0100
-@@ -40,11 +40,9 @@
- <available classname="java.lang.Annotation" property="src.version" value="1.5"/>
- <available classname="java.lang.Annotation" property="target.version" value="1.5"/>
- <path id="build.classpath">
-- <fileset dir="${basedir}/lib/">
-- <include name="${jcommon.name}-${jcommon.version}.jar"/>
-- <include name="servlet.jar"/>
-- <include name="gnujaxp.jar" unless="JDK1.4+"/>
-- </fileset>
-+ <pathelement location="${jcommon.jar}"/>
-+ <pathelement location="${servlet.jar}"/>
-+ <pathelement location="${gnujaxp.jar}"/>
- </path>
-
- </target>
-@@ -321,7 +319,7 @@
-
- <!-- COMPILE THE JUNIT TESTS. -->
- <target name="compile-tests"
-- depends="compile,compile-experimental"
-+ depends="initialise"
- description="Compile the test code">
-
- <mkdir dir="${basedir}/build-tests"/>
-@@ -354,7 +352,7 @@
- <junit printSummary="yes"
- haltonerror="true"
- haltonfailure="true"
-- fork="true"
-+ fork="false"
- dir=".">
-
- <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
deleted file mode 100644
index b932d863bf83..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java 2011-11-20 22:40:13.000000000 +0100
-+++ b/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java 2013-05-21 00:18:03.840041846 +0200
-@@ -339,6 +339,10 @@
- * java.util.List, boolean)} method.
- */
- public void testFindDomainBounds() {
-+ // store the current time zone
-+ TimeZone saved = TimeZone.getDefault();
-+ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
-+
- TimeSeriesCollection dataset = new TimeSeriesCollection();
- List visibleSeriesKeys = new java.util.ArrayList();
- Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys,
-@@ -351,10 +355,6 @@
- r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
- assertNull(r);
-
-- // store the current time zone
-- TimeZone saved = TimeZone.getDefault();
-- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
--
- s1.add(new Year(2008), 8.0);
- r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true);
- assertEquals(1199142000000.0, r.getLowerBound(), EPSILON);
diff --git a/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
deleted file mode 100644
index cf4c9ada537f..000000000000
--- a/dev-java/jfreechart/files/jfreechart-1.0.4-build.xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ant/build.xml.original 2007-02-09 23:44:42.000000000 +0100
-+++ ant/build.xml 2007-02-09 23:45:01.000000000 +0100
-@@ -338,7 +338,7 @@
- <junit printSummary="yes"
- haltonerror="true"
- haltonfailure="true"
-- fork="true"
-+ fork="false"
- dir=".">
-
- <sysproperty key="basedir" value="."/>
diff --git a/dev-java/jfreechart/jfreechart-1.0.13.ebuild b/dev-java/jfreechart/jfreechart-1.0.13.ebuild
deleted file mode 100644
index b2e51e4ff9a8..000000000000
--- a/dev-java/jfreechart/jfreechart-1.0.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeChart is a free Java class library for generating charts"
-HOMEPAGE="http://www.jfree.org/jfreechart"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-COMMON_DEPEND="
- >=dev-java/itext-1.4.6:0
- dev-java/jcommon:1.0
- java-virtuals/servlet-api:2.3"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}
- test? ( dev-java/ant-junit:0 )"
-RDEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-build.xml.patch"
-
- rm -v *.jar lib/*.jar || die
-}
-
-src_compile() {
- # Note that compile-experimental depends on compile so it is sufficient to run
- # just compile-experimental
- eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
-}
-
-src_test() {
- # X11 tests are disabled using java.awt.headless=true
- ANT_TASKS="ant-junit" \
- ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
- eant -f ant/build.xml test $(get_jars)
-}
-
-src_install() {
- java-pkg_newjar lib/${P}.jar ${PN}.jar
- java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
- dodoc README.txt ChangeLog NEWS || die
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc source/org
-}
-
-get_jars() {
- local antflags="
- -Ditext.jar=$(java-pkg_getjar itext iText.jar) \
- -Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar) \
- -Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
- use test && antflags="${antflags} \
- -Djunit.jar=$(java-pkg_getjars --build-only junit)"
- echo "${antflags}"
-}
diff --git a/dev-java/jfreechart/jfreechart-1.0.14.ebuild b/dev-java/jfreechart/jfreechart-1.0.14.ebuild
deleted file mode 100644
index 360f185d4333..000000000000
--- a/dev-java/jfreechart/jfreechart-1.0.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeChart is a free Java class library for generating charts"
-HOMEPAGE="http://www.jfree.org/jfreechart"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="+servlet test"
-
-COMMON_DEPEND="
- >=dev-java/itext-2.1.5:0
- >=dev-java/jcommon-1.0.17:1.0
- servlet? ( java-virtuals/servlet-api:2.3 )"
-
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}
- test? ( dev-java/ant-junit:0 )"
-
-RDEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-build.xml.patch"
-
- # Fix test failure, obtained from
- # http://sourceforge.net/p/jfreechart/bugs/1100/
- epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch"
-
- rm -v *.jar lib/*.jar || die
-
- if ! use servlet; then
- rm -rf source/org/jfree/chart/servlet || die
- fi
-}
-
-src_compile() {
- # Note that compile-experimental depends on compile so it is sufficient to run
- # just compile-experimental
- eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars)
-}
-
-src_test() {
- # X11 tests are disabled using java.awt.headless=true
- ANT_TASKS="ant-junit" \
- ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \
- eant -f ant/build.xml test $(get_jars)
-}
-
-src_install() {
- java-pkg_newjar lib/${P}.jar ${PN}.jar
- java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar
-
- dodoc README.txt ChangeLog NEWS
-
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc source/org
-}
-
-get_jars() {
- local antflags="
- -Ditext.jar=$(java-pkg_getjar itext iText.jar) \
- -Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)"
-
- use servlet && antflags="${antflags} \
- -Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)"
-
- use test && antflags="${antflags} \
- -Djunit.jar=$(java-pkg_getjars --build-only junit)"
-
- echo "${antflags}"
-}
diff --git a/dev-java/jfreechart/jfreechart-1.0.19.ebuild b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
index 01e0668935b7..7317a59125e2 100644
--- a/dev-java/jfreechart/jfreechart-1.0.19.ebuild
+++ b/dev-java/jfreechart/jfreechart-1.0.19.ebuild
@@ -3,7 +3,6 @@
# $Id$
EAPI=5
-
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -14,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
LICENSE="LGPL-2.1"
SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="+servlet test"
CDEPEND=">=dev-java/jcommon-1.0.23:1.0
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index ea0116cb082d..ec538dabb3ab 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
LICENSE="GPL-3"
SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug"
-DEPEND=">=virtual/jdk-1.7
+DEPEND=">=virtual/jdk-1.6
app-arch/unzip"
-RDEPEND=">=virtual/jre-1.7"
+RDEPEND=">=virtual/jre-1.6"
java_prepare() {
find "${WORKDIR}" -name '*.jar' -print -delete || die
diff --git a/dev-java/jfreesvg/jfreesvg-3.0.ebuild b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
index 527cda860757..30dcdd289f1f 100644
--- a/dev-java/jfreesvg/jfreesvg-3.0.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
LICENSE="GPL-3"
SLOT="3.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/jsap/Manifest b/dev-java/jsap/Manifest
index 03b03845a2dd..69c43cc08af9 100644
--- a/dev-java/jsap/Manifest
+++ b/dev-java/jsap/Manifest
@@ -1 +1,2 @@
DIST JSAP-2.1-src.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
+DIST jsap-2.1.tar.gz 1281840 SHA256 5146bf75cba18fdf9299462a4127e95919c884494aaf3ed023cb2950217a0862 SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352 WHIRLPOOL aecdc479d5d088429ca10a24a90b8aefc849ff7eef03276e9c2667a28420a2fefcf6d6541b1eee5d8c7891c3aa2c7392dc9e943084aaeac86bcc48d4a4d1dc78
diff --git a/dev-java/jsap/jsap-2.1-r1.ebuild b/dev-java/jsap/jsap-2.1-r1.ebuild
new file mode 100644
index 000000000000..ef61eb8e2ff9
--- /dev/null
+++ b/dev-java/jsap/jsap-2.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="JSAP"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Java Simple Arguments Parser (JSAP)"
+HOMEPAGE="http://sourceforge.net/projects/jsap"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+CDEPEND="
+ dev-java/xstream:0
+ dev-java/ant-core:0"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_BUILD_TARGET="jar"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_ANT_TASKS="rundoc snip"
+EANT_BUILD_TEST="test"
+EANT_GENTOO_CLASSPATH="
+ ant-core
+ xstream
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+PATCHES=(
+ "${FILESDIR}/${P}-build.xml.patch"
+)
+
+java_prepare() {
+ java-pkg_clean
+ epatch "${PATCHES[@]}"
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "dist/${MY_P}.jar"
+
+ if use doc; then
+ dohtml doc/*.html
+ java-pkg_dojavadoc doc/javadoc
+ dosym /usr/share/doc/${PF}/html/api /usr/share/doc/${PF}/html/javadoc
+ fi
+
+ use source && java-pkg_dosrc src/java/com
+}
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 6e33966cff63..1324c46043d8 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.json.org/java/"
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 x86"
+IUSE=""
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
new file mode 100644
index 000000000000..a6b5a3438e89
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.0.2-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+ https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+ http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+ http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+ http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+ http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+ http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+ http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+ http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+ http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+ http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+ http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+ http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+ http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+ http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+ http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+ http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+ http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+ http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+ http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+ http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+ http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+ http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+ http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+ http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+ http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+ http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+ http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+ http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+ http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+ http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+ http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+ http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+ http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+ ~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-ide-${PV}
+ ~dev-java/netbeans-java-${PV}
+ ~dev-java/netbeans-profiler-${PV}
+ ~dev-java/netbeans-platform-${PV}
+ ~dev-java/netbeans-webcommon-${PV}
+ ~dev-java/netbeans-websvccommon-${PV}
+ dev-java/commons-codec:0
+ dev-java/commons-fileupload:0
+ dev-java/commons-logging:0
+ dev-java/glassfish-deployment-api:1.2"
+DEPEND="virtual/jdk:1.7
+ app-arch/unzip
+ ${CDEPEND}
+ dev-java/javahelp:0
+ dev-java/jsr181:0
+ >=dev-java/junit-4.4:4
+ dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+ ${CDEPEND}
+ dev-java/antlr:0[java(+)]
+ dev-java/bsf:2.3
+ dev-java/commons-beanutils:1.7
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-io:1
+ dev-java/commons-validator:0
+ dev-java/jakarta-oro:2.0"
+# dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-8.0.2-build.xml.patch.bz2
+
+ pushd "${S}" >/dev/null || die
+ ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+ ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+ ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+ ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+ ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+ ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+ ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+ ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+ ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+ ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+ ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+ ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+ ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+ ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+ ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+ ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+ ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+ ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+ ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+ ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+ ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+ ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+ ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+ ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+ ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+ ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+ ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+ ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+ ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+ ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+ ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+ ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+ popd >/dev/null || die
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-8.0.2-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+ if [ -n "${files}" ] ; then
+ einfo "Applying custom patches:"
+
+ for file in ${files} ; do
+ epatch "${file}"
+ done
+ fi
+ fi
+
+ einfo "Symlinking external libraries..."
+ java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+ java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+ java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+ java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+ java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+ java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+ java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+ java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+ einfo "Linking in other clusters..."
+ mkdir "${S}"/nbbuild/netbeans || die
+ pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+ ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+ cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.extide.built
+
+ ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+ cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.harness.built
+
+ ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+ cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.ide.built
+
+ ln -s /usr/share/netbeans-java-${SLOT} java || die
+ cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.java.built
+
+ ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+ cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.profiler.built
+
+ ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+ cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.platform.built
+
+ ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+ cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.webcommon.built
+
+ ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+ cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.websvccommon.built
+
+ popd >/dev/null || die
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+ insinto ${INSTALL_DIR}
+
+ grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+ doins -r *
+
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+ rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+ rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+ rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+ rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+ rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/struts
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+ rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+ rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+ rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+ rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+ rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+ rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+ rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+ rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+ popd >/dev/null || die
+
+ dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
index ff199a1e8820..c5d9d28f3643 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.1-r1.ebuild
@@ -68,7 +68,7 @@ DEPEND=">=virtual/jdk-1.7
dev-java/tomcat-servlet-api:2.3"
RDEPEND=">=virtual/jdk-1.7
${CDEPEND}
- dev-java/antlr:0[java]
+ dev-java/antlr:0[java(+)]
dev-java/bsf:2.3
dev-java/cglib:3
dev-java/commons-beanutils:1.7
diff --git a/dev-java/netbeans-java/netbeans-java-8.0.2-r3.ebuild b/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild
index 05ccb68df1ce..af538c775485 100644
--- a/dev-java/netbeans-java/netbeans-java-8.0.2-r3.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.0.2-r4.ebuild
@@ -56,7 +56,7 @@ DEPEND="virtual/jdk:1.7
RDEPEND=">=virtual/jdk-1.7
${CDEPEND}
dev-java/absolutelayout:0
- dev-java/antlr:0[java]
+ dev-java/antlr:0[java(+)]
dev-java/c3p0:0
dev-java/commons-collections:0
dev-java/dom4j:1
diff --git a/dev-java/netbeans-java/netbeans-java-8.1.ebuild b/dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild
index 9f47ec14e018..d8e8daa47e32 100644
--- a/dev-java/netbeans-java/netbeans-java-8.1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.1-r1.ebuild
@@ -59,7 +59,7 @@ DEPEND=">=virtual/jdk-1.7
RDEPEND=">=virtual/jdk-1.7
${CDEPEND}
dev-java/absolutelayout:0
- dev-java/antlr:0[java]
+ dev-java/antlr:0[java(+)]
dev-java/c3p0:0
dev-java/commons-cli:1
dev-java/commons-collections:0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b49cd5ace2fc..489380cd1446 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,5 +12,6 @@ DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acf
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.30.ebuild
new file mode 100644
index 000000000000..1c1c74f6bb49
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.30.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
index 709ed3e0219d..7a8d9b9e4cf5 100644
--- a/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r3.ebuild
+++ b/dev-java/werken-xpath/werken-xpath-0.9.4_beta-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
COMMON_DEP="
dev-java/jdom:0
- >=dev-java/antlr-2.7.7:0[java]"
+ >=dev-java/antlr-2.7.7-r7:0"
DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.4
@@ -42,13 +42,11 @@ java_prepare() {
epatch "${FILESDIR}"/${P}-jpp-tests.patch
epatch "${FILESDIR}"/${P}-gentoo.patch
- # API updates to support jdom:1.0
+ # API updates to support jdom-1
epatch "${FILESDIR}"/${P}-jdom-1.0.patch
- cd "${S}"/lib
- # In here we have ant starter scripts
- rm -fr bin
- rm -f *.jar
+ java-pkg_clean
+ rm -rv lib/bin || die
}
src_install() {
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index c3da5116a115..9e23c721e85d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,8 +1,10 @@
DIST Python-2.7.10.tar.xz 12250696 SHA256 1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 SHA512 67615a6defbcda062f15a09f9dd3b9441afd01a8cc3255e5bc45b925378a0ddc38d468b7701176f6cc153ec52a4f21671b433780d9bde343aa9b9c1b2ae29feb WHIRLPOOL 3a9dcfc55b107dc55ad0ae93fb24a11eab7d4d9b4cfbe6b6830a090b6e5f71bb2ac91526b89c6f3e4f2610fa1a2cc4e82b58a83c599aa71f94894c74181b504b
+DIST Python-2.7.11.tar.xz 12277476 SHA256 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 SHA512 72166763a2fe6aab45ecf378f55a1efc7322d1742c4638bae84f4ed4b9fb4c01f2a0293733c64426ae2c70df24d95ff2b1e2a4f3c2715de00d8f320d4d939ea0 WHIRLPOOL 7ebcff7a2fe775a21a3847dee10369b73aaea8685eb63b4bc33dab0f562b8fb984c398cb34e8158cf1e24f106002829649540aad30a5ec7f4de0018ce7449f69
DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550 WHIRLPOOL f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8
DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3
DIST Python-3.5.0.tar.xz 14808460 SHA256 d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91 SHA512 f06bd652484aa89371021d0f9fcb08e6e905e90b39ae065d7df75b367e66b7ea43a818ca33ce04aa3d6746b5e8b1b83e90b709ac2203324fb7a595c1017be149 WHIRLPOOL aef3970297911324537e4e1e9d0e179c925bf51fea9d6a6413a08e3f349fd244d834e6fe732e9120669b762c302b47f821de170ce083d2cc39b7e35f51fdd1f0
DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
+DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e
DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1
DIST python-gentoo-patches-3.5.0-0.tar.xz 11872 SHA256 8d1830aee5f7e019250447ee084203e26143bdf47c95435861e3e0eda5106eb6 SHA512 d7b6c7fdfdea9d7577b14febf2e4680839908a8eba05f3bc17e71f2fe4c360816a8126de5fa69cfba6930be9793bf1b9cafcde2ae621c1150cb9f1ffecc4a3d4 WHIRLPOOL 01202442c789cd9f54748ec80f9c5b1d2728c5df876a2c8fa417c3078a6e9cc55103ee07fce76f402b15afe1625c5b0497734dc4b601fb304e75bf652ce2f058
diff --git a/dev-lang/python/python-2.7.11.ebuild b/dev-lang/python/python-2.7.11.ebuild
new file mode 100644
index 000000000000..e6120b523100
--- /dev/null
+++ b/dev-lang/python/python-2.7.11.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.11-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~djc/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+ >=sys-libs/zlib-1.1.3:0=
+ virtual/libffi
+ virtual/libintl
+ berkdb? ( || (
+ sys-libs/db:5.3
+ sys-libs/db:5.2
+ sys-libs/db:5.1
+ sys-libs/db:5.0
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5
+ sys-libs/db:4.4
+ sys-libs/db:4.3
+ sys-libs/db:4.2
+ ) )
+ gdbm? ( sys-libs/gdbm:0=[berkdb] )
+ ncurses? (
+ >=sys-libs/ncurses-5.2:0=
+ readline? ( >=sys-libs/readline-4.1:0= )
+ )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ tk? (
+ >=dev-lang/tcl-8.0:0=
+ >=dev-lang/tk-8.0:0=
+ dev-tcltk/blt:0=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1 )
+ !!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/autoconf-2.65
+ !sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+ doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+ app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use berkdb; then
+ ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+ ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+ ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+ ewarn "is provided by dev-python/bsddb3."
+ else
+ if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+ ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+ ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+ ewarn "You might need to migrate your databases."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -r Modules/expat || die
+ rm -r Modules/_ctypes/libffi* || die
+ rm -r Modules/zlib || die
+
+ if tc-is-cross-compiler; then
+ local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+ fi
+
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+ # Fix for cross-compiling.
+ epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+ epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+ epatch "${FILESDIR}/python-2.7.10-cross-compile-warn-test.patch"
+ epatch "${FILESDIR}/python-2.7.10-system-libffi.patch"
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ Lib/distutils/command/install.py \
+ Lib/distutils/sysconfig.py \
+ Lib/site.py \
+ Lib/sysconfig.py \
+ Lib/test/test_site.py \
+ Makefile.pre.in \
+ Modules/Setup.dist \
+ Modules/getpath.c \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ epatch_user
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbm module can be linked against berkdb or gdbm.
+ # Defaults to gdbm when both are enabled, #204343.
+ local disable
+ use berkdb || use gdbm || disable+=" dbm"
+ use berkdb || disable+=" _bsddb"
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ if tc-is-cross-compiler; then
+ # Force some tests that try to poke fs paths.
+ export ac_cv_file__dev_ptc=no
+ export ac_cv_file__dev_ptmx=yes
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+ tc-export CXX
+ # The configure script fails to use pkg-config correctly.
+ # http://bugs.python.org/issue15506
+ export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+ # Set LDFLAGS so we link modules with -lpython2.7 correctly.
+ # Needed on FreeBSD unless Python 2.7 is already installed.
+ # Please query BSD team before removing this!
+ append-ldflags "-L."
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+ if use berkdb; then
+ dbmliborder+="${dbmliborder:+:}bdb"
+ fi
+
+ BUILD_DIR="${WORKDIR}/${CHOST}"
+ mkdir -p "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ ECONF_SOURCE="${S}" OPT="" \
+ econf \
+ --with-fpectl \
+ --enable-shared \
+ $(use_enable ipv6) \
+ $(use_with threads) \
+ $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+ --infodir='${prefix}/share/info' \
+ --mandir='${prefix}/share/man' \
+ --with-computed-gotos \
+ --with-dbmliborder="${dbmliborder}" \
+ --with-libc="" \
+ --enable-loadable-sqlite-extensions \
+ --with-system-expat \
+ --with-system-ffi \
+ --without-ensurepip
+
+ if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Avoid invoking pgen for cross-compiles.
+ touch Include/graminit.h Python/graminit.c
+
+ cd "${BUILD_DIR}" || die
+ emake
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax_kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ cd "${BUILD_DIR}" || die
+
+ # Skip failing tests.
+ local skipped_tests="distutils gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # Rerun failed tests in verbose mode (regrtest -w).
+ emake test EXTRATESTOPTS="-w" < /dev/tty
+ local result="$?"
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+ elog "and run the tests separately."
+
+ if [[ "${result}" -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+ cd "${BUILD_DIR}" || die
+ emake DESTDIR="${D}" altinstall
+
+ sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+ mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+ mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+ rm -f "${ED}usr/bin/smtpd.py"
+
+ use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+ use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+ use threads || rm -r "${libdir}/multiprocessing" || die
+ use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${S}"/Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${SLOT}:" \
+ -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+ # for python-exec
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+ else
+ vars=( PYTHON "${vars[@]}" )
+ fi
+
+ python_export "python${SLOT}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${SLOT%.*}
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/python${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" \
+ "${D}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ ln -s "../../../bin/python${SLOT}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" \
+ "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${SLOT}" \
+ "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+ python_updater_warning="1"
+ fi
+}
+
+eselect_python_update() {
+ if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+ eselect python update
+ fi
+
+ if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+ eselect python update --python${PV%%.*}
+ fi
+}
+
+pkg_postinst() {
+ eselect_python_update
+
+ if [[ "${python_updater_warning}" == "1" ]]; then
+ ewarn "You have just upgraded from an older version of Python."
+ ewarn "You should switch active version of Python ${PV%%.*} and run"
+ ewarn "'python-updater [options]' to rebuild Python modules."
+ fi
+}
+
+pkg_postrm() {
+ eselect_python_update
+}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 8ef159dd96fd..257d9c69a282 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1 +1,2 @@
DIST libbsd-0.7.0.tar.xz 322908 SHA256 0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb SHA512 2c4c8fb2ae7fb5e5aab90f7a59a679220922dfeeaf0d54f80976914fcd507171bb9359f0837c32499e63a0f3e9342c9dcd387a466b359d20e3790ddc8ca17cea WHIRLPOOL 06083651f5678362d3422f96e59d30d8010493f9d1c8c43a94f7ab310daead491c70bce7838cc8302cb448e4a8fa99c7456f0ba9a3b411b292829ba949712b59
+DIST libbsd-0.8.0.tar.xz 342016 SHA256 fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c SHA512 a2235cde4d24ce55b0ad16eb12b421c3b35ea5ca35cd8dbf25dd9a01f6a12c737b877c8e1dd344d4cfdfbbbc872d17424e3b9944993395d752fc0b80ead7d06a WHIRLPOOL 96e429eb7b44db5bce2def2ab7ef1a773d8dc630deb636e422e96c6521b61f37082b4889e564409e3af779d8d93a85cb54079a15a1415073fd65169a91593ad1
diff --git a/dev-libs/libbsd/libbsd-0.8.0.ebuild b/dev-libs/libbsd/libbsd-0.8.0.ebuild
new file mode 100644
index 000000000000..ce72644d5283
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.8.0.ebuild
@@ -0,0 +1,40 @@
+# 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/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index 1ffd97891600..73e9acc1b2ab 100644
--- a/dev-libs/libpcre/libpcre-8.38.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-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 ~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 ~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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 000ae30d74c7..4903cb7a9799 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,2 +1,3 @@
DIST libressl-2.2.4.tar.gz 2966157 SHA256 6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5 WHIRLPOOL 44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43
+DIST libressl-2.2.5.tar.gz 2966527 SHA256 e3caded0469d8dc64f4ca2fe8e499ada4dd014e84d1c5a71818d39e54e6c914b SHA512 501d04cb966260854082d374e60aabde21bcd65a331ff7c76044f2053b22ddab4914710b223b400a3a181873c6af5e2e7da5f04bdd9028fddbf420e259a2863a WHIRLPOOL 47f7d35ceff5004af0c2f79509678c4826eabe05225dbcf5cbe1f9cb358d1657ff288a702e14bfd578fd03e38256d2aa2c79ec724a05c98aa91317e6a9a5f9d4
DIST libressl-2.3.1.tar.gz 3014881 SHA256 410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e SHA512 ac70d2f09035d63765bb980422c6c6b55ef07f6af4a93fce54748ff3621cf08ef87acfd438797d562dc21ab9b4862992876792deef9310aafdb927e20e27d453 WHIRLPOOL 52f46016cf07e598b7117de1cc90617982de0ad020b55c4a2b402de317d8b52f8a381c9ebdff787421dccd3e47294305863ceb9f2c1c2a9080818fec16e7e177
diff --git a/dev-libs/libressl/libressl-2.2.5.ebuild b/dev-libs/libressl/libressl-2.2.5.ebuild
new file mode 100644
index 000000000000..23fcba7080f8
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.2.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+ touch crypto/Makefile.in
+ sed -i \
+ -e '/^[ \t]*CFLAGS=/s#-g ##' \
+ -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+ -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+ -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+ configure || die "fixing CFLAGS failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable asm) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index e3c9ef48e657..8224b434961b 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1 +1,2 @@
DIST libtermkey-0.17.tar.gz 42176 SHA256 68949364ed5eaad857b3dea10071cde74b00b9f236dfbb702169f246c3cef389 SHA512 8b96f9961ff77872a974b376c73abc4afbe444a761f96b3681fc5420e33548a02609bf8b2b24494965824ca5dd80c953d1d4e2701070559365633d7bf0fdcb12 WHIRLPOOL ef755c2de422d8778d8501be3aefe249b6194e71ffd862a2479158c009dd483508e6a4e35a5a1338d219e585ad465ccd3cfecfc8db6c7cd0440aa802d71f645a
+DIST libtermkey-0.18.tar.gz 42317 SHA256 239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926 SHA512 7507d7bf22ab075e932401b2194dcc69b40138955dc398c86327a072603df2a1010474fa9a1c75aa7cab936fa500e5e53118675b0ec6e9a85b66a1b6b7f5332e WHIRLPOOL 065b7ec2ae25002846ba579a2c225c603f45798724a2366a1bf50da4b2ad027bda0306376438b722b00b0adb4c9a1060412c77b5b272896f533ac731dc862622
diff --git a/dev-libs/libtermkey/libtermkey-0.18.ebuild b/dev-libs/libtermkey/libtermkey-0.18.ebuild
new file mode 100644
index 000000000000..1bdda24cf390
--- /dev/null
+++ b/dev-libs/libtermkey/libtermkey-0.18.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
+HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
+SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="demos"
+
+RDEPEND="dev-libs/unibilium:="
+DEPEND="${RDEPEND}
+ sys-devel/libtool
+ virtual/pkgconfig
+ demos? ( dev-libs/glib:2 )"
+
+src_prepare() {
+ if ! use demos; then
+ sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
+ fi
+}
+
+src_compile() {
+ append-flags -fPIC -fPIE
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" install
+ prune_libtool_files
+}
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
index 1608de19ea02..9d52b54472a0 100644
--- a/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.28-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
+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"
IUSE="crypt debug examples python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index 703d098654a9..2595945a6aa3 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,2 +1,3 @@
DIST nanomsg-0.5-beta.tar.gz 623927 SHA256 13bff7ae8f31957722ee62d50504ce1a0c590da908f8566f997e3e521abb089f SHA512 64bb658d80e94ec43e77b7a7c53a29e9b9cd02a7539e9c108b0bdfad8179af4202e11dcfdcb8400e3334931f61e59066fafe06c9df3bb4628dde6a047139ffe5 WHIRLPOOL 9b18a5b65d2ae321f112a5054fcfceda342c06a6745ba2eb8a4b4a64c40e0f47bc93b6da23202eeeef9b2992c842050cb53153293e79bda79f7b0aa86b26ca3d
DIST nanomsg-0.6-beta.tar.gz 592512 SHA256 69e2098446c9cd2c067b5ba38567c9ba30bf861a515b3d0a9302cb21c1167a69 SHA512 3f0ac82013191a5352e9cf92b02fb620e705ae4e6cc9bdfd7bc37dd48faa652af5be3f8a3de111ca9bb93a3a06127e1f03ab3f7d48d7bb6ad0e16c0341915a50 WHIRLPOOL 9c26c755ad0f0a37994a744b2bf8fea77aba43b83ba3e231065c0f95a700ace93c5fec151a0ef4d0796fb4605c2259f36c8473072e2d6abffe31a61c8a039776
+DIST nanomsg-0.8-beta.tar.gz 589221 SHA256 75ce0c68a50cc68070d899035d5bb1e2bd75a5e01cbdd86ba8af62a84df3a947 SHA512 457e99e2b2568370bf052a20e2abb38faad9afa9019d38aa35df6cf49d1d3f50e3a0b26a64089e823b7d907041e8069c99a06706678b070a26e0cbe2e26588d2 WHIRLPOOL a0c00848b8ca2178588047aaaedb9e3b10a993e5ae5d2c0da6716b861003deaf1ce3891850919db73202de8d1aa36e21c1f440600ce2be852189988fae4994fd
diff --git a/dev-libs/nanomsg/nanomsg-0.8.ebuild b/dev-libs/nanomsg/nanomsg-0.8.ebuild
new file mode 100644
index 000000000000..e8776bf7a534
--- /dev/null
+++ b/dev-libs/nanomsg/nanomsg-0.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-multilib
+
+DESCRIPTION="High-performance messaging interface for distributed applications"
+HOMEPAGE="http://nanomsg.org/"
+SRC_URI="https://github.com/nanomsg/nanomsg/releases/download/${PV}-beta/${P}-beta.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.2.2"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )"
+RDEPEND=""
+
+S="${WORKDIR}/${P}-beta"
+
+src_prepare() {
+ sed -i -e 's/doc_DATA/html_DATA/' Makefile.am || die
+
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --htmldir "/usr/share/doc/${PF}/html"
+ )
+ if multilib_is_native_abi; then
+ myeconfargs+=(
+ $(use_enable doc)
+ )
+ else
+ myeconfargs+=(
+ --disable-doc
+ --disable-nanocat
+ --disable-symlinks
+ )
+ fi
+ autotools-utils_src_configure
+}
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 3897edd8c3cd..5e1ae78f1603 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild
index e45937eeb9f1..90cb5c622474 100644
--- a/dev-libs/openssl/openssl-1.0.2e.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2e.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
index c86e4a1fbbc1..cb8842a0ab68 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.3.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
src_configure() {
econf $(use_enable debug) \
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
index 1a5f2ddae50e..2c9546e8194e 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-0.42.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
index 81338f77f3ef..b9b0f88b4930 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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="idn"
RDEPEND="
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
index ede963f21122..06e391a81300 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.413.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
index cb8a5b54de97..3db3f0492018 100644
--- a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="play with other peoples' lexical variables"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 94e0d82702ec..addcdf453069 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,3 +1,3 @@
-DIST PEAR-1.10.0dev2.tgz 290636 SHA256 6a1c697a0691b1566c251b295846d804e79776f2a7f5b149cfe41b3db75b4493 SHA512 b430f8cfd9858710198fd849ebd91d4c6cf6b5e68d88348a49ddaeb1e7a234ec8a60862a3344810c2ce7d402746fb677e2824b2960d56b290df306905c154523 WHIRLPOOL 83746c0079239350049202f0bc8e60ce58e7f2718fa6af80482b9f4377c246a1e638c9aac47f88c24f8f0b342716216b976fe6e8668925b178ca8def9732c98d
+DIST PEAR-1.10.1.tgz 291167 SHA256 7eca0d8e4f6391d66d92abc4faebd5a9346e739b92573e20392db9e878a8d59f SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 WHIRLPOOL ef067937d805a1e5c082c5945ffcbffd005757326f72572563154f2b5c573713050cc002af7727ebe053b3956fa1113c29bbbad6e74d8fb110704b07b7291929
DIST PEAR-1.9.4.tgz 296332 SHA256 80c329264a0363c6222b2f750e1646015161c9787bb4041f5ab41d95160bb93c SHA512 f4c8c6f24039940254cf774e51087a12e6b17f7cbd7308c814f8b43f1342ae68db6b2d94626a4d7ed05e8b537816da08459e2939689f15aef725504683657f47 WHIRLPOOL a640fa5dff5eda2801698094b3d99c7c63d9028727f323634dc6c17942d4cbf4fe76ddd35b89a11a8187de068201b875642bf90ea705544801d4ffaac3325828
DIST PEAR-1.9.5.tgz 290006 SHA256 d4c27d7321f76527222eae3972c6ffb62412cc729105c858ae0bb0861d699bdb SHA512 73c5ef84c4ededa7bca81b1d94944e80ddf9dc40101c0727c5975d4ddb72f66a28aecafcefb7af8d1cc3b6fa7e488e704559a7efbebe860adfb8e9796cdf4933 WHIRLPOOL ea42f63e73d680985857f3e8e318e1f7d001edc843d12b94c9b7d3969c0793c0a9709d2dc8940b339be2f9e854cb2a3acb8c0e5cdef7ddc3cd06c9df97a3ee37
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1.ebuild
index 4221a0e3651f..738afaa84a39 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="MIT"
SLOT="0"
IUSE=""
-DEPEND="dev-lang/php:*[cli,pcre(+),xml,zlib]"
+DEPEND=">=dev-lang/php-5.4:*[cli,xml,zlib]"
RDEPEND="${DEPEND}"
diff --git a/dev-php/PEAR-PEAR/files/pear.conf b/dev-php/PEAR-PEAR/files/pear.conf
deleted file mode 100644
index 5a3c5298db6e..000000000000
--- a/dev-php/PEAR-PEAR/files/pear.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:7:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";}
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r1 b/dev-php/PEAR-PEAR/files/pear.conf-r1
deleted file mode 100644
index 78f69818940f..000000000000
--- a/dev-php/PEAR-PEAR/files/pear.conf-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";} \ No newline at end of file
diff --git a/dev-php/pear/pear-1.10.0_alpha2.ebuild b/dev-php/pear/pear-1.10.1.ebuild
index 3405c1fc4970..ca6e9e5dce27 100644
--- a/dev-php/pear/pear-1.10.0_alpha2.ebuild
+++ b/dev-php/pear/pear-1.10.1.ebuild
@@ -32,9 +32,8 @@ pkg_postinst() {
# Update PEAR/PECL channels as needed, add new ones to the list if needed
elog "Updating PEAR/PECL channels"
- local pearchans="pear.php.net pecl.php.net components.ez.no
- pear.propelorm.org pear.phing.info pear.symfony-project.com
- pear.phpontrax.com pear.agavi.org"
+ local pearchans="pear.php.net pecl.php.net pear.phing.info pear.symfony-project.com
+ pear.agavi.org"
for chan in ${pearchans} ; do
pear channel-discover ${chan}
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 3b0d3fc3ed95..230115b5abcf 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,4 +1,3 @@
DIST imagick-3.1.2.tgz 94657 SHA256 528769ac304a0bbe9a248811325042188c9d16e06de16f111fee317c85a36c93 SHA512 d30e129cc4b61e34830b34261671bf92579c355f36924a802952524119bf07b0e0d59fe2ad361a4caa0322f959bed669b82d1f12a531b106648ccf9d22b4fba3 WHIRLPOOL 99309fb01a43d369d6a348c623afedfa291470ff0299b38faa949ff9da4654af0ceef6d67d7b7889b6b50bcaf17c4893a6b719b3c7afaa4fc1c87eef79ea4dc9
-DIST imagick-3.2.0RC1.tgz 163503 SHA256 a5f1ea34b9a21f48ea0b978d11a3cac32c53306482097c63324f7ecd9b157b5e SHA512 2c898f5aceb8ef7cb1e2a6b3fc6c5f909afda1891ff67b53a2b7904fac528d0f444d5e655c117c91e261a31d7fb94781eb14d7e38a6365d923c28bdceba7b6ea WHIRLPOOL 38ade896bac904488da04627bdd321beecbb6f44d8cd352168128ecf222f40e4149fe2a99fd027a6789fd9c4a0411215ec5fa1e2e8d717442c66322d9ab67025
-DIST imagick-3.3.0RC1.tgz 179932 SHA256 e3211f5ee8e04f9a59f6f3c6d73a5deb84151a045c42a54ffce32db8d64b6448 SHA512 65aae6441aaa9ea243d16cc5e61348c9b471ab8fc419c2ece72df52c027d8259b8741d663f73a1ae788b44b19686415312ea3fcd7f767f6ba1736b6b51261331 WHIRLPOOL 8d9ee99d8bcb174363e8004fcdbb7a00ba7f8b0afc6c86f3912bfbbe5b5949d93aa682e189b87b205b387da3cdcd87d96dd0827b61ce12c0de275a1c91c42c45
-DIST imagick-3.3.0RC2.tgz 180037 SHA256 a6892bc3991772c4622376b7ec18e29e20787b10043600efec0da35b48f5e41b SHA512 15122c7ed3c69ed1865e4910b2217b292075d80f62b50ab0d0aa9e2cf479a8cb47b06c0201ef62d4541cb7c94bb6e8dcf0fd719a6105e31f44955e87ce47aa44 WHIRLPOOL 389ef83dd31a67d551d068af5628c518d6915b07403b6aa7b608bcd09345c78e7f3ef92eda3b4d5a887aeb2c820e1f62b358bc81438751f81edbd67cad2c3f5d
+DIST imagick-3.3.0.tgz 179978 SHA256 bd69ebadcedda1d87592325b893fa78a5710a0ca7307f8e18c5e593949b1db2d SHA512 1f5f1f6c6ce8ac71384b39c53b1befafd3160deaf75554efd6098f56173484be8c6493a04ec00cb124c002dc9cebc31aaacabb4b6e2713916b8b119f4504c811 WHIRLPOOL 860d1ebb3b4a008a119bd55541b27973b3026475c84d8808f064e700a5fcb82d7ab154b2b711f7a5c51ec6d966c11f81b904f0c845cf3973fcf56b8726e0a567
+DIST imagick-3.4.0RC2.tgz 230995 SHA256 5c9391d673f97b11c42bc8b05c4a096d659f1d7d38890d43fe7447fcf5f629d2 SHA512 233a8b13ecd02936f72935e895f23d6caeeb6a576050a95a7dccbcf039f61602a1d1e409b74eb7f4c3ee5293271f8e1fb128daab9b33f554b3abacaec1f7f9bd WHIRLPOOL fc5a3306eb3bb05419db1dc0061d433ddf5882dd3273c1ff92237147774e9883c42587440e9797ef2a13143055b75ac5ba360726746ab25f520f69f896888c89
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild
deleted file mode 100644
index d160e9ab0b07..000000000000
--- a/dev-php/pecl-imagick/pecl-imagick-3.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DOCS="TODO"
-
-MY_PV="${PV/rc/RC}"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP wrapper for the ImageMagick library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="examples"
-
-DEPEND=">=media-gfx/imagemagick-6.2.4"
-RDEPEND="${DEPEND}"
-
-my_conf="--with-imagick=/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild
deleted file mode 100644
index ba10feb4efc0..000000000000
--- a/dev-php/pecl-imagick/pecl-imagick-3.2.0_rc1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/rc/RC}"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP wrapper for the ImageMagick library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="examples"
-
-DEPEND=">=media-gfx/imagemagick-6.2.4"
-RDEPEND="${DEPEND}"
-
-my_conf="--with-imagick=/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.3.0.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.3.0.ebuild
new file mode 100644
index 000000000000..d83ee934e3ab
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_PHP="php5-6 php5-5"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/mkoppanen/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]
+ <media-gfx/imagemagick-7.0"
+DEPEND="${RDEPEND}
+ test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png] )"
+
+my_conf="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.3.0_rc1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.3.0_rc1.ebuild
deleted file mode 100644
index 7f00b8fc0d02..000000000000
--- a/dev-php/pecl-imagick/pecl-imagick-3.3.0_rc1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="${PV/rc/RC}"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP wrapper for the ImageMagick library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="examples"
-
-# -openmp needed wrt bug 547922 and upstream https://github.com/mkoppanen/imagick#openmp
-DEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
-RDEPEND="${DEPEND}"
-
-my_conf="--with-imagick=/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.3.0_rc2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild
index b7820035cabf..cb1dd65266db 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.3.0_rc2.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
MY_PV="${PV/rc/RC}"
-USE_PHP="php5-6 php5-5 php5-4"
+USE_PHP="php7-0 php5-6 php5-5"
inherit php-ext-pecl-r2
@@ -15,11 +15,12 @@ KEYWORDS="~amd64 ~x86"
DESCRIPTION="PHP wrapper for the ImageMagick library"
LICENSE="PHP-3.01"
SLOT="0"
-IUSE="examples"
+IUSE="examples test"
# imagemagick[-openmp] is needed wrt bug 547922 and upstream
# https://github.com/mkoppanen/imagick#openmp
-DEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
-RDEPEND="${DEPEND}"
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+ test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
my_conf="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..cb650d732c68
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PHP_EXT_NAME="memcached"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="ChangeLog README.markdown"
+
+USE_PHP="php5-4 php5-5 php5-6"
+
+inherit php-ext-pecl-r2
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session igbinary json sasl"
+
+DEPEND="|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
+ sys-libs/zlib
+ dev-lang/php:*[session?,json?]
+ igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-5?,php_targets_php5-6?] )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ my_conf="--enable-memcached
+ $(use_enable session memcached-session)
+ $(use_enable sasl memcached-sasl)
+ $(use_enable json memcached-json)
+ $(use_enable igbinary memcached-igbinary)"
+
+ php-ext-source-r2_src_configure
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
index ca9daec85a1b..65805dc76bdb 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-5 php5-6 php5-4"
inherit base php-ext-pecl-r2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
LICENSE="PHP-3"
diff --git a/dev-python/certifi/certifi-2015.11.20.ebuild b/dev-python/certifi/certifi-2015.11.20.ebuild
index 68f2b27de9eb..1f3965bf0ea7 100644
--- a/dev-python/certifi/certifi-2015.11.20.ebuild
+++ b/dev-python/certifi/certifi-2015.11.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild
index 68f2b27de9eb..1f3965bf0ea7 100644
--- a/dev-python/certifi/certifi-2015.9.6.2.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/django-cms/Manifest b/dev-python/django-cms/Manifest
index ed0855548d99..5647457c6a01 100644
--- a/dev-python/django-cms/Manifest
+++ b/dev-python/django-cms/Manifest
@@ -1 +1,2 @@
DIST django-cms-3.1.2.tar.gz 4031123 SHA256 b59c89b6f7c3a802e74fe16159eb663df4b49fb676b6931d678fd5261a5fdb9b SHA512 ef8c2f25032f784b4f4a3d6b595577ee890fd249c54a71207eb6c2c7b3495164171db6f0e2f4aa49ed4b8e3ff5e682757ea2f396b69ff46d93419a35489fd213 WHIRLPOOL 85a22c9679b84fe04e4b29606328a50373a1d7aaa8174ee54e82d0cca08ef62ca8e3b946cf6ed0670f52253697046ecf65e2a8675ba9820286390b7af59dc143
+DIST django-cms-3.1.3.tar.gz 4035531 SHA256 f0b2122e33dfb9f52247365855712616d61b5efecc87eb8fe5bd5eb1399f982c SHA512 261f1321d5f47ce6931b4bf89a1f4e1183a6353793537c840e61ea9200169889f4712b6eea77a5e15e58b065b48a8911e1f643af487eeb93519ec8ff1b46310d WHIRLPOOL cfeaf1e47730effdf2312687a0213bf7341512b8d2a6e4ccd1f2a54981b28b3242c36af0ea3e7ce4635451ca9ff4dd548025500e5f68d359ea34ade346bceec2
diff --git a/dev-python/django-cms/django-cms-3.1.3.ebuild b/dev-python/django-cms/django-cms-3.1.3.ebuild
new file mode 100644
index 000000000000..04f3a7b91c62
--- /dev/null
+++ b/dev-python/django-cms/django-cms-3.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django application for managing hierarchical pages of content"
+HOMEPAGE="https://www.django-cms.org/"
+SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
+REQUIRED_USE="admin-style ckeditor"
+
+RDEPEND="
+ >=dev-python/django-1.6.9
+ admin-style? ( dev-python/djangocms-admin-style )
+ file? ( dev-python/djangocms-file )
+ flash? ( dev-python/djangocms-flash )
+ inherit? ( dev-python/djangocms-inherit )
+ link? ( dev-python/djangocms-link )
+ picture? ( dev-python/djangocms-picture )
+ snippet? ( dev-python/djangocms-snippet )
+ teaser? ( dev-python/djangocms-teaser )
+ video? ( dev-python/djangocms-video )
+ >=dev-python/django-classy-tags-0.5
+ >=dev-python/django-sekizai-0.7
+ ckeditor? ( >=dev-python/djangocms-text-ckeditor-2.1.1 )
+ dev-python/django-treebeard
+ dev-python/html5lib
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools
+"
diff --git a/dev-python/django-filer/Manifest b/dev-python/django-filer/Manifest
index f71534618a6d..6fba3c93fc83 100644
--- a/dev-python/django-filer/Manifest
+++ b/dev-python/django-filer/Manifest
@@ -1 +1,2 @@
DIST django-filer-0.9.12.tar.gz 762305 SHA256 75dffb0df161d25edb5b1bee3ceaa308223264e35fb87517d733fa2eb1eee5c5 SHA512 141357b6a039fdd018bc843a8be6c130b31dd246632522bd3b61c35232406fcc1bf8c28862fd2d2466f355240afa4062afb435707ce341112d1aa049aca6bb4f WHIRLPOOL af62b42ded639037c4f39bfabc594c08b447c6bc7808dcc3a1cab23a5442d6cd0818d8dfc0f56f5d531e18217d8f98a653a07ab0c2b6cd1e71f82a5865936c62
+DIST django-filer-1.0.4.tar.gz 779330 SHA256 be18c8e568c4e01cb16268e04292c119dd3da18c72812bec0ab818aded40d9a3 SHA512 a8c527be1d706c0f305a7019155eb9a2d197062b0a37632cbb50b2ed946f6ab05d694325eabe8fcccf183d8a4cdd79da1c0621f5fcda71326f3bac2b659140cc WHIRLPOOL eebb54f463fc98c39574d4078777f48efe426636aeea19230d4cf1ffc85053ebf435815f813a4f86506ff231e43e5ad8333fe537f6d3d09914970d48ad6e080a
diff --git a/dev-python/django-filer/django-filer-1.0.4.ebuild b/dev-python/django-filer/django-filer-1.0.4.ebuild
new file mode 100644
index 000000000000..b2ca6fa07919
--- /dev/null
+++ b/dev-python/django-filer/django-filer-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
+
+inherit distutils-r1
+
+DESCRIPTION="File management application for django that makes handling of files and images"
+HOMEPAGE="https://pypi.python.org/pypi/django-filer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/django-1.5
+ >=dev-python/django_polymorphic-0.2
+ >=dev-python/easy-thumbnails-1.0
+ dev-python/django-mptt
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools
+"
diff --git a/dev-python/django-sekizai/Manifest b/dev-python/django-sekizai/Manifest
index c8d6bb5d852f..a41d5052ac4a 100644
--- a/dev-python/django-sekizai/Manifest
+++ b/dev-python/django-sekizai/Manifest
@@ -1 +1,2 @@
DIST django-sekizai-0.8.2.tar.gz 166925 SHA256 cab1a4f445a9544036ba0b04cafd3102cecac1b313ab2e6a51bff773751298ae SHA512 dc9f8d38df4d2e61d285683e3922c480c8defecf1149d727db9e0d480c80efa488c4c192c54fa7edbf6e98111b460cba46ea904bea72dbfea567aef77a24120d WHIRLPOOL 9ddc8d345cdc1abbe8ca2f48102eb908b23a33fb09a3c9a720f9c7e278b59ecfe2aa9c2528fdcb47e10c35d86822898f188d19f79656b1c6e9ff2d933ad4c31b
+DIST django-sekizai-0.9.0.tar.gz 895007 SHA256 1fcf80f1238fe911a795bce6424589075fadc15200a121f493774b232aa334a4 SHA512 3ce523dacb08826fd1dbea6d3b3df966043983d127982e14fcd2322e1513224802a84102e9d5650f849c780b238ded9fa41d6c134f1bd29e90a735af7d589d99 WHIRLPOOL 9e11cb9d5542412ef08a52a3d39a44634ec2d94f6a43ff3e268bf6607f18d71944a56fac96afacc53ab3a429af2751ba8c4627608940e7cd2afb4fbc56f1e92c
diff --git a/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild
new file mode 100644
index 000000000000..659036506606
--- /dev/null
+++ b/dev-python/django-sekizai/django-sekizai-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django Template Blocks with extra functionality"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.python.org/pypi/django-sekizai"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-python/django-1.6
+ >=dev-python/django-classy-tags-0.3.1
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools
+"
diff --git a/dev-python/flask-socketio/Manifest b/dev-python/flask-socketio/Manifest
index 3a30c7af99dc..1408085edf68 100644
--- a/dev-python/flask-socketio/Manifest
+++ b/dev-python/flask-socketio/Manifest
@@ -1 +1,2 @@
DIST flask-socketio-0.6.0.tar.gz 6804 SHA256 5b004bc9a74421ec3983f5167a7cab70853b132a9c9c09d808c07f96bbf6ecd9 SHA512 3093fb659e8fe86a866bf9183401995a6615b3dfc8687549fa5845747935b6cd6bfc7bb56c969489f47fdb1a5420d744817b6a7dce636ab653ef62a08d353b1e WHIRLPOOL 1ff182a51ac24a61e02a6bf46612932bfdb4121737e27c34e324c859e9fe43a6db408fa162d0ff3b3952e8cb9bfa1e9d0f7b9e57149bce8af461fe5f4e829356
+DIST flask-socketio-1.1.tar.gz 7992 SHA256 fdeefa4d3a87b789308e5144d0c58299d50d35fb97c6cc0a76f1d12e255b20bb SHA512 a7257698c32e8b57a63b86ae5bffa8c5c32d9198186b98e2d2f306562ca7b188c5eb260f2716556973e2c0902a37ec66f7809a61a83c6fab4d6a950eda963580 WHIRLPOOL 621e49ef3cdfb94cbd8042d2d1a396d47272541e06d901b6fcbc4fa83951ce7cb30d6cf065405cdb58f01be002901b3b2ab9378f26dd8664ea5949bdecbe6d58
diff --git a/dev-python/flask-socketio/flask-socketio-1.1.ebuild b/dev-python/flask-socketio/flask-socketio-1.1.ebuild
new file mode 100644
index 000000000000..a97dc37cdc53
--- /dev/null
+++ b/dev-python/flask-socketio/flask-socketio-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SocketIO"
+DESCRIPTION="Socket.IO integration for Flask applications."
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+ dev-python/python-socketio[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/coverage[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+ PYTHONPATH="${PWD}" python ./test_socketio.py || die
+}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 7eeef3918196..09210fd87429 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -4,3 +4,4 @@ DIST kombu-3.0.24.tar.gz 374539 SHA256 b9ff0437607113aea701fd5122c2afa40c05dff6f
DIST kombu-3.0.26.tar.gz 375553 SHA256 1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 SHA512 71656cc8f44101700c5489e0b0a66918a00cf8ff39e65feab1090865e3c8d50b6dd2458f95d48fb58cc4387de954530fe27a5713838509d51123bac7009631a2 WHIRLPOOL d706dcd752e24eebc3a1091a8a2ba91a0b6adf30fa9be4d9d1a95b5c008f8036eb518f03ccb1d3393502488120c9ad2ad2f2e01c41b59beb3576389b3f9c000f
DIST kombu-3.0.28.tar.gz 377706 SHA256 c22af35c4e7bbb7441b789b9b8c1baf73a8c481eaa93d00a63fa85bddc6b1ab1 SHA512 1409966edef345565f371cfa705fc643ca9b0e5ef46426f4b41859461f1c326e2c6c754ff51c337f42c42039af678d3dda0b333a2d70bbbcaa5e6c050a4d1ce9 WHIRLPOOL 780233337a574fafc187f9b4d68f17c9e68ee6e9fa7276ece859081573ace3b981dcbed2ff89b885bd7e0f8995dab42e0c34d6f47b6c0fb7dd053505a6f78d31
DIST kombu-3.0.29.tar.gz 378270 SHA256 970a55ec65e668403c3e6ef4aa2213362568387885f5cc0ff8429abd44a6dca8 SHA512 1093826ec4ba8234f8f8a1082252df20e600f0b58fc46c5c5b3ee6ef3b2582e2c986f997edfa13d4c85b9473236f3cca902375109266a809d33fd76c6eb45c35 WHIRLPOOL 9e4909c02ed2be14235861d2838278d71ab90da20f59c4b02123d9ce84212c0e93cc8b162e2ef8df45d224ed0166c022fca849a6cb39143fd6554e6a00b71893
+DIST kombu-3.0.30.tar.gz 380706 SHA256 b902fe768ea49173c7c26b117bf6c51d258f822d00d753e543b7e2285540f85a SHA512 91d43c7bf9902fe58b2a06f81286be81945c751ca4677a7ab9c78287e006726908b143510efcb4abf91b584f2fa0be7828df5631f552665fb3bbd9806f703075 WHIRLPOOL 75d62e8e395205157e1d018b6e20cc7f2b5ba0a7dd7ec40cfc21e0341aa9108eafd811277a0a9ed0fa6f1f41b9e96b7d1e8e4c32674e6db601b418afe6e70e3e
diff --git a/dev-python/kombu/kombu-3.0.30.ebuild b/dev-python/kombu/kombu-3.0.30.ebuild
new file mode 100644
index 000000000000..373244c2322a
--- /dev/null
+++ b/dev-python/kombu/kombu-3.0.30.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amqplib doc examples msgpack sqs test"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
+PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
+PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
+RDEPEND="
+ >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/py-amqp-1.4.7[${PYTHON_USEDEP}]
+ <dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
+ dev-python/pyro:4[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+ amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
+ sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
+ msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose-cover3[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]
+ >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
+ >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]
+ dev-python/beanstalkc[${PY27_GEN_USEDEP}]
+ dev-python/couchdb-python[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
+
+# kazoo and sqlalchemy are optional packages for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PY27_REQUSE="$(python_gen_useflags 'python2.7')"
+REQUIRED_USE="
+ sqs? ( ${PY27_REQUSE} )
+ doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-NA-tests-fix.patch
+ )
+
+python_prepare_all() {
+ https://github.com/celery/kombu/issues/246
+ sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # Doc build must be done by py2.7
+ # Doc build misses and skips only content re librabbitmq which is not in portage
+ if use doc; then
+ emake -C docs html || die "kombu docs failed installation"
+ fi
+}
+
+python_test() {
+ export DJANGO_SETTINGS_MODULE="django.conf"
+ # https://github.com/celery/kombu/issues/474
+ # tests need </pymongo-3.0; known to cause some breakage
+ if python_is_python3; then
+ 2to3 --no-diffs -w build/lib/kombu/transport/
+ nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
+ else
+ nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
+ # funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
+ # https://github.com/celery/kombu/issues/411
+ # Fix to https://github.com/celery/kombu/issues/474 breaks the
+ # funtests under >=dev-python/pymongo-3.0.2
+# if [[ "${EPYTHON}" == python2.7 ]]; then
+# pushd funtests > /dev/null
+# esetup.py test
+# popd > /dev/null
+# fi
+ fi
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 79c56da68e6c..89d212454d37 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -1,3 +1,4 @@
DIST ldap3-0.9.9.1.tar.gz 286623 SHA256 55812eff14919ddc9e53273c09846a0fd3e0d27a2c4b8a110427e58beeadd03d SHA512 f289e86fbc6bb36e7260592cb7f3423c593dcdb75ba43fa418f1367e48967ab175a27073b7c2b3cbee6ef8526f35c96c7fb90e1768e2da27829087abf9104d9c WHIRLPOOL 2325af48ead118577c6d5137d95fca5eec39e119b6ae2759f1a571f78a040bc7ccbd17c5e4760c2d232520a5252129f032c26d814c3c84d1f390222561253692
DIST ldap3-0.9.9.2.tar.gz 290242 SHA256 867e448822d91f8ef351bf3dcf8dce43a36312d454db1cb114a3298e3aac6ba4 SHA512 6533bb0e3b958622ac8207ccc12d0817a3b9562ccb5cc911751d73e7b3419f9ae6cf87ffebc5df7b27cd82fc43b9570260a04cb15a5caa97e75f98aa6359f7e5 WHIRLPOOL 6998ddf71445aa5183a9cdf5e523f515dc99f6d4f0bdf562c0537431dffe4f073bf224b4b37a096a06b1a8d0d967cd8af7e81e097a430c036db5110a77ccd2b8
DIST ldap3-0.9.9.tar.gz 285775 SHA256 4555b78ecf3ef8ce7fb854c1e863d8f8ffce5f49fa599d04c161749a8fdd16e6 SHA512 ce149629e49add9704fa853c6e7b644e1b4192bee378be757ff6911c5dce89b8532e22d208248475f1531d433d168b806151082179b45c5ea9f57df90203333e WHIRLPOOL 917095ad6f4f477bf2834c4e7da8c6909561c705f36df5598e48269dd2505c66720369a6846e9614feeda5c9b2a6d4317489da2143d6c87584df13ae02ba3fc6
+DIST ldap3-1.0.1.tar.gz 293221 SHA256 2bd84b146f12990e20a9894e46e03010fd62728b6bc644544ed0f488a7639d6e SHA512 441ddbcb3c971f35ff742733e47bf1f42aaf126cff61409ab9ba21f46c88773ba9ead1e12d161eed469cab03bb2f423bb6c72af3a8e984d6ce2d5ccdbd92755e WHIRLPOOL 8ee95140d540b4023dfe0c20f4dfedd537f1649562b53d55f30aa07b02cf42636eb1907365a82abf33f6d5beefa561cc3b1023b880e3f2dc8a937f82331bd4a9
diff --git a/dev-python/ldap3/ldap3-1.0.1.ebuild b/dev-python/ldap3/ldap3-1.0.1.ebuild
new file mode 100644
index 000000000000..700d8ef8deaf
--- /dev/null
+++ b/dev-python/ldap3/ldap3-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ "
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ nosetests -v -s test || die
+}
diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild
index 9b75f0c83e6d..46dc640b3cce 100644
--- a/dev-python/mock/mock-1.3.0-r1.ebuild
+++ b/dev-python/mock/mock-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test"
CDEPEND="
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index 563916e91fa0..e1803fa1eded 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
index 2c07fa78a9e3..b07b729bc21b 100644
--- a/dev-python/packaging/packaging-15.3-r2.ebuild
+++ b/dev-python/packaging/packaging-15.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild
index 6e0cc0be85a3..ca6e4f8847cc 100644
--- a/dev-python/pbr/pbr-1.8.1.ebuild
+++ b/dev-python/pbr/pbr-1.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
index 4e1ff4ae0052..0ed35d0bcce1 100644
--- a/dev-python/placefinder/placefinder-0.3.ebuild
+++ b/dev-python/placefinder/placefinder-0.3.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
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index c26067d713bc..aafecbaeccb5 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,3 +1,4 @@
DIST amqp-1.4.5.tar.gz 77748 SHA256 534c807c0081ce9c2d517615e724cb6e9df17f79cd6cd4929653ea1ea60edb60 SHA512 33cc0df95786afbd7861585a5fad4c9ec3d28709aaafdba6a7b2b8e2b36b79a129e320ce945ef59f87ccb4e83bdf68ca9bf54b4759dc2e6ba2f131777398d702 WHIRLPOOL 471731462bfa2104f0abbffbe870f47420813e8f1a20ec901414313f34105d1a5e2e9e2ef990b1e7ce09a3442af6fd6b4a4e25f293ae3d834f9953e63caab630
DIST amqp-1.4.6.tar.gz 77902 SHA256 ebcfc867de5a68f9f5ba14d11dbad88e6aff8435a8d39339d5ceb0e5b06de640 SHA512 fe5cd7cafd9d6a4b8c1ab88a2757db440cd7b415b29c608f51052662d4c7d9e3fae81895ea09ec88f74e83ae9615c5f60b5857417b5d645086f88fc93527758c WHIRLPOOL 599dac45d24ac56407f9fbc1e00cc49884fa3717c3cbf8f7a9b59cfb78a5d9506341169f174cb7a1278e8e6745ae04aa14b6448a5250e5c40843a50f82d01d95
DIST amqp-1.4.7.tar.gz 79189 SHA256 1781884b53e01209eeced13ca1d941f1a7026088974edb6fb62728638bd02dda SHA512 e8bcd61bd331a12965c83e62d458c5fefae41f4765fb3a816aca3c8bdd373c8a96ee24f3aef45a53d9eca2f5ae226ab259db92e3308e624420bc221509d1d8d1 WHIRLPOOL c7bd339fe7c44abe226c4ae59f424584794831d7306e2eb5c0657696fb8048604be181c0cb1c5eccef049a5b92ce97cc6a07f1a8bde6ce8ef44cf2189a8c6e4a
+DIST amqp-1.4.8.tar.gz 79249 SHA256 3a5b358ef81fa12927d1ec84f5107c59b6fc3be681c325e7cc690cffd5956879 SHA512 de7093e1f5061fab3d5799f525a71dd6976d4af7fea3ff0274fae7a4606baa75a85dcad7790475d1cbf6eeefe81f42348a6e7c65202e01ab7cb1534974c82781 WHIRLPOOL 83b4f9eda252e9f18b1714911f54b210cbea41b312306659e37b1914e41b77df3b431dfa2bf08914928e49c8ec0b0e4705fe3d9f408e1bc8479f691803f283e1
diff --git a/dev-python/py-amqp/py-amqp-1.4.8.ebuild b/dev-python/py-amqp/py-amqp-1.4.8.ebuild
new file mode 100644
index 000000000000..8dbfd8353dc8
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-1.4.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples extras test"
+
+RDEPEND=""
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}]
+ )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose-cover3[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.0[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+# Same tests from before require a socket connection
+PATCHES=( "${FILESDIR}"/${PN}-1.3.3-disable_socket_tests.patch )
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ cp -r -l funtests "${BUILD_DIR}"/lib/ || die
+ cd "${BUILD_DIR}"/lib || die
+ if [[ ${EPYTHON:6:1} == 3 ]]; then
+ # -n causes Python to write into hardlinked files
+ 2to3 --no-diffs -w funtests || die
+ fi
+ "${PYTHON}" funtests/run_all.py || die "Tests failed under ${EPYTHON}"
+ rm -rf funtests/ || die
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( demo/. )
+ use doc && local HTML_DOCS=( docs/.build/html/. )
+ if use extras; then
+ insinto /usr/share/${PF}/extras
+ doins -r extra
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-1.5.1.ebuild b/dev-python/pylint/pylint-1.5.1.ebuild
index 50f2174a27e4..d4adb716d28f 100644
--- a/dev-python/pylint/pylint-1.5.1.ebuild
+++ b/dev-python/pylint/pylint-1.5.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 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 eutils
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index dec31378924c..63619eec8450 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,3 +1,4 @@
DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06
DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
DIST pytest-2.8.3.tar.gz 880441 SHA256 37d950e93c1fd7e04d816a3ca4a5226ea2531c6d531c8284ad9b88848417e720 SHA512 04dd9041729d83b98a15cef22aac65dfb95cd3bf6b71a580ff91e8738f9a1ad5ee46fae45c950342e4a0162e38c875299a46fc69ec74702f36a1e36ef76dc0d6 WHIRLPOOL 78149cdcc25dc478ae004b0a54b333edcad0268ce5e66efe9878b0bcaff0e33d227513f84040f3aa53967afa5ffc51ecef0e6003814c09925fdf9e6a4921d88a
+DIST pytest-2.8.4.tar.gz 568888 SHA256 ca8afa5e216acfba6df7f26f2ef8a45baedf6a952e6b2f033ab55ec7e0a679eb SHA512 42e2949b66184cf2cecb7c803871639c1a3c887a48fc43580fe87f432507b9457c3a7c0b3bb620060e3eeb2db2178dfc35aba19022812497a917fdfa2ce5fd45 WHIRLPOOL 7ee539c61216463ccdaf5e09581cc1de82ffc6f6fb99dba04fa7d4eefb628c457c828ce9f8307477b5f95b997a4fd917f4818262ef4e1867cf0c10f9d2467bc2
diff --git a/dev-python/pytest/pytest-2.7.2.ebuild b/dev-python/pytest/pytest-2.7.2.ebuild
index d88c06f19599..dbc19e960d4f 100644
--- a/dev-python/pytest/pytest-2.7.2.ebuild
+++ b/dev-python/pytest/pytest-2.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
# When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild
index 20364d40d19c..881a8a01970c 100644
--- a/dev-python/pytest/pytest-2.8.2.ebuild
+++ b/dev-python/pytest/pytest-2.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc test"
# When bumping, please check setup.py for the proper py version
diff --git a/dev-python/pytest/pytest-2.8.4.ebuild b/dev-python/pytest/pytest-2.8.4.ebuild
new file mode 100644
index 000000000000..f8a1f8a714c6
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/regendoc[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8.3-skip-test-on-pypy.patch )
+
+python_prepare_all() {
+ chmod o-w *egg*/* || die
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+
+ # https://github.com/pytest-dev/pytest/issues/1162
+ # https://github.com/pytest-dev/pytest/issues/1163
+ sed \
+ -e 's:test_logging_initialized_in_test:_&:g' \
+ -i testing/test_capture.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+ --ignore=testing/BUILD_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/en/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
new file mode 100644
index 000000000000..f12a2b0b672c
--- /dev/null
+++ b/dev-python/python-engineio/Manifest
@@ -0,0 +1 @@
+DIST python-engineio-0.8.1.tar.gz 11608 SHA256 82973bcf1c32df594bb78c527d9406f301691ecc5ab93c38fc318c1b0142b9fd SHA512 71a6002753f77440fe118004e7ace11eeb348b2d63274e81fe66e8eace899b8b3f1b8b130f86cedb0d78c995f1f83053ab7811e68fbb6e977072d9491a35b6b7 WHIRLPOOL c2a62848b2a83adb5eea255c60c77d6355053a360d885dacfe117a104974987c9379236c62eed6f496e115c8181428a09ccd51720438b4110902b43c06778450
diff --git a/dev-python/python-engineio/metadata.xml b/dev-python/python-engineio/metadata.xml
new file mode 100644
index 000000000000..cf3c0cb7d14b
--- /dev/null
+++ b/dev-python/python-engineio/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>python</herd>
+ <upstream>
+ <remote-id type="pypi">python-engineio</remote-id>
+ <remote-id type="github">miguelgrinberg/python-engineio</remote-id>
+ </upstream>
+ <maintainer>
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-engineio/python-engineio-0.8.1.ebuild b/dev-python/python-engineio/python-engineio-0.8.1.ebuild
new file mode 100644
index 000000000000..6f1d6174d395
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-0.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN=""
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/eventlet[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+ )"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+src_prepare() {
+ sed -e 's:pbr<1.7.0:pbr:' -i setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ esetup.py test || die
+}
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
new file mode 100644
index 000000000000..a4ac07ee7adf
--- /dev/null
+++ b/dev-python/python-socketio/Manifest
@@ -0,0 +1 @@
+DIST python-socketio-0.7.0.tar.gz 10932 SHA256 831095fff02dfed6b53fed858fde06ae00a616b6d73f4830808c8bce330fa19a SHA512 7591c82a43b7beed907d5eb4269b2ed3bc2d0423b9392d092190e64aef0631835ccbaa494762a7acc914ed082884b4e4fdf78f84e1bdcdcc41433fee0746b176 WHIRLPOOL 5bc05e84c9a194516bcbb434978c27b0a71f44e04d4d8a46b23d997b489a28bd7ae89f75a8db46cc4ea92ddaf4a42e43901c0d283a1b198ad43340f645933509
diff --git a/dev-python/python-socketio/metadata.xml b/dev-python/python-socketio/metadata.xml
new file mode 100644
index 000000000000..fadd8644eacf
--- /dev/null
+++ b/dev-python/python-socketio/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>python</herd>
+ <upstream>
+ <remote-id type="pypi">python-socketio</remote-id>
+ <remote-id type="github">miguelgrinberg/python-socketio</remote-id>
+ </upstream>
+ <maintainer>
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-socketio/python-socketio-0.7.0.ebuild b/dev-python/python-socketio/python-socketio-0.7.0.ebuild
new file mode 100644
index 000000000000..50e33f2f7807
--- /dev/null
+++ b/dev-python/python-socketio/python-socketio-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PN=""
+DESCRIPTION="Python implementation of the Socket.IO realtime server."
+HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.python.org/pypi/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/python-engineio-0.7.0[${PYTHON_USEDEP}]
+ !dev-python/gevent-socketio"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+ )"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+src_prepare() {
+ sed -e 's:pbr<1.7.0:pbr:' -i setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ esetup.py test || die
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
new file mode 100644
index 000000000000..79f09ae23a59
--- /dev/null
+++ b/dev-python/reno/Manifest
@@ -0,0 +1 @@
+DIST reno-1.2.0.tar.gz 23725 SHA256 8f2c4f9b8325e6de4a5a2a98169b2906bd2479cc2c66b97cd6899da455425fd3 SHA512 61abf852504ab9ace324efc70bbe4bf5ce226175a4375f37466ebbe011cb65c7d306d69cd90a5e152f03d60f578be02d57a3805647a486e44dccf59b17595083 WHIRLPOOL 4a25f46b2a3c7693642104402db8bc024c82d19e3d8e3a11c899485aa7acd005a868a31665a0bb827f4922869c08297d63bdba5df76f0bf81cf8b95b2faa35db
diff --git a/dev-python/reno/metadata.xml b/dev-python/reno/metadata.xml
new file mode 100644
index 000000000000..f441d1500867
--- /dev/null
+++ b/dev-python/reno/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ </longdescription>
+ <upstream>
+ <remote-id type="pypi">reno</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/reno/reno-1.2.0.ebuild b/dev-python/reno/reno-1.2.0.ebuild
new file mode 100644
index 000000000000..2c22364c7bff
--- /dev/null
+++ b/dev-python/reno/reno-1.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A release notes manager for storing release notes in a git repository and building documentation"
+HOMEPAGE="https://pypi.python.org/pypi/reno"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+ >=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 17c052a8d2c6..a98fbbcea924 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,3 +1,4 @@
DIST rfc3986-0.2.0.tar.gz 14522 SHA256 8a7b3f6cfdfb969c2e876513e87c30ebe1e4bdc9fae4a63c701eee88bbec9b22 SHA512 e16a7b690597e1d3bce0869e1bd7aecb60926b61da38e8b7170d920d73130512d4017426461d755792c2ea691b5c01ae8955e0b9818679e795b7338794b66d83 WHIRLPOOL 03bc5ca0d5e2cc06f8bc68029dfccfa71820512b546caeaddfe66f2233a9346d4ae3123c69efaee2b90258acdb3f0cde8f2ee84f4f29c0e1375f4fb9fc56effa
DIST rfc3986-0.2.2.tar.gz 17250 SHA256 b66238ee937485509326e0280eab4d8193df0e640936b99a6a181374dff97f7b SHA512 d6df82bce5de487a43cfd0e875d9e746e02f051fdfffa7b07564d025e77ed53ad02a09a837ba6c971b81019e091c694819de0e4ce43f19b4aa764ba21f70c054 WHIRLPOOL fc5b53681be16642947fa709232dc06e5643ddce6309bddb899abbdcac508060a84918f9b4b3b324c6de30dbd14669b92dea5ec34f39ddfb7a1289a7cf95a9ce
DIST rfc3986-0.3.0.tar.gz 21421 SHA256 673715792042d9fb83571518c860074369b6d3610c8b48ac42f38fbc2722a48d SHA512 011999135fcaee82587342b2dc4e2203a783d82951589cddf49aaadf301f868b180216ad8e219059d9d4ca8425b2ecda8ead15c23baace01019d52b33782f5bb WHIRLPOOL e18cdc4f2e055cdcaa5ff41f83097970a542e37ccb94eab9b73ef32f7aff74b3497ed585ce31f473297a3a4e698416d688c85810a00b300d6b861466e3358c23
+DIST rfc3986-0.3.1.tar.gz 21591 SHA256 b94638db542896ccf89dc62785ec26dbcbd6a97d337f64e02615b164b974f2e5 SHA512 47c0cff5b67de5cc54ce3a24eb6d192a8b1414f5bb25e54056561fc0394058ec94853e62b9495dd72e15074921b66153279d4dffd1c199e252d569646a34aaed WHIRLPOOL b2ae2145dd078dfed954eda8e76d41a5776a6760e21d247d50bb06a10400785b5fd78f77e6b01b4de75a076ede123ae501db800458dc0e7fa822d90d7983c229
diff --git a/dev-python/rfc3986/rfc3986-0.3.1.ebuild b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
new file mode 100644
index 000000000000..98afd20218e4
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-0.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="http://tools.ietf.org/html/rfc3986 https://github.com/sigmavirus24/rfc3986 https://rfc3986.rtfd.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_test() {
+ py.test -vv || die
+}
diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild
index e19812119220..fd535fb4e7da 100644
--- a/dev-python/setuptools/setuptools-18.4.ebuild
+++ b/dev-python/setuptools/setuptools-18.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index ea260536a02c..88b7e2d860a1 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
+DIST setuptools_scm-1.10.0.tar.bz2 16093 SHA256 080fccdf74121d8239aff8a17574123c9d2369dadf82178cf565422b2973632b SHA512 8a7eaf56dbebea08f12d4444606ef36033fbe9a0b725f92245d600a56d051988a87b73c43c7ead46a8ce4f83593db4b5a8c77f6dd331bfa381c7348f72743b0a WHIRLPOOL 9b988f77b5905f34da687b04841f606986e804ceb57f7aa2ca1de69a8e9b925d23325cf5c7db9be3f9b1f7051ebf3af0bd198ea0fc891dd7888369c962e5ae19
DIST setuptools_scm-1.8.0.tar.bz2 14491 SHA256 ddbf365e60e5f8e3f86fe117edeee4a7e1dd8ce7a9337951c9c163e7c506e602 SHA512 a109fa3ffc89d3f6e515fa58026cebbd8ba98c1a401c49d5008e0dfc693f0e9e9468823621bd7b055911d3c898394e0ed1e498136cecaaa0be25e6312ec059df WHIRLPOOL ed87332ea7c27f1618c5c0c69b95360d48ec3b7d762d928d4cb097310fc0435c1aac15e53155417c0bdc0b9ba6ae6835e28f35735c10d70c6164d91340b09762
DIST setuptools_scm-1.9.0.tar.gz 17669 SHA256 b17362734ea2494a5fee611a2b3f09c251356fa5b9ed4567b666fe91105d4478 SHA512 e44cd8fa4e6badd707e8987e0d91f79d6dee4cda3dbab42bba70f661a66b841cc16dc9b59b35fecc0948b80e6ef198fb19f267aa839e32d09a543f3b724645cd WHIRLPOOL f688f00d2c700946ba17bc2acbc357412569068063893fd72414ab41d5e4e3360d410ae3e48b837ddebec5979e7e024ab544e75556b428d5e2603edf2b82acff
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
new file mode 100644
index 000000000000..784a6dfc876c
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index ffbb168d3c24..2774a6298ab2 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -32,8 +32,8 @@ PATCHES=(
# pkg_setup to catch them all
pkg_pretend() {
six_dir_check() {
- local dir="${ROOT}"/$(python_get_sitedir)/six
type -p "${PYTHON}" > /dev/null || return 0
+ local dir="${ROOT%/}$(python_get_sitedir)"/six
[[ -d "${dir}" ]] \
&& die "${PN} doesn't work if ${dir} is a directory #546730"
}
@@ -42,7 +42,7 @@ pkg_pretend() {
pkg_setup() {
six_dir_check() {
- local dir="${ROOT}"/$(python_get_sitedir)/six
+ local dir="${ROOT%/}$(python_get_sitedir)"/six
[[ -d "${dir}" ]] \
&& die "${PN} doesn't work if ${dir} is a directory #546730"
}
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
index 98afcc8f62b6..18325b46052b 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
dev-ros/roscpp
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_geometry
+ dev-ros/image_transport
dev-ros/nodelet
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
index 98afcc8f62b6..18325b46052b 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
dev-ros/roscpp
dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
dev-ros/image_geometry
+ dev-ros/image_transport
dev-ros/nodelet
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 13ecadcb1a97..6aa5ce72eb77 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,3 +1,3 @@
DIST addressable-2.3.6.gem 98304 SHA256 e822c28133d151d450778bbcf1f6e7742d4c3aba54498eb0da33d80a3990ee8c SHA512 26a2d754397a5e46bc22ea9755d1c1a1b9f993e38fcf9b0a6133ea6d0aa7bdc0fe6bfe83bc39991e3b258fa3122e44bbd0b0758026be02af2a70ffef96d0dfa4 WHIRLPOOL 19ef0436df04172ca5dd9811d75616e069871476df879c10bc711e9db084636ca6edebed7500707d9409d6bd9041ece431609a7e4b2e42121a7cce6989bf5964
-DIST addressable-2.3.7.gem 99328 SHA256 7022baaa16500f065a290cfd2d4926367c10a40421f725582adcea546a0024f4 SHA512 0376757a98997a992b52bf893636e72194fcc745c1e5253e02d405c07e8fc8fa37442f4db86323023dffc04c8bd988085bf97d3e2edcde84b2bdbe98a4f8dfd1 WHIRLPOOL 32e36d2479b8907573c757dd42e77528cf6dcc7b37c3c1d9e690d2b262eb0c979dd6e574d663211ba4f6caf898bd42e140882a8e754c963bd0515c8eb502a609
DIST addressable-2.3.8.gem 99840 SHA256 a64ef127ac7b0ceed1324dfbccb478e8b0e4b272f6a53a8f11ffbe826a576394 SHA512 56c3f4b95a78af3b35fa0813cc0b010f89c698fefb0c79865af553ba5c2a162b936921de40b2659498812efc1692ed49e95f9984a044c0ed42f96a26b666b5fc WHIRLPOOL 537aa51973efe6c834f02b2bec884f1385132e4923ef633614ffc022c7b9a550ecc83b837aa0b6232f21a163006f7b6bbbdbe8b3df99c39c2008c493dd3c0546
+DIST addressable-2.4.0.gem 102400 SHA256 7abfff765571b0a73549c9a9d2f7e143979cd0c252f7fa4c81e7102a973ef656 SHA512 b81fa48e7c4188827c03ac93960b6fd6fb9f5a438f5243cddea39d6820ef756ee7c0086ec330dc4a3538008b3b254757af7d30248624127649cc006a2793eda8 WHIRLPOOL 6f245a158eb13b69add13a024421e88c8b4b5344f11b74bd95d9967fb265889e0123c63c041660d74994d08bcc18c345a34e91c45b20aef40ee5cbc5abfd80b7
diff --git a/dev-ruby/addressable/addressable-2.3.7.ebuild b/dev-ruby/addressable/addressable-2.4.0.ebuild
index 6d6a2014bc20..3673e263ed51 100644
--- a/dev-ruby/addressable/addressable-2.3.7.ebuild
+++ b/dev-ruby/addressable/addressable-2.4.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC="doc:yard"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -25,15 +25,20 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
IUSE="doc test"
ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
all_ruby_prepare() {
# Remove spec-related tasks so that we don't need to require rspec
# just to build the documentation, bug 383611.
sed -i -e '/spectask/d' Rakefile || die
- rm tasks/rspec.rake || die
- sed -i -e '/[Cc]overalls/d' spec/spec_helper.rb || die
+ rm -f tasks/rspec.rake || die
+ sed -i -e '/bundler/ s:^:#:' \
+ -e '/^begin/,/^end/ s:^:#:' \
+ spec/spec_helper.rb || die
# Remove specs requiring network connectivity
- rm spec/addressable/net_http_compat_spec.rb || die
+ rm -f spec/addressable/net_http_compat_spec.rb || die
+
+ # Remove spec that tests against an unreleased github fork
+ rm -f spec/addressable/rack_mount_compat_spec.rb || die
}
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
index 1a44dc9cdbaa..7855a3eeae01 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz"
LICENSE="LPPL-1.2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
DEPEND=">=sys-apps/sed-4
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2014.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2014.ebuild
index cafcd0ab05a2..4a00e8f008e6 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2014.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!=dev-texlive/texlive-latexextra-2007*
diff --git a/dev-texlive/texlive-context/texlive-context-2014.ebuild b/dev-texlive/texlive-context/texlive-context-2014.ebuild
index 830c001cce01..5b190e1ea74e 100644
--- a/dev-texlive/texlive-context/texlive-context-2014.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
LICENSE=" BSD GPL-1 GPL-2 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
>=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2014.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2014.ebuild
index 2c0fe28da134..7ee7f2c0f9d4 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2014.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Additional formats"
LICENSE=" GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
>=dev-texlive/texlive-xetex-2014
diff --git a/dev-texlive/texlive-games/texlive-games-2014.ebuild b/dev-texlive/texlive-games/texlive-games-2014.ebuild
index 83e9b4e643f0..dceb2d11e2a1 100644
--- a/dev-texlive/texlive-games/texlive-games-2014.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Games typesetting"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!<dev-texlive/texlive-latexextra-2009
diff --git a/dev-texlive/texlive-genericextra/texlive-genericextra-2014.ebuild b/dev-texlive/texlive-genericextra/texlive-genericextra-2014.ebuild
index 0a1299d5af73..635905a679e9 100644
--- a/dev-texlive/texlive-genericextra/texlive-genericextra-2014.ebuild
+++ b/dev-texlive/texlive-genericextra/texlive-genericextra-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Generic additional packages"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
"
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2014.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2014.ebuild
index 3de7e0507ff2..439044e9c46b 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2014.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Humanities packages"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!dev-tex/lineno
diff --git a/dev-texlive/texlive-music/texlive-music-2014.ebuild b/dev-texlive/texlive-music/texlive-music-2014.ebuild
index f41268732463..65549f203790 100644
--- a/dev-texlive/texlive-music/texlive-music-2014.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Music packages"
LICENSE=" GPL-1 GPL-2 LGPL-2.1 LPPL-1.2 LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!<app-text/texlive-core-2011
diff --git a/dev-texlive/texlive-omega/texlive-omega-2014.ebuild b/dev-texlive/texlive-omega/texlive-omega-2014.ebuild
index 15dabad5479a..eb26b175c98f 100644
--- a/dev-texlive/texlive-omega/texlive-omega-2014.ebuild
+++ b/dev-texlive/texlive-omega/texlive-omega-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Omega packages"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
>=dev-texlive/texlive-latex-2014
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2014.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2014.ebuild
index 5a3320d6c61c..725f8fbbd2e5 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2014.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive PSTricks"
LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.3 public-domain "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
>=dev-texlive/texlive-genericrecommended-2014
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2014.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2014.ebuild
index cfa3a9627f8a..2adb1c4018b1 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2014.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
LICENSE=" Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!<dev-texlive/texlive-latexextra-2014
diff --git a/dev-texlive/texlive-science/texlive-science-2014.ebuild b/dev-texlive/texlive-science/texlive-science-2014.ebuild
index b3f9a7e23a4c..4d3ea6b7143d 100644
--- a/dev-texlive/texlive-science/texlive-science-2014.ebuild
+++ b/dev-texlive/texlive-science/texlive-science-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Natural and computer sciences"
LICENSE=" GPL-1 GPL-2 LGPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2014
!dev-tex/SIunits
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2014.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2014.ebuild
index 3b1fd38f8c11..1910834884e1 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2014.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2014.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
LICENSE=" Apache-2.0 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 OFL public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2014
!=app-text/texlive-core-2007*
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 4c3b9c87ff68..05be4cc14a91 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -3,3 +3,4 @@ DIST bustle-0.4.2.tar.gz 95707 SHA256 bf03fb0a14a2559b6abe4cfeb673b30d86a31a89fb
DIST bustle-0.4.3.tar.gz 96970 SHA256 255e035a8b494f7edd21e657c246be00da1452faa2341abccebd53e8f333e9d1 SHA512 263c929a38ffa8c0df03deb9736879d1fbc630f1dcd47183cc304495cb6d5d2fbdb01e4b83e25712ad13d57662d41d0eee35495b76ca52484b9b2352dfde1bdb WHIRLPOOL fe434e7468132e3ecca848bdc09db3bd6d3191ca7fb720fabab48e6181983e6a6facc437421ba4eaea3e17815ac0527e3c0bd648ff449f5fb02212c920c40ff4
DIST bustle-0.4.7.tar.gz 114231 SHA256 08b12207561157e639bc64e0b274e70e4909f50079cd97564c916d66a3f088b9 SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd WHIRLPOOL 8f6a80b881b9c13498351e2dc4910406dc151db9c320b8fba291c9577b41eede58003b943de13bf637d28226e7301e4dfdc8f2b6a0fa4fda2792962505fd0153
DIST bustle-0.5.1.tar.gz 118974 SHA256 06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6 SHA512 8e77cd82253ba935f4f7b1edae5ba7a99c65cbee2ce6e7d8df48f3182ee5dac92c9b3bc9826a04555de605fa4577c51d9fd027d9e1b92e8a8cf149c466c04e8f WHIRLPOOL f77ca6da883d1b296c049ec67119e3fdf6114a48bd5c2432059b01c80e9e68ef9d0dc9ecd45510e8d4b37620337718bc75e67bc6ac326de9a5302d03d9a2eb22
+DIST bustle-0.5.2.tar.gz 122249 SHA256 659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90 SHA512 a5e14dcf6b39ceb16c0d8b4182b1c49858f3a076edcb30fb4b1c41c3e994b595f89f130527243441ff3fc7b08a8e9dfd6587efc7db74b85c385c0a94d544553d WHIRLPOOL c1f9f128d34da2e1a47293a7276d1501ebb464b7bb7af2610e9b299f78b2cd73deedf45200f27c252891df25b4b41d1779e85dc794a9ccffd1c9d1d2271d0e88
diff --git a/dev-util/bustle/bustle-0.5.1.ebuild b/dev-util/bustle/bustle-0.5.1.ebuild
index 8be9e2d307da..8b01a1326114 100644
--- a/dev-util/bustle/bustle-0.5.1.ebuild
+++ b/dev-util/bustle/bustle-0.5.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="dev-haskell/cairo:=
dev-haskell/glib:=
>=dev-haskell/gtk3-0.13.7:0=
>=dev-haskell/hgettext-0.1.5:=
- dev-haskell/mtl:=
+ >=dev-haskell/mtl-2.2.1:=
dev-haskell/pango:=
dev-haskell/parsec:=
dev-haskell/pcap:=
diff --git a/dev-util/bustle/bustle-0.5.2.ebuild b/dev-util/bustle/bustle-0.5.2.ebuild
new file mode 100644
index 000000000000..8b01a1326114
--- /dev/null
+++ b/dev-util/bustle/bustle-0.5.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="interactivetests +threaded"
+
+RDEPEND="dev-haskell/cairo:=
+ >=dev-haskell/dbus-0.10:=
+ dev-haskell/gio:=
+ dev-haskell/glib:=
+ >=dev-haskell/gtk3-0.13.7:0=
+ >=dev-haskell/hgettext-0.1.5:=
+ >=dev-haskell/mtl-2.2.1:=
+ dev-haskell/pango:=
+ dev-haskell/parsec:=
+ dev-haskell/pcap:=
+ dev-haskell/setlocale:=
+ dev-haskell/text:=
+ >=dev-lang/ghc-7.4.1:=
+ dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ virtual/pkgconfig
+ test? ( dev-haskell/hunit
+ dev-haskell/quickcheck
+ dev-haskell/test-framework
+ dev-haskell/test-framework-hunit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag interactivetests interactivetests) \
+ $(cabal_flag threaded threaded)
+}
+
+src_compile() {
+ # compile haskell part
+ cabal_src_compile || die "could not build haskell parts"
+
+ # compile C part
+ emake \
+ "CC=$(tc-getCC)" \
+ "CFLAGS=${CFLAGS}" \
+ "CPPFLAGS=${CPPFLAGS}" \
+ "LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+ # install haskell part
+ cabal_src_install || die "could not install haskell parts"
+
+ dobin "${S}"/dist/build/bustle-pcap
+ doman bustle-pcap.1
+ dodoc README.md HACKING.md NEWS.md
+}
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 1480612111db..acc6d1434354 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,4 +1,3 @@
DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e WHIRLPOOL 32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
-DIST checkstyle-5.4-src.tar.gz 731222 SHA256 2c8b04a914a7835eaa355c058f7a4c52af308f8190d07fb3cbf9943cf751b8a8 SHA512 4f20fe8c48ea638c3390b07d94a54180663d939dce455b492ae19397ddf81e617f36e9aa4700e88c5081b7369a0e03d0d59bf2ee988325f15565fd66faadb5e6 WHIRLPOOL 5cd60912a4acf125c5a44ba35ed60d4e5acd7e48dfcd084195dbe30910d37f42b272f670c0e7f25406fdd95f9befd5c5cd42a27bfd2a7e62c7faa07b2bf612af
DIST checkstyle-5.5-src.tar.gz 744584 SHA256 0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a WHIRLPOOL e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
DIST checkstyle-src-4.4.tar.gz 2567907 SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 SHA512 4cce16b70e901bdcee0d3ac864f51cef54965d37223a11e59b7b9d34603b404da0cc8207431481feb5f0e649b5f55a5ef05aebfceeb37f938246f8722867174d WHIRLPOOL ae3b1f3161caac22235d20b018b035b4bf1e042f5fb930b620b6eae8692a1825fe382649a3d360794a8cb3d48135ea1e3e8597865ed10c0e868d9440e9287240
diff --git a/dev-util/checkstyle/checkstyle-5.4.ebuild b/dev-util/checkstyle/checkstyle-5.4.ebuild
deleted file mode 100644
index d96d2ef21ca1..000000000000
--- a/dev-util/checkstyle/checkstyle-5.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
-HOMEPAGE="http://checkstyle.sourceforge.net"
-SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
- https://dev.gentoo.org/~sera/distfiles/${P}-maven-build.xml.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
- dev-java/ant-core:0
- >=dev-java/antlr-2.7.7:0[java]
- dev-java/commons-beanutils:1.7
- dev-java/commons-cli:1
- dev-java/commons-logging:0
- dev-java/guava:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- dev-java/ant-nodeps:0
- test? (
- dev-java/ant-junit
- dev-java/junit:4
- )"
-
-java_prepare() {
- EPATCH_OPTS="-p1" epatch "${WORKDIR}"/maven-build.xml.patch
-
- # maven ant:ant can't handle it.
- pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
- java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
- popd > /dev/null
-}
-
-JAVA_PKG_BSFIX_NAME="maven-build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
-JAVA_ANT_ENCODING="iso-8859-1"
-
-EANT_BUILD_XML="maven-build.xml"
-EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
-EANT_BUILD_TARGET="package"
-EANT_ANT_TASKS="ant-nodeps"
-EANT_NEEDS_TOOLS="true"
-
-src_test() {
- EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-
- dodoc README
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/${PN}/com
-
- # Install check files
- insinto /usr/share/checkstyle/checks
- doins suppressions.xml sun_checks.xml import-control.xml checkstyle_checks.xml
-
- # Install extra files
- insinto /usr/share/checkstyle/contrib
- doins -r contrib/*
-
- java-pkg_dolauncher ${PN} \
- --main com.puppycrawl.tools.checkstyle.Main
-
- java-pkg_dolauncher ${PN}-gui \
- --main com.puppycrawl.tools.checkstyle.gui.Main
-}
diff --git a/dev-util/checkstyle/checkstyle-5.5.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index debd4ccf8d41..7a81a421c4c1 100644
--- a/dev-util/checkstyle/checkstyle-5.5.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
-HOMEPAGE="http://checkstyle.sourceforge.net"
+HOMEPAGE="https://github.com/checkstyle/checkstyle"
SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
https://dev.gentoo.org/~sera/distfiles/${PN}-5.4-maven-build.xml.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
COMMON_DEP="
dev-java/ant-core:0
- >=dev-java/antlr-2.7.7:0[java]
+ >=dev-java/antlr-2.7.7-r7:0
dev-java/commons-beanutils:1.7
dev-java/commons-cli:1
dev-java/commons-logging:0
- dev-java/guava:0"
+ dev-java/guava:18"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
+ >=virtual/jre-1.6"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
+ >=virtual/jdk-1.6
dev-java/ant-nodeps:0
test? (
dev-java/ant-junit
@@ -43,7 +43,7 @@ java_prepare() {
# maven ant:ant can't handle it.
pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
- java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
+ antlr java.g || die
popd > /dev/null
}
@@ -53,7 +53,7 @@ JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
JAVA_ANT_ENCODING="iso-8859-1"
EANT_BUILD_XML="maven-build.xml"
-EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
+EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava-18"
EANT_BUILD_TARGET="package"
EANT_ANT_TASKS="ant-nodeps"
EANT_NEEDS_TOOLS="true"
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 50815f446f26..f03b90f6aa86 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,2 +1,2 @@
-DIST cmdtest_0.10.orig.tar.gz 34152 SHA256 d9a421ed916213c5c6660a1057a560afff6e5c7606fe0e1cba3a359f66f23068 SHA512 da3e042c1c7d4379316fb6e3bc642a2e57fa12004434296c30f77debc7662bed49726057eb280461d18308739e86082fd96efe1642d1c531321b1c10f06d3595 WHIRLPOOL eadb47185a977d74ff046654b9845be9e49b859a88d10001f6eb809b1de8cb7697f840942dca100007ef00c98faafc9d7f127c9359108148372fd7175b88c509
DIST cmdtest_0.16.orig.tar.xz 32960 SHA256 3cd0e18f638b78a76f78e84d48996ee7436f598832fc3e28380ac03db35afec6 SHA512 5be73dc1d71706ccf220dc91944d353e4745cd214b54977f0a8093bd540114747a78cf9f65c9ed926bcc0749839e3d9252a23d1ff3c1d05fbe87eceb4915bc26 WHIRLPOOL 4028340a9be5177a5b7ea2c805ca3df009719582d414e175734e53327212b2d4eb32c33834dcc61a0a38ef239249a55ebb7206201ca1142b953c1390455c2b6b
+DIST cmdtest_0.18.orig.tar.xz 33156 SHA256 b68addc8a21298a17a9ac02b439abf9a07bcf9916f3ce41804a2348526110e19 SHA512 b5eb9d58401a93fa31cded35338e734a50cacc6af93423b020912a4b1c63d7bf9e35c588ad47678a0395aca6d4dfda76af7c92fbaf41884d542055a04f6406b7 WHIRLPOOL 2d03c4f554efa6bb8c714976af60dbc559bad17dcfd1dd65bfc491a1b16983a01ab1fb17d2e53a67bb29dc79f992de363288f473dc09c54f3162ae8ce9f2f975
diff --git a/dev-util/cmdtest/cmdtest-0.10.ebuild b/dev-util/cmdtest/cmdtest-0.18.ebuild
index c90222e27e0a..f9176a6de537 100644
--- a/dev-util/cmdtest/cmdtest-0.10.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.18.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="black box tests Unix command line tools"
HOMEPAGE="http://liw.fi/cmdtest/"
-SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
LICENSE="GPL-3"
SLOT="0"
@@ -18,8 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
DEPEND="
${PYTHON_DEPS}
- dev-python/cliapp
- dev-python/ttystatus
+ dev-python/cliapp[${PYTHON_USEDEP}]
+ dev-python/ttystatus[${PYTHON_USEDEP}]
"
src_compile() {
diff --git a/dev-util/dialog/dialog-1.2.20150920.ebuild b/dev-util/dialog/dialog-1.2.20150920.ebuild
index 16d108ed816a..fa2c987675e3 100644
--- a/dev-util/dialog/dialog-1.2.20150920.ebuild
+++ b/dev-util/dialog/dialog-1.2.20150920.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 205c5ae3a835..2e7efdee1c1e 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,3 +1 @@
-DIST dwdiff-2.0.10.tar.bz2 76285 SHA256 67c4b9fbbbf8ea25335a07c7f4107028649dcd04136a3904778c7a767b843f6f SHA512 670ab12560e3aa98f44a9cd53e87ba8c553807f7864190f9da6db59cc3b152fdb486429b7316e9d0a58d61afc478353924330e984218da52d5017cb6932a6ee7 WHIRLPOOL cad6313439bb885987d593eb6058022937f6370e5ef3151bbdcd341179a033184a16e62f8ad9d606f812d02da90718c513017bba1688d8cb57cbb1bae6c989c3
-DIST dwdiff-2.0.9.tgz 86521 SHA256 c1c9217825ad3fac9936129cc26b73fa5479fb079e5c34522fc7066e74e31ef8 SHA512 73fe43dcc7ba6d3a4e773c7a8b117c359c0470b7b00d7f5bd53781dd046e06b5e02c5adfc7f877bc4ded289a767de3849bacea7cf03883f72046c2d0e7877f1b WHIRLPOOL 9054ef46bfa1f767a2fa64e195afaa7150d2895e99c7bb63cb9380463ce72d5d2e0e9bac336fb677d1a7dfd4c97f98f3e3541a267e1c4ea7096e6f61c4e09b0c
DIST dwdiff-2.1.0.tar.bz2 79224 SHA256 45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021 WHIRLPOOL 74ceba5cc7c20e0ab6ee09b62f7e8b07a1b8321bbe60ca7c3791c35176ba7137ddf17b1c471ff5ac0586ad0455e67968c71bf00f2de7cb137720b88a85c8f181
diff --git a/dev-util/dwdiff/dwdiff-2.0.10.ebuild b/dev-util/dwdiff/dwdiff-2.0.10.ebuild
deleted file mode 100644
index c217f2b6370e..000000000000
--- a/dev-util/dwdiff/dwdiff-2.0.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
- sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- sed -i \
- -e '/INSTALL/s:COPYING::' \
- Makefile.in || die
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- $(use_with nls gettext) || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.0.9.ebuild b/dev-util/dwdiff/dwdiff-2.0.9.ebuild
deleted file mode 100644
index a212df95bcf7..000000000000
--- a/dev-util/dwdiff/dwdiff-2.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
-HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-SRC_URI="http://os.ghalkes.nl/dist/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
- sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- sed -i \
- -e '/INSTALL/s:COPYING::' \
- Makefile.in || die
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- $(use_with nls gettext) || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index c217f2b6370e..6eabe8531034 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="nls"
COMMON_DEPEND="dev-libs/icu:="
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 21abdbf124ea..c86c49e31ab3 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1 +1,2 @@
DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2
+DIST pkgconf-0.9.12.tar.bz2 87109 SHA256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f SHA512 efe13db7a46992eb44ead493fc12b3fc6a5567e0206f701b6c48d9b5eb0bc90fcc9ae7a7e08ae641bb10df869287e5b68291701d4013d6cf27bd2b1518c29192 WHIRLPOOL 9fa7336e111f29648f5c37310bdeb2266bead1b86ff18183cfb57c06054916d235da20a5723bd364497d20a1f4db399eaf77f38c0bfc1519f2b7b825ab4666d0
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 94288df8b186..938c704a8aa3 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>jdhore@gentoo.org</email>
- <name>Jeff Horelick</name>
- </maintainer>
- <use>
- <flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
- <flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of non-standard pkg-config invocations.</flag>
- </use>
- <upstream>
- <remote-id type="github">pkgconf/pkgconf</remote-id>
- </upstream>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>jdhore@gentoo.org</email>
+ <name>Jeff Horelick</name>
+ </maintainer>
+ <maintainer>
+ <email>elizabeth@interlinked.me</email>
+ <name>Elizabeth Myers</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <use>
+ <flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
+ <flag name="strict">Adhere to POSIX pkg-config specification. Useful for finding uses of
+non-standard pkg-config invocations</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">pkgconf/pkgconf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
new file mode 100644
index 000000000000..ebc4c7f9922a
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/pkgconf/pkgconf.git"
+ inherit autotools git-2 multilib-minimal
+else
+ inherit eutils multilib-minimal
+ SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0"
+IUSE="+pkg-config strict"
+
+RESTRICT="test" # at least until 0.9.13
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ pkg-config? (
+ !dev-util/pkgconfig
+ !dev-util/pkg-config-lite
+ !dev-util/pkgconfig-openbsd[pkg-config]
+ )"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pkgconf
+)
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+
+ if use pkg-config; then
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/pkg-config
+ )
+ fi
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf $(use_enable strict)
+}
+
+multilib_src_install() {
+ default
+ use pkg-config \
+ && dosym pkgconf /usr/bin/pkg-config \
+ || rm "${ED}"/usr/share/aclocal/pkg.m4 \
+ || die
+}
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
index df481840f382..1ee3b3c78746 100644
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@@ -1,3 +1,4 @@
DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 SHA256 1d7054b49195b598d469a2d56971f67aa219c6043cb8209f8c8608160c4df7ad SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a WHIRLPOOL f584d8d6e129f5464f9eb44ab7137e230dc0b701e07d3569a7975e35a5ecc2a4f6b81e085486f36867b00a9715e1e25b5cd29294c638abe195f4a60677aa61f9
DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 SHA256 d3e9efe1176d979dc0fe2a9457f70068b5a3fd23635a07bcd5639e2345897aca SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb WHIRLPOOL 8007d41e9695c6ae5c3094906ebc6fba263d8d005f6763ce70eb4398db266ea1aff64bc4bc24bc216d0e869e839a92298bb3f85f8149608dd2986d36a3863def
-DIST scala-SDK-4.1.1-vfinal-2.11-linux.gtk.x86_64.tar.gz 234952144 SHA256 8cafc34e8456224dcfd23b0405af8f50ae1cc03587d5efbd1ec27082a7b797c1 SHA512 e44ea7d6d9d03ef1631fb839a63453870997309861bfe25434c256730b3fa28c7eb392489140473e4844a49e64f009d88093f501d8fe19f8d2e5e06bf36c437a WHIRLPOOL d614acb12faa7e56671ff74fe60f5044e94e5ef51c983fd916e74b76c2a23e0e34cf640f4063590f371e5129e82c5928cf955fbaadf36ec5caa6615205cfa978
+DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 SHA256 3f46b5576e72f8555b322bf8a1ff8357372c5ec159f9171f2d81f78c5d753f78 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d WHIRLPOOL 05756a8be2e23d50a84ea36a786f5b442c18da94e40b14c199c034880b226e0fdd8a06f4c2fbfa7238c5ab4343ea68bf71ea91830f05cd7226aba40d5389c05c
+DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 SHA256 bc6b9289ab318a4eb7e273a2990351cc051a00051b208192591c0a6fad5da20d SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5 WHIRLPOOL 11dddf53d364864198629dfefdc84202fc19876d325e7738488402b7614faa5d6b88e8f2867810c854e9110fd3596043529a2e6f588107af519ae807a9d711d8
diff --git a/dev-util/scala-ide/scala-ide-4.1.1.ebuild b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
index ec041844cb71..d42e6d0d566d 100644
--- a/dev-util/scala-ide/scala-ide-4.1.1.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
@@ -11,8 +11,8 @@ S_PACK="${PN/-/}-pack"
# scala-ide -> scala-SDK-${PV}
S_SDK="${PN%-*}-SDK-${PV}"
-SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20150728/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20150728/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86.tar.gz"
DESCRIPTION="The Scala IDE"
HOMEPAGE="http://www.scala-ide.org"
diff --git a/dev-vcs/qbzr/qbzr-0.23.1.ebuild b/dev-vcs/qbzr/qbzr-0.23.1.ebuild
index 87bbc46126eb..b627fa5acf0c 100644
--- a/dev-vcs/qbzr/qbzr-0.23.1.ebuild
+++ b/dev-vcs/qbzr/qbzr-0.23.1.ebuild
@@ -33,8 +33,6 @@ src_test() {
}
pkg_postinst() {
- distutils_pkg_postinst
-
elog
elog "To enable spellchecking in qcommit, please, install >=dev-python/pyenchant-1.5.0"
elog " # emerge -a >=dev-python/pyenchant-1.5.0"
diff --git a/eclass/.gitignore b/eclass/.gitignore
new file mode 100644
index 000000000000..5d06cd46646e
--- /dev/null
+++ b/eclass/.gitignore
@@ -0,0 +1 @@
+*.5
diff --git a/eclass/emboss-r1.eclass b/eclass/emboss-r1.eclass
index 3a494b9b0686..2b58de68a2cd 100644
--- a/eclass/emboss-r1.eclass
+++ b/eclass/emboss-r1.eclass
@@ -26,11 +26,12 @@
# inherit emboss-r1
# @ECLASS-VARIABLE: EBO_DESCRIPTION
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Should be set. Completes the generic description of the embassy module as follows:
#
-# EMBOSS integrated version of ${EBO_DESCRIPTION},
-# e.g.
+# EMBOSS integrated version of ${EBO_DESCRIPTION}, e.g.
+#
# "EMBOSS integrated version of applications from the CBS group"
#
# Defaults to the upstream name of the module.
@@ -80,7 +81,7 @@ if [[ ${PN} == embassy-* ]]; then
S="${WORKDIR}"/${EF}
fi
-# @FUNCTION: emboss_src_prepare
+# @FUNCTION: emboss-r1_src_prepare
# @DESCRIPTION:
# Does the following things
#
@@ -96,7 +97,7 @@ emboss-r1_src_prepare() {
autotools-utils_src_prepare
}
-# @FUNCTION: emboss_src_configure
+# @FUNCTION: emboss-r1_src_configure
# @DESCRIPTION:
# runs econf with following options.
#
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 0f50623e4ff0..b2cc679183d0 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -402,6 +402,10 @@ kde5_src_prepare() {
# only enable handbook when required
if ! use_if_iuse handbook ; then
comment_add_subdirectory ${KDE_DOC_DIR}
+
+ if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
+ punt_bogus_dep KF5 DocTools
+ fi
fi
# enable only the requested translations
@@ -435,21 +439,11 @@ kde5_src_prepare() {
rm -rf po
fi
- # in frameworks, tests = manual tests so never
- # build them
+ # in frameworks, tests = manual tests so never build them
if [[ ${CATEGORY} = kde-frameworks ]]; then
comment_add_subdirectory tests
fi
- if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
- # only build unit tests when required
- if ! use_if_iuse test ; then
- comment_add_subdirectory autotests
- comment_add_subdirectory test
- comment_add_subdirectory tests
- fi
- fi
-
case ${KDE_PUNT_BOGUS_DEPS} in
false) ;;
*)
@@ -462,15 +456,18 @@ kde5_src_prepare() {
;;
esac
- if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
- if ! use_if_iuse handbook ; then
- punt_bogus_dep KF5 DocTools
- fi
- fi
-
- if [[ ${KDE_TEST} = forceoptional ]] ; then
- if ! use_if_iuse test ; then
+ # only build unit tests when required
+ if ! use_if_iuse test ; then
+ if [[ ${KDE_TEST} = forceoptional ]] ; then
punt_bogus_dep Qt5 Test
+ # if forceoptional, also cover non-kde categories
+ comment_add_subdirectory autotests
+ comment_add_subdirectory test
+ comment_add_subdirectory tests
+ elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
+ comment_add_subdirectory autotests
+ comment_add_subdirectory test
+ comment_add_subdirectory tests
fi
fi
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 5d27ed984a8f..db1ecfa58b17 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,6 +9,21 @@
# Original author: Martin Schlemmer <azarah@gentoo.org>
# @BLURB: This eclass can be used for packages that needs a working X environment to build.
+if [[ ! ${_VIRTUAL_X} ]]; then
+
+case "${EAPI:-0}" in
+ 0|1)
+ die "virtualx.eclass: EAPI ${EAPI} is too old."
+ ;;
+ 2|3|4|5|6)
+ ;;
+ *)
+ die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
+ ;;
+esac
+
+[[ ${EAPI} == [2345] ]] && inherit eutils
+
# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
# @DESCRIPTION:
# Variable specifying the dependency on xorg-server and xhost.
@@ -35,8 +50,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
# (within virtualmake function).
: ${VIRTUALX_COMMAND:="emake"}
-has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer."
-
case ${VIRTUALX_REQUIRED} in
manual)
;;
@@ -45,16 +58,18 @@ case ${VIRTUALX_REQUIRED} in
RDEPEND=""
;;
optional|tests)
+ [[ ${EAPI} == [2345] ]] \
+ || die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
# deprecated section YAY.
- ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
- ewarn "QA: You can drop the variable definition completely from ebuild,"
- ewarn "QA: because it is default behaviour."
+ eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
+ eqawarn "You can drop the variable definition completely from ebuild,"
+ eqawarn "because it is default behaviour."
if [[ -n ${VIRTUALX_USE} ]]; then
# so they like to specify the useflag
- ewarn "QA: VIRTUALX_USE variable is deprecated."
- ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
- ewarn "QA: to achieve the same behaviour."
+ eqawarn "VIRTUALX_USE variable is deprecated."
+ eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
+ eqawarn "to achieve the same behaviour."
fi
[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
@@ -76,21 +91,73 @@ esac
virtualmake() {
debug-print-function ${FUNCNAME} "$@"
- local i=0
- local retval=0
- local OLD_SANDBOX_ON="${SANDBOX_ON}"
- local XVFB=$(type -p Xvfb)
- local XHOST=$(type -p xhost)
- local xvfbargs="-screen 0 1280x1024x24"
+ [[ ${EAPI} == [2345] ]] \
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
# backcompat for maketype
if [[ -n ${maketype} ]]; then
- ewarn "QA: ebuild is exporting \$maketype=${maketype}"
- ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead."
- ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now."
+ [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5"
+ eqawarn "ebuild is exporting \$maketype=${maketype}"
+ eqawarn "Ebuild should be migrated to use 'virtx command' instead."
VIRTUALX_COMMAND=${maketype}
fi
+ virtx "${VIRTUALX_COMMAND}" "${@}"
+}
+
+
+# @FUNCTION: virtx
+# @USAGE: <command> [command arguments]
+# @DESCRIPTION:
+# Start new Xvfb session and run commands in it.
+#
+# IMPORTANT: The command is run nonfatal !!!
+#
+# This means we are checking for the return code and raise an exception if it
+# isn't 0. So you need to make sure that all commands return a proper
+# code and not just die. All eclass function used should support nonfatal
+# calls properly.
+#
+# The rational behind this is the tear down of the started Xfvb session. A
+# straight die would leave a running session behind.
+#
+# Example:
+#
+# @CODE
+# src_test() {
+# virtx default
+# }
+# @CODE
+#
+# @CODE
+# python_test() {
+# virtx py.test --verbose
+# }
+# @CODE
+#
+# @CODE
+# my_test() {
+# some_command
+# return $?
+# }
+#
+# src_test() {
+# virtx my_test
+# }
+# @CODE
+virtx() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument"
+
+ local i=0
+ local retval=0
+ local OLD_SANDBOX_ON="${SANDBOX_ON}"
+ local XVFB XHOST XDISPLAY
+ local xvfbargs="-screen 0 1280x1024x24"
+ XVFB=$(type -p Xvfb) || die
+ XHOST=$(type -p xhost) || die
+
debug-print "${FUNCNAME}: running Xvfb hack"
export XAUTHORITY=
# The following is derived from Mandrake's hack to allow
@@ -140,10 +207,10 @@ virtualmake() {
# to kill Xvfb
debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
if has "${EAPI}" 2 3; then
- ${VIRTUALX_COMMAND} "$@"
+ "$@"
retval=$?
else
- nonfatal ${VIRTUALX_COMMAND} "$@"
+ nonfatal "$@"
retval=$?
fi
@@ -163,8 +230,11 @@ virtualmake() {
Xmake() {
debug-print-function ${FUNCNAME} "$@"
- ewarn "QA: you should not execute make directly"
- ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make"
+ [[ ${EAPI} == [2345] ]] \
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
+
+ eqawarn "you should not execute make directly"
+ eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
}
@@ -174,6 +244,9 @@ Xmake() {
Xemake() {
debug-print-function ${FUNCNAME} "$@"
+ [[ ${EAPI} == [2345] ]] \
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
+
VIRTUALX_COMMAND="emake" virtualmake "$@"
}
@@ -183,5 +256,11 @@ Xemake() {
Xeconf() {
debug-print-function ${FUNCNAME} "$@"
+ [[ ${EAPI} == [2345] ]] \
+ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
+
VIRTUALX_COMMAND="econf" virtualmake "$@"
}
+
+_VIRTUAL_X=1
+fi
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
index 9cd076a14a16..c0be00dca798 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
LICENSE="DUKE3D gog? ( GOG-EULA )"
SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~x86"
+KEYWORDS="amd64 hppa ppc ~x86"
IUSE="gog"
REQUIRED_USE="^^ ( cdinstall gog )"
RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index dbf50112c886..8dba97c9ca4a 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="demo"
RDEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-roguelike/angband/angband-4.0.3.ebuild b/games-roguelike/angband/angband-4.0.3.ebuild
index a8a4ff6d2d8c..da72dbb28f08 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE="ncurses sdl +sound X"
RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
index 6f2c43b980eb..09e19d87b63c 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2"
LICENSE="GPL-2 Apache-2.0 FDL-1.3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index 080e59e17445..9727e0fd0e6f 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="dbus dedicated doc fribidi nls server"
RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
index 21ddf8d91819..e5c5bc398271 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
IUSE="bzip2 geoip nls"
RDEPEND="x11-libs/gtk+:2
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
new file mode 100644
index 000000000000..795f5cf5261e
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+bluetooth +cdr cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+# Note to developers:
+# This is a wrapper for the core apps tightly integrated with GNOME 3
+# gtk-engines:2 is still around because it's needed for gtk2 apps
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}[cups?]
+
+ >=gnome-base/gnome-session-${PV}
+ >=gnome-base/gnome-menus-3.10.1:3
+ >=gnome-base/gnome-settings-daemon-${PV}[cups?]
+ >=gnome-base/gnome-control-center-${PV}[cups?]
+
+ >=app-crypt/gcr-${PV}
+ >=gnome-base/nautilus-${PV}
+ >=gnome-base/gnome-keyring-${PV}
+ >=gnome-extra/evolution-data-server-3.18
+
+ >=app-crypt/seahorse-${PV}
+ >=app-editors/gedit-${PV}
+ >=app-text/evince-${PV}
+ >=gnome-extra/gnome-contacts-${PV}
+ >=media-gfx/eog-${PV}
+ >=media-video/totem-${PV}
+ >=net-im/empathy-3.12.11
+ >=x11-terms/gnome-terminal-${PV}
+
+ >=gnome-extra/gnome-user-docs-${PV}
+ >=gnome-extra/yelp-${PV}
+
+ >=x11-themes/adwaita-icon-theme-${PV}
+ >=x11-themes/gnome-themes-standard-${PV}
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
+ cdr? ( >=app-cdr/brasero-3.12.1 )
+
+ !gnome-base/gnome-applets
+"
+DEPEND=""
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
new file mode 100644
index 000000000000..1b3585689367
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="cups python"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME 3
+RDEPEND="
+ >=dev-libs/glib-2.46:2
+ >=x11-libs/gdk-pixbuf-2.32:2
+ >=x11-libs/pango-1.38
+ >=media-libs/clutter-1.24:1.0
+ >=x11-libs/gtk+-${PV}:3[cups?]
+ >=dev-libs/atk-2.18
+ >=x11-libs/libwnck-3.14:3
+ >=gnome-base/librsvg-2.40.10
+ >=gnome-base/gnome-desktop-${PV}:3
+ >=x11-libs/startup-notification-0.12
+
+ >=gnome-base/gvfs-1.26
+ >=gnome-base/dconf-0.24
+
+ || (
+ >=media-libs/gstreamer-0.10.36:0.10
+ >=media-libs/gstreamer-1.6.1:1.0 )
+ || (
+ >=media-libs/gst-plugins-base-0.10.36:0.10
+ >=media-libs/gst-plugins-base-1.6.1:1.0 )
+ || (
+ >=media-libs/gst-plugins-good-0.10.31:0.10
+ >=media-libs/gst-plugins-good-1.6.1:1.0 )
+
+ python? ( >=dev-python/pygobject-${PV}:3 )
+"
+DEPEND=""
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
new file mode 100644
index 000000000000..5aea7dc35347
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Sub-meta package for the applications of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+games +share +shotwell +tracker"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~x86"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME 3
+# New package
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}
+
+ >=app-admin/gnome-system-log-3.9.90
+ >=app-arch/file-roller-3.16.4
+ >=app-dicts/gnome-dictionary-${PV}
+ >=gnome-base/dconf-editor-${PV}
+ >=gnome-extra/gconf-editor-3
+ >=gnome-extra/gnome-calculator-${PV}
+ >=gnome-extra/gnome-power-manager-${PV}
+ >=gnome-extra/gnome-search-tool-3.6
+ >=gnome-extra/gnome-system-monitor-${PV}
+ >=gnome-extra/gnome-tweak-tool-${PV}
+ >=gnome-extra/gnome-weather-${PV}
+ >=gnome-extra/gucharmap-${PV}:2.90
+ >=gnome-extra/nautilus-sendto-3.8.2
+ >=gnome-extra/sushi-${PV}
+ >=mail-client/evolution-${PV}
+ >=media-gfx/gnome-font-viewer-3.16.2
+ >=media-gfx/gnome-screenshot-${PV}
+ >=media-sound/sound-juicer-${PV}
+ >=media-video/cheese-${PV}
+ >=net-analyzer/gnome-nettool-3.8
+ >=net-misc/vinagre-${PV}
+ >=net-misc/vino-${PV}
+ >=sys-apps/baobab-${PV}
+ >=sys-apps/gnome-disk-utility-${PV}
+ >=www-client/epiphany-${PV}
+
+ games? (
+ >=games-arcade/gnome-nibbles-${PV}
+ >=games-arcade/gnome-robots-${PV}
+ >=games-board/four-in-a-row-${PV}
+ >=games-board/gnome-chess-${PV}
+ >=games-board/gnome-mahjongg-${PV}
+ >=games-board/gnome-mines-${PV}
+ >=games-board/iagno-${PV}
+ >=games-board/tali-${PV}
+ >=games-puzzle/five-or-more-${PV}
+ >=games-puzzle/gnome-klotski-${PV}
+ >=games-puzzle/gnome-sudoku-${PV}
+ >=games-puzzle/gnome-taquin-${PV}
+ >=games-puzzle/gnome-tetravex-${PV}
+ >=games-puzzle/hitori-3.16.2
+ >=games-puzzle/lightsoff-${PV}
+ >=games-puzzle/quadrapassel-${PV}
+ >=games-puzzle/swell-foop-${PV} )
+ share? ( >=gnome-extra/gnome-user-share-${PV} )
+ shotwell? ( >=media-gfx/shotwell-0.22 )
+ tracker? (
+ >=app-misc/tracker-1.6
+ >=gnome-extra/gnome-documents-${PV}
+ >=media-gfx/gnome-photos-${PV}
+ >=media-sound/gnome-music-${PV} )
+"
+DEPEND=""
+S=${WORKDIR}
diff --git a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
new file mode 100644
index 000000000000..f6b30523afcf
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="2.0"
+IUSE="cups +gnome-shell"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# XXX: Note to developers:
+# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
+# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
+# any apps, but shouldn't be used by users unless they know what they are doing.
+RDEPEND="!gnome-base/gnome
+ >=gnome-base/gnome-core-libs-${PV}[cups?]
+
+ >=gnome-base/gnome-session-${PV}
+ >=gnome-base/gnome-menus-3.10.1:3
+ >=gnome-base/gnome-settings-daemon-${PV}[cups?]
+ >=gnome-base/gnome-control-center-${PV}[cups?]
+
+ >=gnome-base/nautilus-${PV}
+
+ gnome-shell? (
+ >=x11-wm/mutter-${PV}
+ >=gnome-base/gnome-shell-${PV} )
+
+ >=x11-themes/adwaita-icon-theme-${PV}
+ >=x11-themes/gnome-themes-standard-${PV}
+ >=x11-themes/gnome-backgrounds-${PV}
+
+ >=x11-terms/gnome-terminal-${PV}
+"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.26.0"
+S="${WORKDIR}"
+
+pkg_pretend() {
+ if ! use gnome-shell; then
+ # Users probably want to use e16, sawfish, etc
+ ewarn "You're installing neither GNOME Shell"
+ ewarn "You will have to install and manage a window manager by yourself"
+ fi
+}
+
+pkg_postinst() {
+ # Remember people where to find our project information
+ elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+ elog "for information about the project and documentation."
+}
diff --git a/gnome-base/gnome/gnome-3.18.0.ebuild b/gnome-base/gnome/gnome-3.18.0.ebuild
new file mode 100644
index 000000000000..16281a64ac21
--- /dev/null
+++ b/gnome-base/gnome/gnome-3.18.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Meta package for GNOME 3, merge this package to install"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="metapackage"
+SLOT="2.0" # Cannot be installed at the same time as gnome-2
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="accessibility +bluetooth +classic +cdr cups +extras"
+
+S=${WORKDIR}
+
+# TODO: check accessibility completeness
+# GDM-3.0 integrates very nicely with GNOME Shell
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}[cups?]
+ >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
+
+ >=gnome-base/gdm-${PV}
+
+ >=x11-wm/mutter-${PV}
+ >=gnome-base/gnome-shell-${PV}[bluetooth?]
+
+ >=x11-themes/gnome-backgrounds-${PV}
+ x11-themes/sound-theme-freedesktop
+
+ accessibility? (
+ >=app-accessibility/at-spi2-atk-2.18
+ >=app-accessibility/at-spi2-core-2.18
+ >=app-accessibility/caribou-0.4.19
+ >=app-accessibility/orca-${PV}
+ >=gnome-extra/mousetweaks-3.12.0 )
+ classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
+ extras? ( >=gnome-base/gnome-extra-apps-${PV} )
+"
+
+DEPEND=""
+
+PDEPEND=">=gnome-base/gvfs-1.26[udisks]"
+
+pkg_postinst() {
+ # Remember people where to find our project information
+ elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+ elog "for information about the project and documentation."
+}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
index 947d425dc395..414dbc695acf 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/appstream-glib
+ dev-util/gdbus-codegen
>=dev-util/intltool-0.40.6
sys-devel/gettext
virtual/pkgconfig
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
index f5e4d7927869..6161be99d601 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-libs/appstream-glib
+ dev-util/gdbus-codegen
>=dev-util/intltool-0.40.6
sys-devel/gettext
virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-1.6.9.ebuild b/media-gfx/darktable/darktable-1.6.9.ebuild
index 9bf8f076ffef..f0e7fe1a743c 100644
--- a/media-gfx/darktable/darktable-1.6.9.ebuild
+++ b/media-gfx/darktable/darktable-1.6.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
# TODO add lua once dev-lang/lua-5.2 is unmasked
IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
diff --git a/media-gfx/digikam/digikam-4.14.0.ebuild b/media-gfx/digikam/digikam-4.14.0.ebuild
index e244729a5db7..cf97a9539cab 100644
--- a/media-gfx/digikam/digikam-4.14.0.ebuild
+++ b/media-gfx/digikam/digikam-4.14.0.ebuild
@@ -25,6 +25,7 @@ SLOT="4"
IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
CDEPEND="
+ $(add_kdebase_dep kdelibs '' 4.14.14)
kde-apps/kdebase-kioslaves:4
kde-apps/libkdcraw:4=
kde-apps/libkexiv2:4=
diff --git a/media-gfx/gimp/gimp-2.9.2.ebuild b/media-gfx/gimp/gimp-2.9.2.ebuild
index 5f50d59edd51..b4da08a5cfaa 100644
--- a/media-gfx/gimp/gimp-2.9.2.ebuild
+++ b/media-gfx/gimp/gimp-2.9.2.ebuild
@@ -38,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
dev-libs/libxslt
x11-themes/hicolor-icon-theme
>=media-libs/babl-0.1.14
- >=media-libs/gegl-0.3.4:0.3
+ >=media-libs/gegl-0.3.4:0.3[cairo]
>=dev-libs/glib-2.43
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-gfx/inkscape/inkscape-0.91-r1.ebuild b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
new file mode 100644
index 000000000000..b4bc140d7462
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91-r1.ebuild
@@ -0,0 +1,166 @@
+# 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="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg lcms nls spell static-libs visio wpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+ || (
+ ( app-text/libwpg:0.3 dev-libs/librevenge )
+ ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+ )
+"
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=app-text/poppler-0.26.0:=[cairo]
+ >=dev-cpp/glibmm-2.28
+ >=dev-cpp/gtkmm-2.18.0:2.4
+ >=dev-cpp/cairomm-1.9.8
+ >=dev-cpp/glibmm-2.32
+ >=dev-libs/boehm-gc-6.4
+ >=dev-libs/glib-2.28
+ >=dev-libs/libsigc++-2.0.12
+ >=dev-libs/libxml2-2.6.20
+ >=dev-libs/libxslt-1.0.15
+ dev-libs/popt
+ dev-python/lxml[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libpng:0
+ sci-libs/gsl
+ x11-libs/libX11
+ >=x11-libs/gtk+-2.10.7:2
+ >=x11-libs/pango-1.24
+ cdr? (
+ media-libs/libcdr
+ ${WPG_DEPS}
+ )
+ dbus? ( dev-libs/dbus-glib )
+ exif? ( media-libs/libexif )
+ gnome? ( >=gnome-base/gnome-vfs-2.0 )
+ imagemagick? ( media-gfx/imagemagick:=[cxx] )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ spell? (
+ app-text/aspell
+ app-text/gtkspell:2
+ )
+ visio? (
+ media-libs/libvisio
+ ${WPG_DEPS}
+ )
+ wpg? ( ${WPG_DEPS} )
+"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+ dev-python/numpy[${PYTHON_USEDEP}]
+ media-gfx/uniconvertor
+ dia? ( app-office/dia )
+ postscript? ( app-text/ghostscript-gpl )
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.36
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+pkg_pretend() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-0.91_pre3-automagic.patch \
+ "${FILESDIR}"/${PN}-0.91_pre3-cppflags.patch \
+ "${FILESDIR}"/${PN}-0.91_pre3-desktop.patch \
+ "${FILESDIR}"/${PN}-0.91_pre3-exif.patch \
+ "${FILESDIR}"/${PN}-0.91_pre3-sk-man.patch \
+ "${FILESDIR}"/${PN}-0.48.4-epython.patch
+
+ sed -i "s#@EPYTHON@#${EPYTHON}#" src/extension/implementation/script.cpp || die
+
+ eautoreconf
+
+ # bug 421111
+ python_fix_shebang share/extensions
+}
+
+src_configure() {
+ # aliasing unsafe wrt #310393
+ append-flags -fno-strict-aliasing
+ # enable c++11 as needed for sigc++-2.6, #566318
+ # remove it when upstream solves the issue
+ # https://bugs.launchpad.net/inkscape/+bug/1488079
+ append-cxxflags -std=c++11
+
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable nls) \
+ $(use_enable openmp) \
+ $(use_enable exif) \
+ $(use_enable jpeg) \
+ $(use_enable lcms) \
+ --enable-poppler-cairo \
+ $(use_enable wpg) \
+ $(use_enable visio) \
+ $(use_enable cdr) \
+ $(use_enable dbus dbusapi) \
+ $(use_enable imagemagick magick) \
+ $(use_with gnome gnome-vfs) \
+ $(use_with inkjar) \
+ $(use_with spell gtkspell) \
+ $(use_with spell aspell)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+ python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
index afddc6d502f8..4466b3d5dfa3 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
@@ -8,7 +8,7 @@ inherit autotools eutils multilib versionator
MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-libs/lensfun/lensfun-0.3.1.ebuild b/media-libs/lensfun/lensfun-0.3.1.ebuild
index 089bc787ac2f..d1486719774e 100644
--- a/media-libs/lensfun/lensfun-0.3.1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
RDEPEND=">=dev-libs/glib-2.28
diff --git a/media-libs/libsndfile/libsndfile-1.0.26.ebuild b/media-libs/libsndfile/libsndfile-1.0.26.ebuild
index 0e85d4a3ffcb..e9175451236d 100644
--- a/media-libs/libsndfile/libsndfile-1.0.26.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.26.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs test"
RDEPEND="
diff --git a/media-libs/virglrenderer/Manifest b/media-libs/virglrenderer/Manifest
new file mode 100644
index 000000000000..02459ea19f28
--- /dev/null
+++ b/media-libs/virglrenderer/Manifest
@@ -0,0 +1 @@
+DIST virglrenderer-0.2.0.tar.xz 198544 SHA256 eab6d5bd99a6fab8930d5b5d4fa304d43b6e57d807a0354d982b49ccb53453c3 SHA512 c10db5693d86acc5f14ef6bcfda5187ffc23c779c4cf95f12539dd658ed876bf7924358573de3598a084753281ade25ace23f016d1d1defe7ce399e9e7ac81cb WHIRLPOOL 4b38b5bcb222112e21656f215e4aeba57d2a65a72b2a446262fbe998a83ac1ec8ae0a29ac3b50709586cae66f95bcfda4227270ff164f1a5152dfba79a2091dd
diff --git a/media-libs/virglrenderer/metadata.xml b/media-libs/virglrenderer/metadata.xml
new file mode 100644
index 000000000000..a4357d4d27da
--- /dev/null
+++ b/media-libs/virglrenderer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+<herd>qemu</herd>
+</pkgmetadata>
diff --git a/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
new file mode 100644
index 000000000000..e8dcd47738bf
--- /dev/null
+++ b/media-libs/virglrenderer/virglrenderer-0.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://people.freedesktop.org/~airlied/virglrenderer"
+ inherit git-2
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
+HOMEPAGE="https://virgil3d.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND=">=x11-libs/libdrm-2.4.50
+ media-libs/libepoxy"
+DEPEND="${RDEPEND}
+ >=x11-misc/util-macros-1.8
+ test? ( >=dev-libs/check-0.9.4 )"
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ default
+ find "${ED}"/usr -name 'lib*.la' -delete
+}
diff --git a/media-libs/virglrenderer/virglrenderer-9999.ebuild b/media-libs/virglrenderer/virglrenderer-9999.ebuild
new file mode 100644
index 000000000000..e8dcd47738bf
--- /dev/null
+++ b/media-libs/virglrenderer/virglrenderer-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://people.freedesktop.org/~airlied/virglrenderer"
+ inherit git-2
+else
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="library used implement a virtual 3D GPU used by qemu"
+HOMEPAGE="https://virgil3d.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND=">=x11-libs/libdrm-2.4.50
+ media-libs/libepoxy"
+DEPEND="${RDEPEND}
+ >=x11-misc/util-macros-1.8
+ test? ( >=dev-libs/check-0.9.4 )"
+
+src_prepare() {
+ [[ -e configure ]] || eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test tests)
+}
+
+src_install() {
+ default
+ find "${ED}"/usr -name 'lib*.la' -delete
+}
diff --git a/media-sound/forked-daapd/files/antlr-3.5.patch b/media-sound/forked-daapd/files/antlr-3.5.patch
new file mode 100644
index 000000000000..86461f3f0ba5
--- /dev/null
+++ b/media-sound/forked-daapd/files/antlr-3.5.patch
@@ -0,0 +1,81 @@
+From 7cf35d1e8bb8dedb710e4a60bada2739d60306d0 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 5 Oct 2015 23:10:45 +0100
+Subject: [PATCH 1/2] Allow ANTLR 3.5 to work
+
+This involves a harmless backwards-compatible adjustment to the
+grammar. I can't explain why this is necessary but this might help.
+
+http://stackoverflow.com/questions/20057063/follow-set-in-is-undefined-in-generated-parser
+---
+ src/RSP.g | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/RSP.g b/src/RSP.g
+index 435de16..6a27536 100644
+--- a/src/RSP.g
++++ b/src/RSP.g
+@@ -43,43 +43,43 @@ strcrit : FIELD strop STR -> ^(strop FIELD STR)
+ | FIELD NOT strop STR -> ^(NOT ^(strop FIELD STR))
+ ;
+
+-strop : EQUAL
+- | INCLUDES
+- | STARTSW
+- | ENDSW
++strop : equal=EQUAL
++ | includes=INCLUDES
++ | startsw=STARTSW
++ | endsw=ENDSW
+ ;
+
+ intcrit : FIELD intop INT -> ^(intop FIELD INT)
+ | FIELD NOT intop INT -> ^(NOT ^(intop FIELD INT))
+ ;
+
+-intop : EQUAL
+- | LESS
+- | GREATER
+- | LTE
+- | GTE
++intop : equal=EQUAL
++ | less=LESS
++ | greater=GREATER
++ | lte=LTE
++ | gte=GTE
+ ;
+
+ datecrit: FIELD dateop datespec -> ^(dateop FIELD datespec)
+ ;
+
+-dateop : BEFORE
+- | AFTER
++dateop : before=BEFORE
++ | after=AFTER
+ ;
+
+ datespec: dateref
+ | INT dateintval dateop dateref -> ^(dateop dateref INT dateintval)
+ ;
+
+-dateref : DATE
+- | TODAY
++dateref : date=DATE
++ | today=TODAY
+ ;
+
+ dateintval
+- : DAY
+- | WEEK
+- | MONTH
+- | YEAR
++ : day=DAY
++ | week=WEEK
++ | month=MONTH
++ | year=YEAR
+ ;
+
+ QUOTE : '"';
+--
+2.4.3
+
diff --git a/media-sound/forked-daapd/forked-daapd-23.2.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
index 1a759656c323..1217563090ea 100644
--- a/media-sound/forked-daapd/forked-daapd-23.2.ebuild
+++ b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
@@ -20,8 +20,8 @@ IUSE="alsa flac itunes lastfm mpd musepack"
# Note: mpd support appears to be standalone, e.g. --enable-mpd doesn't
# result in additional linkage.
RDEPEND="
- >=dev-libs/antlr-c-3.1.3
dev-db/sqlite:3
+ dev-libs/antlr-c:0
dev-libs/confuse
dev-libs/libevent
dev-libs/libgcrypt:0
@@ -38,8 +38,7 @@ RDEPEND="
"
DEPEND="
- dev-java/antlr:3
- virtual/jre
+ dev-java/antlr:3.5
${RDEPEND}
"
@@ -49,13 +48,17 @@ pkg_setup() {
}
src_prepare() {
- # Required until upstream accepts https://github.com/ejurgensen/forked-daapd/pull/179
+ # Fixed in 23.3.
epatch "${FILESDIR}/${P}-fix-arg-enable.patch"
+ # https://github.com/ejurgensen/forked-daapd/pull/185
+ epatch "${FILESDIR}/antlr-3.5.patch"
+
eautoreconf
}
src_configure() {
+ ac_cv_prog_ANTLR=antlr3.5 \
econf \
--with-alsa \
$(use_enable flac) \
diff --git a/media-video/smtube/metadata.xml b/media-video/smtube/metadata.xml
index f01a6499c241..62d433775c13 100644
--- a/media-video/smtube/metadata.xml
+++ b/media-video/smtube/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>dlcampbell@gmx.com</email>
+ <email>zlg@gentoo.org</email>
<name>Daniel Campbell</name>
</maintainer>
<longdescription lang="en">
diff --git a/media-video/smtube/smtube-15.11.0-r1.ebuild b/media-video/smtube/smtube-15.11.0-r1.ebuild
new file mode 100644
index 000000000000..09c86b89d61a
--- /dev/null
+++ b/media-video/smtube/smtube-15.11.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qt4-r2
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="qt5"
+
+# Deps in makefile seemed to be -core, -network, -script, -gui, -webkit, but the
+# given packages seem to be deprecated...
+DEPEND="qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 )
+ !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 )"
+RDEPEND="${DEPEND}
+ || ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )"
+
+src_prepare() {
+ eqmake4 src/${PN}.pro
+}
+
+gen_translation() {
+ lrelease ${PN}_${1}.ts
+ eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+ emake
+
+ cd "${S}"/src/translations
+ l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+ insinto /usr/share/${PN}/translations
+ doins "${S}"/src/translations/${PN}_${1}.qm
+ eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+ dobin ${PN}
+ domenu ${PN}.desktop
+ newicon icons/${PN}_64.png ${PN}.png
+ dodoc Changelog
+
+ l10n_for_each_locale_do install_locale
+}
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild
index 98b293537790..c29e335dc57f 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild
@@ -54,7 +54,7 @@ src_install() {
insinto /etc/openvas
doins "${FILESDIR}"/${MY_PN}-daemon.conf
- dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+ dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
insinto /etc/logrotate.d
doins "${FILESDIR}"/${MY_PN}.logrotate
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
index 95f1b5d9d48e..951133c19549 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
COMMON_DEPEND="
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
index c860d16a9166..9494548f024e 100644
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r1.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
@@ -22,6 +22,7 @@ IUSE=""
RDEPEND="
>=net-analyzer/openvas-libraries-8.0.5
>=dev-db/sqlite-3
+ dev-db/redis
!net-analyzer/openvas-administrator"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -52,7 +53,7 @@ src_install() {
insinto /etc/openvas/
doins "${FILESDIR}"/${MY_PN}-daemon.conf
- dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+ dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
insinto /etc/logrotate.d
newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
index d1ca7b5902e7..29a0bdbec786 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
@@ -59,7 +59,7 @@ src_install() {
insinto /etc/openvas
doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
- dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+ dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
insinto /etc/logrotate.d
doins "${FILESDIR}"/${MY_PN}.logrotate
diff --git a/net-analyzer/openvas/openvas-8.0.5.ebuild b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
index c6129d5979a6..921963be24db 100644
--- a/net-analyzer/openvas/openvas-8.0.5.ebuild
+++ b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
@@ -11,10 +11,11 @@ HOMEPAGE="http://www.openvas.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+pdf"
-DEPEND="
+RDEPEND="
+ dev-db/redis
>=net-analyzer/openvas-libraries-8.0.5
>=net-analyzer/openvas-scanner-5.0.4
>=net-analyzer/openvas-manager-6.0.6
@@ -25,7 +26,6 @@ DEPEND="
dev-texlive/texlive-latexextra
virtual/latex-base
)"
-RDEPEND="${DEPEND}"
S="${WORKDIR}"
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 89bbc9247957..d1570a79736b 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
+DIST accel-ppp-1.10.0.tar.bz2 1585702 SHA256 c990cc195e286d3c0f8063881489608e14f3f826d25ca4c0a4812c261fd9ef14 SHA512 140ff3cf9fb684624c1419946010701d902125ba02a1e931fd5a0083d706ffd32a88d491400e82661a17bd4aacfa07ad620acea0cf4f49816c1060ae184f1084 WHIRLPOOL 749b821e1fc3189f4e2a6979e3ee6e00890a3b72311502a42142f75d5f5afe7c913d2ac7b7bcff39de2b4e3c451c783d42a04be72fe37bec8803f8159845f4e2
DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256 a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512 d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0 WHIRLPOOL cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648
diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
new file mode 100644
index 000000000000..99772b58e979
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils linux-info linux-mod multilib
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+ snmp? ( net-analyzer/net-snmp )
+ dev-libs/libpcre
+ dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+ if use ipoe; then
+ linux-mod_pkg_setup
+ set_arch_to_kernel
+ else
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i -e "/mkdir/d" \
+ -e "/echo/d" \
+ -e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+ epatch_user
+}
+
+src_configure() {
+ local libdir="$(get_libdir)"
+ # There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+ local mycmakeargs=(
+ -DLIB_PATH_SUFFIX="${libdir#lib}"
+ -DBUILD_PPTP_DRIVER=FALSE
+ -DCRYPTO=OPENSSL
+ $(cmake-utils_use debug MEMDEBUG)
+ $(cmake-utils_use ipoe BUILD_IPOE_DRIVER)
+ $(cmake-utils_use postgres LOG_PGSQL)
+ $(cmake-utils_use radius RADIUS)
+ $(cmake-utils_use shaper SHAPER)
+ $(cmake-utils_use snmp NETSNMP)
+ $(cmake-utils_use valgrind VALGRIND)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ use doc && dodoc -r rfc
+
+ if use snmp; then
+ insinto /usr/share/snmp/mibs
+ doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+ fi
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+ dodir /var/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 6890878e999f..3b02d59255ab 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -7,6 +7,7 @@
<name>Sergey Popov</name>
</maintainer>
<use>
+ <flag name="ipoe">Build IPoE kernel module</flag>
<flag name="shaper">Support for traffic shaping</flag>
<flag name="valgrind">Compile in valgrind hints</flag>
</use>
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
index 51089d3dcf0d..20067194b3fd 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
IUSE="tk"
RDEPEND="
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index e969d31345dc..60f8369e5b64 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,4 +1,4 @@
DIST opendnssec-1.3.17.tar.gz 1140751 SHA256 9f0dcfb53a3e10255b2d85e6a30663548eca1ec2e900b7cd5db9329f1710e323 SHA512 6d3172cf5dc1bee1dbd14a5b9a8ada4ce3ebd954e2cd7adde664ac4b5e0cab81ed1cba2e2efeceacedf16f56d40a0874b73d7c844bbbbb6e1be1f8235a4c99f7 WHIRLPOOL 80e3a99dedb2ea1cc6a1d109bcf4e874cc9cc18abfaa233a2533f7a05b7129543cf2fbeaf6c6cde343755cacbca3125a4426c421805425204725f9ddcb156657
DIST opendnssec-1.3.18.tar.gz 1143889 SHA256 e61d23ae0cc57b6e09d408bade6872fe5241896c61a03e8bc5ceeb65df13a676 SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d WHIRLPOOL 7213b8f2f86651114449bc4734452d6065960e26ee289051949ca27ae3b23280cea45ff707f71942eef91c9009200272c0985ef3d3de43c9343ad2e1e54303ce
-DIST opendnssec-1.4.6.tar.gz 1014314 SHA256 53f9c454f331822925d76c9d9e5e7cb3fe2dfb03e3c467f67f9412f10d0fd5ec SHA512 c01e6e46e2007d0ae4035253484590d9a892be8284b179b6d3cdb0f8481789a67a79f9043d04de0aecc165fb44d88dac0eb02444f48e0ccd366f118a2bbb5c18 WHIRLPOOL 4535fb49879b27698b0ba88f05b2fd963c69829446a7d5eb8419c19768059347e0adfd1b59efe50b2acd5550758f499290e02ee52b1b92695e8f9061ad465bf0
DIST opendnssec-1.4.7.tar.gz 1038884 SHA256 8f757ca9e88d6a6dc8f9b6e46a3da5e3a2881b3311fb91c428bcf906683ac41f SHA512 def2a8e41331bd70f287ea3081a7368144ada92ad5cc9f62d28d3064e34f7c0c84998422d515f5ec9c7e668757e796df8c5446839e24e4a9e2af1357c342c0b2 WHIRLPOOL 37641549f4bb6ecb519a091e60537acf7fab69fc3482ab8857abd2ce57d8b5240031069d487246f88577ca32d48004b10a7784c10b4155b3339d67bd5567591a
+DIST opendnssec-1.4.8.2.tar.gz 1043171 SHA256 7fd553ee39173e807477ed1daff6ee2f8b1c83875cd2e52a1df3315bf0015513 SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06 WHIRLPOOL 38079a89d8e3d039aeab28c80b7fb1a9739014736d6076442c546fae1b13e1c89faa1858beb6f4d2f495d19a2a1187a7af10c55c0ed33563bc9b2d57945de807
diff --git a/net-dns/opendnssec/opendnssec-1.4.6.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
index 118902c8fc16..032caeaa0eb4 100644
--- a/net-dns/opendnssec/opendnssec-1.4.6.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index e52eac000c58..5d72036e49c8 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,3 +1,3 @@
DIST unbound-1.4.22.tar.gz 4735801 SHA256 1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f SHA512 0593cad3966f24f76b93bbc9c906c096c645e9360a57034c5ed4f04baeaa021eb9169a8e9cd0a98651c7a564d9feda8b9490e3b87ad469f6ce1dd1fcb05d9974 WHIRLPOOL 4de27d6c4548c46c83b95a7f21efd8d75898ddb92e3af84fbd1d07a39e29a121e593ddbf13676f914d4ee428942bf345c9b93937165725ece5031fc67ab9eacc
DIST unbound-1.5.1.tar.gz 4805176 SHA256 0ff82709fb2bd7ecbde8dbdcf60fa417d2b43379570a3d460193a76a169900ec SHA512 85d7069cf47709aceb7d9457c8befb1b327adfb098d8aa98082fc9bf710274e8ba86b56d796c86917639bb7e57ab5c40af1bc79090de038c6375be2c3877e0c4 WHIRLPOOL e23f7d399a1f01da5aec98ff0fa3b377e8a76789d237ceaf0e9146c96a97088716a0ec6c0f68f95f57af16743e73c1bc7209889a04a698bf7aa5d0706c7514f5
-DIST unbound-1.5.4.tar.gz 4844273 SHA256 a1e1c1a578cf8447cb51f6033714035736a0f04444854a983123c094cc6fb137 SHA512 af8032b09ce75bb1aefab31ce5583c0fa8aaca544e13d6d7eaea8e44a940b1797397951f06f453ef80653038b5966d6053ddeb79818a66825925186ee351c65c WHIRLPOOL 874bca4abe3ea246cfccd6f4bb8084026b82d1d1868aa365f1bc6075c2c625fb517f46f9c8282f1bc030f759bd0d0b26582e4288cf1a2cd7d88212a38590723d
+DIST unbound-1.5.6.tar.gz 4849569 SHA256 ad3823f5895f59da9e408ea273fcf81d8a76914c18864fba256d7f140b83e404 SHA512 2477e3f00b8f5a3a4661ff20b0bc0d1d56c8a65cc6ab9f1308ae86f41c67a998af68d3ac5ba6c9c22a25a251f0410eaf9fee82911bcb3a3e82ffb6383e28dcf7 WHIRLPOOL 72fd050bd49422783014549b4764f6279be7d4deec50ccf2a97e6cc2592f79d69a3f823ed0849dc3f685908c60234386820e01bde43d5db4c6c616e5e2dee44b
diff --git a/net-dns/unbound/unbound-1.5.4.ebuild b/net-dns/unbound/unbound-1.5.6.ebuild
index 9c2564cc9df4..9c2564cc9df4 100644
--- a/net-dns/unbound/unbound-1.5.4.ebuild
+++ b/net-dns/unbound/unbound-1.5.6.ebuild
diff --git a/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild b/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild
index 9980be17349a..b1d32a18873c 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.1.0.3599.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
inherit eutils base qt4-r2 multilib autotools
@@ -12,11 +12,13 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="libressl"
-DEPEND=">=dev-qt/qtgui-4.3:4
- dev-libs/openssl
- dev-libs/elfutils"
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/elfutils
+ >=dev-qt/qtgui-4.3:4"
RDEPEND="${DEPEND}"
PATCHES=(
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index e0cc9b545193..4d3d873ae56b 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,3 +1 @@
-DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 SHA512 3bec6bab4fe555612f1d48966e797202830f5254a8d2146a14d268ff0c68445af790285214db41ab08ee4888625e8e680c3b848c30789d836169d1612a25fe2c WHIRLPOOL 862d2bbf78aca8c9e01e00c995aeb3b662e1ea4a769081b9880a3fee7821ef5968e10fe75d9671268979188c7ca3b91d507a1fc9a097729d0648bc4c965e675d
-DIST ipsec-tools-0.8.1.tar.bz2 860717 SHA256 fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4 SHA512 c8308aba9764a8e0a0507dbc62e8e93dc4b51f7215f2c3bb50f2e7e1f46dde0c773cfe2992660ccd319523775a9bab668371ee53cd4af153d2fcf13a0ef4e1eb WHIRLPOOL b3e8743174f7a05ca028f47f5faa66286e397a50c68e7724568b89e5fd2eea76a903c3e77a144e772f913fd51a253466b93e10690125a87d643f186a9689476c
DIST ipsec-tools-0.8.2.tar.bz2 866465 SHA256 8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d SHA512 2b7d0efa908d3a699be7ef8b2b126a3809956cb7add50e8efb1cfdfc2d9b70c39ef517379cb9a4fad9e5f0c25937e98535b06c32bd3e729f5129da4ab133e30f WHIRLPOOL 16452a98d6c179913fc7acf8d92f8e9e6f5614c2ac0b798158c218bfb4f6c5228ffea426fe0b26774242b4f29477323de5a4e31a623d94d82b90184a6664c2ce
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild
deleted file mode 100644
index 927c65a3cb0a..000000000000
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools linux-info pam
-
-DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
-HOMEPAGE="http://ipsec-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
-
-RDEPEND="
- dev-libs/openssl
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
- readline? ( sys-libs/readline )
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-ipsec
- )"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- if ! has_version "net-misc/strongswan" &&
- ! has_version "net-misc/openswan" &&
- ! has_version "net-misc/libreswan"; then
- ewarn "We found an earlier version of ${PN} installed."
- ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
- ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
- ewarn "a conflict with net-misc/strongswan; bug #436144. We will"
- ewarn "rename this file for you with this upgrade. However, if"
- ewarn "you later downgrade, you'll have to rename the file to"
- ewarn "its orignal manually or change /etc/conf.d/racoon to point"
- ewarn "to the new file."
-
- if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then
- mv /etc/ipsec.conf /etc/ipsec-tools.conf
- else
- ewarn
- ewarn "Oops! I can't move ipsec.conf to ipsec-tools.conf!"
- ewarn "Either the former doesn't exist or the later does and"
- ewarn "I won't clobber it. Please fix this situation manually."
- fi
- else
- ewarn "You had both an earlier version of ${PN} and"
- ewarn "net-misc/strongswan installed. I can't tell whether"
- ewarn "the configuration file, ipsec.conf, belongs to one"
- ewarn "package or the other due to a file conflict; bug #436144."
- ewarn "The current version of ${PN} uses ipsec-tools.conf"
- ewarn "as its configuration file, as will future versions."
- ewarn "Please fix this situation manually."
- fi
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- get_version
-
- if linux_config_exists && kernel_is -ge 2 6 19; then
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- ewarn "Checking kernel configuration in /usr/src/linux or"
- ewarn "or /proc/config.gz for compatibility with ${PN}."
- ewarn "Here are the potential problems:"
- ewarn
-
- local nothing="1"
-
- # Check options for all flavors of IPSec
- local msg=""
- for i in XFRM_USER NET_KEY; do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "ALL IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
-
- # Check unencrypted IPSec
- if ! linux_chkconfig_present CRYPTO_NULL; then
- nothing="0"
- ewarn
- ewarn "Unencrypted IPSec may fail. CHECK:"
- ewarn " CRYPTO_NULL"
- fi
-
- # Check IPv4 IPSec
- msg=""
- for i in \
- INET_IPCOMP INET_AH INET_ESP \
- INET_XFRM_MODE_TRANSPORT \
- INET_XFRM_MODE_TUNNEL \
- INET_XFRM_MODE_BEET
- do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "IPv4 IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
-
- # Check IPv6 IPSec
- if use ipv6; then
- msg=""
- for i in INET6_IPCOMP INET6_AH INET6_ESP \
- INET6_XFRM_MODE_TRANSPORT \
- INET6_XFRM_MODE_TUNNEL \
- INET6_XFRM_MODE_BEET
- do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "IPv6 IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
- fi
-
- # Check IPSec behind NAT
- if use nat; then
- if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then
- nothing="0"
- ewarn
- ewarn "IPSec behind NAT may fail. CHECK:"
- ewarn " NETFILTER_XT_MATCH_POLICY"
- fi
- fi
-
- if [[ $nothing == "1" ]]; then
- ewarn "NO PROBLEMS FOUND"
- fi
-
- ewarn
- ewarn "WARNING: If your *configured* and *running* kernel"
- ewarn "differ either now or in the future, then these checks"
- ewarn "may lead to misleading results."
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- else
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "Make sure that your *running* kernel is/will be >=2.6.19."
- eerror "Building ${PN} now, assuming that you know what you're doing."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- fi
-}
-
-src_prepare() {
- # fix for bug #124813
- sed -i 's:-Werror::g' "${S}"/configure.ac || die
- # fix for building with gcc-4.6
- sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
-
- epatch "${FILESDIR}/${PN}-def-psk.patch"
- epatch "${FILESDIR}/${PN}-include-vendoridh.patch"
- epatch "${FILESDIR}"/${P}-sysctl.patch #425770
-
- AT_M4DIR="${S}" eautoreconf
-}
-
-src_configure() {
- #--with-{iconv,libradius} lead to "Broken getaddrinfo()"
- #--enable-samode-unspec is not supported in linux
- local myconf
- myconf="--with-kernel-headers=/usr/include \
- --enable-adminport \
- --enable-dependency-tracking \
- --enable-dpd \
- --enable-frag \
- --without-libiconv \
- --without-libradius \
- --disable-samode-unspec \
- $(use_enable idea) \
- $(use_enable ipv6) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap libldap) \
- $(use_enable nat natt) \
- $(use_with pam libpam) \
- $(use_enable rc5) \
- $(use_with readline) \
- $(use_enable selinux security-context) \
- $(use_enable stats)"
-
- use nat && myconf="${myconf} --enable-natt-versions=yes"
-
- # enable mode-cfg and xauth support
- if use pam; then
- myconf="${myconf} --enable-hybrid"
- else
- myconf="${myconf} $(use_enable hybrid)"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- keepdir /var/lib/racoon
- newconfd "${FILESDIR}"/racoon.conf.d-r1 racoon
- newinitd "${FILESDIR}"/racoon.init.d-r2 racoon
- use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
-
- insinto /etc
- doins "${FILESDIR}"/ipsec-tools.conf
- insinto /etc/racoon
- doins "${FILESDIR}"/racoon.conf
- doins "${FILESDIR}"/psk.txt
- chmod 400 "${D}"/etc/racoon/psk.txt
-
- dodoc ChangeLog README NEWS
- dodoc -r src/racoon/samples
- dodoc -r src/racoon/doc
- docinto samples
- newdoc src/setkey/sample.cf ipsec-tools.conf
-}
-
-pkg_postinst() {
- if use nat; then
- elog
- elog "You have enabled the nat traversal functionnality."
- elog "Nat versions wich are enabled by default are 00,02,rfc"
- elog "you can find those drafts in the CVS repository:"
- elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
- elog
- elog "If you feel brave enough and you know what you are"
- elog "doing, you can consider emerging this ebuild with"
- elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
- elog
- fi
-
- if use ldap; then
- elog
- elog "You have enabled ldap support with {$PN}."
- elog "The man page does NOT contain any information on it yet."
- elog "Consider using a more recent version or CVS."
- elog
- fi
-
- elog
- elog "Please have a look in /usr/share/doc/${P} and visit"
- elog "http://www.netbsd.org/Documentation/network/ipsec/"
- elog "to find more information on how to configure this tool."
- elog
-}
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.1-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.1-r1.ebuild
deleted file mode 100644
index 4ffffcaf24c8..000000000000
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools linux-info pam
-
-DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
-HOMEPAGE="http://ipsec-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
-
-RDEPEND="
- dev-libs/openssl
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
- readline? ( sys-libs/readline )
- selinux? (
- sys-libs/libselinux
- sec-policy/selinux-ipsec
- )"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30"
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- if ! has_version "net-misc/strongswan" &&
- ! has_version "net-misc/openswan" &&
- ! has_version "net-misc/libreswan"; then
- ewarn "We found an earlier version of ${PN} installed."
- ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
- ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
- ewarn "a conflict with net-misc/strongswan; bug #436144. We will"
- ewarn "rename this file for you with this upgrade. However, if"
- ewarn "you later downgrade, you'll have to rename the file to"
- ewarn "its orignal manually or change /etc/conf.d/racoon to point"
- ewarn "to the new file."
-
- if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then
- mv /etc/ipsec.conf /etc/ipsec-tools.conf
- else
- ewarn
- ewarn "Oops! I can't move ipsec.conf to ipsec-tools.conf!"
- ewarn "Either the former doesn't exist or the later does and"
- ewarn "I won't clobber it. Please fix this situation manually."
- fi
- else
- ewarn "You had both an earlier version of ${PN} and"
- ewarn "net-misc/strongswan installed. I can't tell whether"
- ewarn "the configuration file, ipsec.conf, belongs to one"
- ewarn "package or the other due to a file conflict; bug #436144."
- ewarn "The current version of ${PN} uses ipsec-tools.conf"
- ewarn "as its configuration file, as will future versions."
- ewarn "Please fix this situation manually."
- fi
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- get_version
-
- if linux_config_exists && kernel_is -ge 2 6 19; then
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- ewarn "Checking kernel configuration in /usr/src/linux or"
- ewarn "or /proc/config.gz for compatibility with ${PN}."
- ewarn "Here are the potential problems:"
- ewarn
-
- local nothing="1"
-
- # Check options for all flavors of IPSec
- local msg=""
- for i in XFRM_USER NET_KEY; do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "ALL IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
-
- # Check unencrypted IPSec
- if ! linux_chkconfig_present CRYPTO_NULL; then
- nothing="0"
- ewarn
- ewarn "Unencrypted IPSec may fail. CHECK:"
- ewarn " CRYPTO_NULL"
- fi
-
- # Check IPv4 IPSec
- msg=""
- for i in \
- INET_IPCOMP INET_AH INET_ESP \
- INET_XFRM_MODE_TRANSPORT \
- INET_XFRM_MODE_TUNNEL \
- INET_XFRM_MODE_BEET
- do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "IPv4 IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
-
- # Check IPv6 IPSec
- if use ipv6; then
- msg=""
- for i in INET6_IPCOMP INET6_AH INET6_ESP \
- INET6_XFRM_MODE_TRANSPORT \
- INET6_XFRM_MODE_TUNNEL \
- INET6_XFRM_MODE_BEET
- do
- if ! linux_chkconfig_present ${i}; then
- msg="${msg} ${i}"
- fi
- done
- if [[ ! -z "$msg" ]]; then
- nothing="0"
- ewarn
- ewarn "IPv6 IPSec may fail. CHECK:"
- ewarn "${msg}"
- fi
- fi
-
- # Check IPSec behind NAT
- if use nat; then
- if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then
- nothing="0"
- ewarn
- ewarn "IPSec behind NAT may fail. CHECK:"
- ewarn " NETFILTER_XT_MATCH_POLICY"
- fi
- fi
-
- if [[ $nothing == "1" ]]; then
- ewarn "NO PROBLEMS FOUND"
- fi
-
- ewarn
- ewarn "WARNING: If your *configured* and *running* kernel"
- ewarn "differ either now or in the future, then these checks"
- ewarn "may lead to misleading results."
- ewarn
- ewarn "\033[1;33m**************************************************\033[00m"
- ewarn
- else
- eerror
- eerror "\033[1;31m**************************************************\033[00m"
- eerror "Make sure that your *running* kernel is/will be >=2.6.19."
- eerror "Building ${PN} now, assuming that you know what you're doing."
- eerror "\033[1;31m**************************************************\033[00m"
- eerror
- fi
-}
-
-src_prepare() {
- # fix for bug #124813
- sed -i 's:-Werror::g' "${S}"/configure.ac || die
- # fix for building with gcc-4.6
- sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
-
- epatch "${FILESDIR}/${PN}-def-psk.patch"
- epatch "${FILESDIR}/${PN}-include-vendoridh.patch"
- epatch "${FILESDIR}"/${PN}-0.8.0-sysctl.patch #425770
-
- AT_M4DIR="${S}" eautoreconf
-}
-
-src_configure() {
- #--with-{libiconv,libradius} lead to "Broken getaddrinfo()"
- #--enable-samode-unspec is not supported in linux
- local myconf
- myconf="--with-kernel-headers=/usr/include \
- --enable-adminport \
- --enable-dependency-tracking \
- --enable-dpd \
- --enable-frag \
- --without-libiconv \
- --without-libradius \
- --disable-samode-unspec \
- $(use_enable idea) \
- $(use_enable ipv6) \
- $(use_enable kerberos gssapi) \
- $(use_with ldap libldap) \
- $(use_enable nat natt) \
- $(use_with pam libpam) \
- $(use_enable rc5) \
- $(use_with readline) \
- $(use_enable selinux security-context) \
- $(use_enable stats)"
-
- use nat && myconf="${myconf} --enable-natt-versions=yes"
-
- # enable mode-cfg and xauth support
- if use pam; then
- myconf="${myconf} --enable-hybrid"
- else
- myconf="${myconf} $(use_enable hybrid)"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- keepdir /var/lib/racoon
- newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
- newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
- use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
-
- insinto /etc
- doins "${FILESDIR}"/ipsec-tools.conf
- insinto /etc/racoon
- doins "${FILESDIR}"/racoon.conf
- doins "${FILESDIR}"/psk.txt
- chmod 400 "${D}"/etc/racoon/psk.txt
-
- dodoc ChangeLog README NEWS
- dodoc -r src/racoon/samples
- dodoc -r src/racoon/doc
- docinto samples
- newdoc src/setkey/sample.cf ipsec-tools.conf
-}
-
-pkg_postinst() {
- if use nat; then
- elog
- elog "You have enabled the nat traversal functionnality."
- elog "Nat versions wich are enabled by default are 00,02,rfc"
- elog "you can find those drafts in the CVS repository:"
- elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
- elog
- elog "If you feel brave enough and you know what you are"
- elog "doing, you can consider emerging this ebuild with"
- elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
- elog
- fi
-
- if use ldap; then
- elog
- elog "You have enabled ldap support with {$PN}."
- elog "The man page does NOT contain any information on it yet."
- elog "Consider using a more recent version or CVS."
- elog
- fi
-
- elog
- elog "Please have a look in /usr/share/doc/${P} and visit"
- elog "http://www.netbsd.org/Documentation/network/ipsec/"
- elog "to find more information on how to configure this tool."
- elog
-}
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r4.ebuild
index 8b0d549a6c07..829b05aa3864 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r4.ebuild
@@ -13,10 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux stats"
CDEPEND="
- dev-libs/openssl:0=
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( sys-libs/pam )
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 09cdbd84b0c6..2ceb54c7f5c4 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,3 +1 @@
-DIST davfs2-1.4.5.tar.gz 429635 SHA256 28f0ce00ddaf1ab93aa9f39db8d9f932d194c676bc21c3c8c3e2bea7f21274de SHA512 0fd20e8aba8d236feec06b3f2184388691ee19a4e993cf543a2356feb9c25e1de41521c462bd01497f89ff4d16d0d3defb3227a64c0a490db2c0647e1391c9d1 WHIRLPOOL 955d98c0a2b49d5400971b9381d05f87c21420a5b52a4ef1ec330cfd6d4f451e56a6fa884164ed84dabae06aa29010df66ccd6e048e932d30e01545257152e31
-DIST davfs2-1.4.7.tar.gz 444398 SHA256 50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044 SHA512 6754d08cdfcceea47a4248fb05a6f5a1907acbc9a6c0ab175dce640b160ee24b7efdf9da38be1cc8bd6dbb0825c88a7017a3534a7c3188860dcd1bef12a5d4ae WHIRLPOOL f4c44ccc1fbd146f563605b2290068b549f6dcf247224685f2efaf9cda91a947a45dceed17d3d585407dc8e4ffa85c933d6eb5b4e78e0f00bd18cfbd53f52c7d
DIST davfs2-1.5.2.tar.gz 464458 SHA256 be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358 SHA512 c912049e23b76bda19c2ae2d07bc2b1da7ed9bf82b338c57c0f9fb8a3144cbbb52a0e8f8c2f8996342c7aa434470d062996c30bbbe0f1c6623c81af6414fbb45 WHIRLPOOL b1147d93f188635293726cad27a5ef8f79ab4dd102c59143c7bffef26f513633ca16f4328b053cc4c430fa9112dbbf468e0d199695225bbe6ca8c9e92a96b633
diff --git a/net-fs/davfs2/davfs2-1.4.5-r1.ebuild b/net-fs/davfs2/davfs2-1.4.5-r1.ebuild
deleted file mode 100644
index bd443b7877ef..000000000000
--- a/net-fs/davfs2/davfs2-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils linux-mod user
-
-DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource"
-HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
-SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-libs/libxml2
- net-libs/neon
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup davfs2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-glibc212.patch
- sed -e "s/^NE_REQUIRE_VERSIONS.*29/& 30/" -i configure.ac
- eautoreconf
-}
-
-src_configure() {
- econf --enable-largefile
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO
-
- # Remove wrong locations created by install.
- rm -fr "${D}/usr/share/doc/davfs2"
- rm -fr "${D}/usr/share/davfs2"
-
- dodir /var/run/mount.davfs
- keepdir /var/run/mount.davfs
- fowners root:davfs2 /var/run/mount.davfs
- fperms 1774 /var/run/mount.davfs
-
- # Ignore nobody's home
- cat>>"${D}/etc/davfs2/davfs2.conf"<<EOF
-
-# nobody is a system account in Gentoo
-ignore_home nobody
-EOF
-}
-
-pkg_postinst() {
- elog
- elog "Quick setup:"
- elog " (as root)"
- elog " # gpasswd -a \${your_user} davfs2"
- elog " # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab"
- elog " (as user)"
- elog " # mkdir -p ~/dav"
- elog " \$ mount ~/dav"
- elog
-}
diff --git a/net-fs/davfs2/davfs2-1.4.7.ebuild b/net-fs/davfs2/davfs2-1.4.7.ebuild
deleted file mode 100644
index cde202570624..000000000000
--- a/net-fs/davfs2/davfs2-1.4.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils linux-mod user
-
-DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource"
-HOMEPAGE="http://savannah.nongnu.org/projects/davfs2"
-SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-libs/libxml2
- net-libs/neon
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup davfs2
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-destdir.patch # fixed in 1.4.7+ upstream
- sed -e "s/^NE_REQUIRE_VERSIONS.*29/& 30/" -i configure.ac
- eautoreconf
-}
-
-src_configure() {
- econf dav_user=nobody --enable-largefile --docdir=/usr/share/doc/${P}
-}
-
-src_compile() {
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-# dodoc AUTHORS BUGS ChangeLog FAQ NEWS README README.translators THANKS TODO
-
- dodir /var/run/mount.davfs
- keepdir /var/run/mount.davfs
- fowners root:davfs2 /var/run/mount.davfs
- fperms 1774 /var/run/mount.davfs
-
-}
-
-pkg_postinst() {
- elog
- elog "Quick setup:"
- elog " (as root)"
- elog " # gpasswd -a \${your_user} davfs2"
- elog " # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab"
- elog " (as user)"
- elog " # mkdir -p ~/dav"
- elog " \$ mount ~/dav"
- elog
-}
diff --git a/net-fs/davfs2/davfs2-1.5.2.ebuild b/net-fs/davfs2/davfs2-1.5.2.ebuild
index 2d41faa08bcf..1875eaf54bda 100644
--- a/net-fs/davfs2/davfs2-1.5.2.ebuild
+++ b/net-fs/davfs2/davfs2-1.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mirror.lihnidos.org/GNU/savannah/davfs2/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RESTRICT="test"
diff --git a/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch b/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch
deleted file mode 100644
index cd7cde3f26a0..000000000000
--- a/net-fs/davfs2/files/davfs2-1.4.5-glibc212.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/332865
-https://savannah.nongnu.org/bugs/?28916
-
---- src/dav_coda.c
-+++ src/dav_coda.c
-@@ -52,6 +52,9 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-
- #include "defaults.h"
- #include "mount_davfs.h"
---- src/dav_fuse.c
-+++ src/dav_fuse.c
-@@ -41,6 +41,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-
- #include "defaults.h"
- #include "mount_davfs.h"
---- src/kernel_interface.c
-+++ src/kernel_interface.c
-@@ -44,6 +44,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
---- src/webdav.c
-+++ src/webdav.c
-@@ -47,6 +47,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-
- #include <ne_alloc.h>
- #include <ne_auth.h>
diff --git a/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch b/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch
deleted file mode 100644
index 40dbd9585a23..000000000000
--- a/net-fs/davfs2/files/davfs2-1.4.7-destdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/384703
-Patch by Jeroen Roovers
-
-https://savannah.nongnu.org/support/?108104
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -51,8 +51,8 @@
- chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; \
- if test "$(sbindir)" != "$(ssbindir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(ssbindir); \
-- $(LN_S) -f $(DESTDIR)$(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
-- $(LN_S) -f $(DESTDIR)$(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
-+ $(LN_S) -f $(sbindir)/mount.davfs $(DESTDIR)$(ssbindir)/mount.davfs; \
-+ $(LN_S) -f $(sbindir)/umount.davfs $(DESTDIR)$(ssbindir)/umount.davfs; \
- fi
-
- uninstall-hook:
diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index af96e904b0fa..47ffd91fc06a 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 5de2b8e9a287..b378a733889f 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,9 +1,11 @@
DIST asterisk-11.17.1.tar.gz 35002041 SHA256 c22d5dfb6c901cdeb8a12ffb34c35565ccfd993d0c6ab7638fd11e5cd64e00b2 SHA512 cb7616d6868721bb91ff47a9601d81cce6e3670c6d484849a33fa58ff060a5a4993eb87cf0251baa88e63ba3b97a07c4a6ec3f6bab2980b087a9e140d2c9024e WHIRLPOOL f538ff11fc6d7c297a9a9a534d275132e7c84d41a9ffa2de8b1ffb2d596cf681ebed6f86001b1075d8cc648e7eee0f64af5dc4518ead41cf1ebec75a9b2f6535
DIST asterisk-11.18.0.tar.gz 34831035 SHA256 605b823e2362c543512a0af7427db123c3b846edf45bed722232cc35c8824b10 SHA512 cc7148443bd8d730c7a97489eae6c50b08eabe66301b1e6723a24719859ecf6a9499640899dbf8a8bb74cf89a58e61ccccdd9307ee65e67ed277a8ea56639839 WHIRLPOOL 82801b1a3e95d8962313cf7bb5dcf3ee66039e76438a2d2ba6b0cffef5dbeb8f50cacabfae99de083c2a2191a0de39a078bad984fc7e2c36c3b3b7bbb60f1a1f
DIST asterisk-11.19.0.tar.gz 34852510 SHA256 339f82f75dd15144a8de6f29aa5aa91e8e6a789dbfbd6c1283f345391505dc1e SHA512 6b790fdd075b4cb8da7b560afa55221fb02c382ccf295248039bf721dbe71f875592853853f9ce571bbba54ae843574b83423bc18a139c835e187b86972e1a1c WHIRLPOOL 6eb4426bf7f211a45f29a831d0ecdb104ec619a51554edd3ed6d81dbf3bdafc5df169db6b273aed385e797e74ee684e2d6348cce790760b39cdae38133d4b704
+DIST asterisk-11.20.0.tar.gz 34864289 SHA256 ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4 SHA512 179c5a11f70b2f5078002227be24e476570ee6a4afb387be852ece49f4cb4d11d523bf0b91e0aa4b5c7f0417e0db6066656200286802dd2c245d71e9e120b75c WHIRLPOOL 5a10505a30aed7f205fd4d1be04a0d852d31f5d3ddb43f5eb3c1332a6ad2573f71586037f8088f2b218eeed330d698551921ae6d4e499654606cda44ee383ae4
DIST asterisk-13.3.2.tar.gz 31978637 SHA256 ff87592a49156e2f7c03a39a12d099a610e71c3135ca9548429b4066fc76aaa5 SHA512 cfe2dec45d6162c0e9455de9a7a83b52c9041620b31c4fed835973c6a2805e9a51badc0637d6838dc52fbcceb01abb87f3fabddce1c8de3bd0f5ca65c5a39b06 WHIRLPOOL 3de98c03c8b0433a6072814724963c57cd1823d0f07a8bd6ca4d33cbe6c9a2f48ed7917db943fb37ac3c784de420178e625a6bedbf87eb7f92f425092e5b9148
DIST asterisk-13.4.0.tar.gz 32009886 SHA256 2049012665e99d2967b18d1594ae752307db7e967235877f1e058e6fb5b4c045 SHA512 5f6843d8a635e274bfae5ca5d5305f5764fa2cee3c6d83d73d681cd8a672aba6452d4deb0cbe9e3a61c657aab8563b0138b311ff6a8d42d28fce65c5dcad783a WHIRLPOOL 9d7b7f742ed0b42451663e1b2047ed46d09e0cf0b6b24d3a450fe59d60a5ee6dfac94331cb0fbfe522ca988c400e9e7947c24808b510695420929b4fd7553283
DIST asterisk-13.5.0.tar.gz 32107014 SHA256 e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b67e8b9 SHA512 b72e239fde2ae2fdae09b45573c10e76cfb4de8ccdaa182fae15f6f460c049c5e293181522002411fd91ffe12a36eb8dc7bcc8c82a2085501d7e9073d3cbc810 WHIRLPOOL e83bc925d0457b15497e83748dcb0c047a4982c103a390babee9d90eb4ade03ec5b1a65ecf0320fae04a5f4dd828515bfdce5e18926221729b4a1775385192ac
+DIST asterisk-13.6.0.tar.gz 32146107 SHA256 8a01b53c946d092ac561c11b404f68cd328306d0e3b434a7485a11d4b175005a SHA512 e6ba627d3bdeb8bba75d7b109012d08a8a3873cc63534bc140b5ba183bb1fe8125f6f746f6bdf046ae4751d9e9011dee4f7de91de44abfd7777a834525de178f WHIRLPOOL 7f8d1fb03d78c060f9b339084f430e561b9e9c43cd3065ccffc43075023eadde79ec07e3388c40a18d0effd36b71e52ec51e2118616535b86c06bfc5ecfe3617
DIST gentoo-asterisk-patchset-3.15.tar.bz2 5570 SHA256 c9c4fb87b9b57a55b034510a2847eeb145cce31ef3d8df75d92036f93daa54eb SHA512 c4c51e46abeaf4cb37ff9725159e3b73451f83d6d59d65ea173a29dae2270d0276d9af89ce8145e5ba1b117e37ae651df37713831a2f5ff38e7c8da58820e241 WHIRLPOOL 334c887ffe0fd2b681bc8bd79922f6049d2b98ffe998451b2175a22e7560d4e581d6786316202c18826591fe019790c2464df85afd356d5f8257f5238c75c401
DIST gentoo-asterisk-patchset-3.16.tar.bz2 5018 SHA256 9c393aba3272b19ae7c7d79302c288ddb6d6b0368c72fbbeda11569ab751be6d SHA512 83d0be42f935068afd130ecf6768355d6f9702238c829e1482135d320f99e6a2ad9dd39814ea139e8a8e9009ecb99a6b3d5ed5f2cc778353d03a09183d7a06a0 WHIRLPOOL cc6a032aaa781a4eb29f913578bd10245775d9915f5a934f7c2982f44cf063cf3030b764e628b6e17f4f023558fb50e73116a19c77738ae5e8de85c0c672dfd9
DIST gentoo-asterisk-patchset-4.01.tar.bz2 6483 SHA256 ecd6b5e495d73444b15bfea3d69541abe8bf68274e5a130547a56aa5cfc7f455 SHA512 541c992b578ede198e91a10d954c398396f7068c34cc94be163497d2aa279605c702e8969dd8eda67334055c4a537d0930a7e140a91ebbb4580fdaf43bf203c3 WHIRLPOOL e36c58bdd1f41d10976d3b1c4e9b08b0436d9652845bcbda59c62a4599d14d03dcd661a54cfd32a1e04daaf6df8ae18b087944dcf0ded403391780d5219e965e
diff --git a/net-misc/asterisk/asterisk-11.20.0.ebuild b/net-misc/asterisk/asterisk-11.20.0.ebuild
new file mode 100644
index 000000000000..b42638389ec4
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.20.0.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+ mirror://gentoo/gentoo-asterisk-patchset-3.16.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+ dev-libs/popt
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/ncurses:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ calendar? ( net-libs/neon
+ dev-libs/libical
+ dev-libs/iksemel )
+ caps? ( sys-libs/libcap )
+ cluster? ( sys-cluster/corosync )
+ curl? ( net-misc/curl )
+ dahdi? ( >=net-libs/libpri-1.4.12_beta2
+ net-misc/dahdi-tools )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ xmpp? ( dev-libs/iksemel )
+ ldap? ( net-nds/openldap )
+ libedit? ( dev-libs/libedit )
+ lua? ( dev-lang/lua:* )
+ mysql? ( virtual/mysql )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ osplookup? ( net-libs/osptoolkit )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp )
+ span? ( media-libs/spandsp )
+ speex? ( media-libs/speex )
+ srtp? ( net-libs/libsrtp )
+ vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+ !net-libs/openh323
+ !net-libs/pjsip
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ enewgroup asterisk
+ enewgroup dialout 20
+ enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+ base_src_prepare
+ AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+ local vmst
+
+ econf \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-ssl \
+ --with-z \
+ --without-pwlib \
+ $(use_with caps cap) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with portaudio)
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ menuselect/menuselect --disable chan_misdn menuselect.makeopts
+ menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ menuselect/menuselect --enable smsq menuselect.makeopts
+ menuselect/menuselect --enable streamplayer menuselect.makeopts
+ menuselect/menuselect --enable aelparse menuselect.makeopts
+ menuselect/menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+ menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+ menuselect/menuselect --enable func_aes menuselect.makeopts
+ menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ menuselect/menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ use_select alsa chan_alsa
+ use_select bluetooth chan_mobile
+ use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ use_select cluster res_corosync
+ use_select curl func_curl res_config_curl res_curl
+ use_select dahdi app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ use_select freetds {cdr,cel}_tds
+ use_select gtalk chan_motif
+ use_select http res_http_post
+ use_select iconv func_iconv
+ use_select xmpp res_xmpp
+ use_select ilbc codec_ilbc format_ilbc
+ use_select ldap res_config_ldap
+ use_select lua pbx_lua
+ use_select mysql app_mysql cdr_mysql res_config_mysql
+ use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ use_select osplookup app_osplookup
+ use_select oss chan_oss
+ use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ use_select radius {cdr,cel}_radius
+ use_select snmp res_snmp
+ use_select span res_fax_spandsp
+ use_select speex {codec,func}_speex
+ use_select srtp res_srtp
+ use_select syslog cdr_syslog
+ use_select vorbis format_ogg_vorbis
+
+ # Voicemail storage ...
+ for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+ if use ${vmst}; then
+ menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+ menuselect/menuselect --enable $o menuselect.makeopts
+ done
+ fi
+}
+
+src_compile() {
+ ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+ mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+ emake DESTDIR="${D}" installdirs
+ emake DESTDIR="${D}" install
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+ diropts -m 0750 -o root -g asterisk
+ keepdir /etc/asterisk
+ if use samples; then
+ emake DESTDIR="${D}" samples
+ for conffile in "${D}"etc/asterisk/*.*
+ do
+ chown root:root $conffile
+ chmod 0644 $conffile
+ done
+ einfo "Sample files have been installed"
+ else
+ einfo "Skipping installation of sample files..."
+ rm -f "${D}"var/lib/asterisk/mohmp3/* || die
+ rm -f "${D}"var/lib/asterisk/sounds/demo-* || die
+ rm -f "${D}"var/lib/asterisk/agi-bin/* || die
+ rm -f "${D}"etc/asterisk/* || die
+ fi
+ rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+ # keep directories
+ diropts -m 0770 -o asterisk asterisk
+ keepdir /var/lib/asterisk
+ keepdir /var/spool/asterisk
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+ newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # install the upgrade documentation
+ #
+ dodoc README UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ #
+ if use doc
+ then
+ dodoc doc/*.txt
+ dodoc doc/*.pdf
+ fi
+
+ # install SIP scripts; bug #300832
+ #
+ dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+ dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+ dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+ dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+ #
+ # Announcements, warnings, reminders...
+ #
+ einfo "Asterisk has been installed"
+ echo
+ elog "If you want to know more about asterisk, visit these sites:"
+ elog "http://www.asteriskdocs.org/"
+ elog "http://www.voip-info.org/wiki-Asterisk"
+ echo
+ elog "http://www.automated.it/guidetoasterisk.htm"
+ echo
+ elog "Gentoo VoIP IRC Channel:"
+ elog "#gentoo-voip @ irc.freenode.net"
+ echo
+ echo
+ elog "Please read the Asterisk 11 upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+ einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+ read tmp
+ tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+ if [[ "$tmp" = "y" ]] ||\
+ [[ "$tmp" = "yes" ]]
+ then
+ einfo "Resetting permissions to defaults..."
+
+ for x in spool run lib log; do
+ chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"var/${x}/asterisk
+ done
+
+ chown -R root:asterisk "${ROOT}"etc/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+ einfo "done"
+ else
+ einfo "skipping"
+ fi
+}
diff --git a/net-misc/asterisk/asterisk-13.6.0.ebuild b/net-misc/asterisk/asterisk-13.6.0.ebuild
new file mode 100644
index 000000000000..9cd18adbf02e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.6.0.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+ mirror://gentoo/gentoo-asterisk-patchset-4.02.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+ +voicemail_storage_file
+ voicemail_storage_odbc
+ voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+ ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+ voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+ dev-libs/popt
+ dev-libs/jansson
+ dev-libs/libxml2
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/ncurses:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ calendar? ( net-libs/neon
+ dev-libs/libical
+ dev-libs/iksemel )
+ caps? ( sys-libs/libcap )
+ cluster? ( sys-cluster/corosync )
+ curl? ( net-misc/curl )
+ dahdi? ( >=net-libs/libpri-1.4.12_beta2
+ net-misc/dahdi-tools )
+ freetds? ( dev-db/freetds )
+ gtalk? ( dev-libs/iksemel )
+ http? ( dev-libs/gmime:2.6 )
+ iconv? ( virtual/libiconv )
+ ilbc? ( dev-libs/ilbc-rfc3951 )
+ xmpp? ( dev-libs/iksemel )
+ ldap? ( net-nds/openldap )
+ libedit? ( dev-libs/libedit )
+ lua? ( dev-lang/lua:* )
+ mysql? ( virtual/mysql )
+ newt? ( dev-libs/newt )
+ odbc? ( dev-db/unixODBC )
+ osplookup? ( net-libs/osptoolkit )
+ portaudio? ( media-libs/portaudio )
+ postgres? ( dev-db/postgresql:* )
+ radius? ( net-dialup/freeradius-client )
+ snmp? ( net-analyzer/net-snmp )
+ span? ( media-libs/spandsp )
+ speex? ( media-libs/speex )
+ srtp? ( net-libs/libsrtp )
+ vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+ !net-libs/openh323
+ !net-libs/pjsip
+ voicemail_storage_imap? ( virtual/imap-c-client )
+ virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-asterisk )
+ syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+ net-misc/asterisk-extra-sounds
+ net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+ local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+ have reported that this module dropped critical SIP packets in their deployments. You
+ may want to disable it if you see such problems."
+ check_extra_config
+
+ enewgroup asterisk
+ enewgroup dialout 20
+ enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+ base_src_prepare
+ AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+ local vmst
+
+ econf \
+ --libdir="/usr/$(get_libdir)" \
+ --localstatedir="/var" \
+ --with-crypto \
+ --with-gsm=internal \
+ --with-popt \
+ --with-ssl \
+ --with-z \
+ --without-pwlib \
+ $(use_with caps cap) \
+ $(use_with http gmime) \
+ $(use_with newt) \
+ $(use_with portaudio)
+
+ # Blank out sounds/sounds.xml file to prevent
+ # asterisk from installing sounds files (we pull them in via
+ # asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+ >"${S}"/sounds/sounds.xml
+
+ # That NATIVE_ARCH chatter really is quite bothersome
+ sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+ # Compile menuselect binary for optional components
+ emake menuselect.makeopts
+
+ # Broken functionality is forcibly disabled (bug #360143)
+ menuselect/menuselect --disable chan_misdn menuselect.makeopts
+ menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+ # Utility set is forcibly enabled (bug #358001)
+ menuselect/menuselect --enable smsq menuselect.makeopts
+ menuselect/menuselect --enable streamplayer menuselect.makeopts
+ menuselect/menuselect --enable aelparse menuselect.makeopts
+ menuselect/menuselect --enable astman menuselect.makeopts
+
+ # this is connected, otherwise it would not find
+ # ast_pktccops_gate_alloc symbol
+ menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+ menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+ # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+ menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+ menuselect/menuselect --enable func_aes menuselect.makeopts
+ menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+ # SQlite3 is now the main database backend, enable related features
+ menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+ menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+ # The others are based on USE-flag settings
+ use_select() {
+ local state=$(use "$1" && echo enable || echo disable)
+ shift # remove use from parameters
+
+ while [[ -n $1 ]]; do
+ menuselect/menuselect --${state} "$1" menuselect.makeopts
+ shift
+ done
+ }
+
+ use_select alsa chan_alsa
+ use_select bluetooth chan_mobile
+ use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+ use_select cluster res_corosync
+ use_select curl func_curl res_config_curl res_curl
+ use_select dahdi app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+ use_select freetds {cdr,cel}_tds
+ use_select gtalk chan_motif
+ use_select http res_http_post
+ use_select iconv func_iconv
+ use_select xmpp res_xmpp
+ use_select ilbc codec_ilbc format_ilbc
+ use_select ldap res_config_ldap
+ use_select lua pbx_lua
+ use_select mysql app_mysql cdr_mysql res_config_mysql
+ use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+ use_select osplookup app_osplookup
+ use_select oss chan_oss
+ use_select postgres {cdr,cel}_pgsql res_config_pgsql
+ use_select radius {cdr,cel}_radius
+ use_select snmp res_snmp
+ use_select span res_fax_spandsp
+ use_select speex {codec,func}_speex
+ use_select srtp res_srtp
+ use_select syslog cdr_syslog
+ use_select vorbis format_ogg_vorbis
+
+ # Voicemail storage ...
+ for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+ if use ${vmst}; then
+ menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+ fi
+ done
+
+ if use debug; then
+ for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+ menuselect/menuselect --enable $o menuselect.makeopts
+ done
+ fi
+}
+
+src_compile() {
+ ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+ mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+ emake DESTDIR="${D}" installdirs
+ emake DESTDIR="${D}" install
+
+ if use radius; then
+ insinto /etc/radiusclient/
+ doins contrib/dictionary.digium
+ fi
+ diropts -m 0750 -o root -g asterisk
+ keepdir /etc/asterisk
+ if use samples; then
+ emake DESTDIR="${D}" samples
+ for conffile in "${D}"etc/asterisk/*.*
+ do
+ chown root:root $conffile
+ chmod 0644 $conffile
+ done
+ einfo "Sample files have been installed"
+ else
+ einfo "Skipping installation of sample files..."
+ rm -f "${D}"var/lib/asterisk/mohmp3/* || die
+ rm -f "${D}"var/lib/asterisk/sounds/demo-* || die
+ rm -f "${D}"var/lib/asterisk/agi-bin/* || die
+ rm -f "${D}"etc/asterisk/* || die
+ fi
+ rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+ # keep directories
+ diropts -m 0770 -o asterisk asterisk
+ keepdir /var/lib/asterisk
+ keepdir /var/spool/asterisk
+ keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+ diropts -m 0750 -o asterisk -g asterisk
+ keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+ newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+ newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+ systemd_dounit "${FILESDIR}"/asterisk.service
+ systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+ systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+ # install the upgrade documentation
+ #
+ dodoc README UPGRADE* BUGS CREDITS
+
+ # install extra documentation
+ #
+ if use doc
+ then
+ dodoc doc/*.txt
+ dodoc doc/*.pdf
+ fi
+
+ # install SIP scripts; bug #300832
+ #
+ dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+ dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+ dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+ dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+ # install logrotate snippet; bug #329281
+ #
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+ #
+ # Announcements, warnings, reminders...
+ #
+ einfo "Asterisk has been installed"
+ echo
+ elog "If you want to know more about asterisk, visit these sites:"
+ elog "http://www.asteriskdocs.org/"
+ elog "http://www.voip-info.org/wiki-Asterisk"
+ echo
+ elog "http://www.automated.it/guidetoasterisk.htm"
+ echo
+ elog "Gentoo VoIP IRC Channel:"
+ elog "#gentoo-voip @ irc.freenode.net"
+ echo
+ echo
+ elog "Please read the Asterisk 13 upgrade document:"
+ elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+ einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+ read tmp
+ tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+ if [[ "$tmp" = "y" ]] ||\
+ [[ "$tmp" = "yes" ]]
+ then
+ einfo "Resetting permissions to defaults..."
+
+ for x in spool run lib log; do
+ chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"var/${x}/asterisk
+ done
+
+ chown -R root:asterisk "${ROOT}"etc/asterisk
+ chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+ einfo "done"
+ else
+ einfo "skipping"
+ fi
+}
diff --git a/net-misc/chrony/chrony-2.2.ebuild b/net-misc/chrony/chrony-2.2.ebuild
index 3c13060cd30a..1dbf352e73df 100644
--- a/net-misc/chrony/chrony-2.2.ebuild
+++ b/net-misc/chrony/chrony-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 2fd607b84f60..45dd3922b4c1 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1 +1,2 @@
DIST cmst-2015.03.01.tar.gz 340176 SHA256 c97d0fe4ab2cfe822121514b8ba6200d4e733bb63f05f04cd17d0b53794d465c SHA512 4178ff101df007e4aab43514250036947b150623f3a45e36dcee7a37be75d2180ba44ee0fb66ecf7240990084d43ccacd4f59259595db91d94a4ea0d08845b77 WHIRLPOOL e6d253bcebb007fcf70d51534b729b4bcdb6c292e4d7b89ef0d702a4308308a4bf1837e24b0051939ee0dfe01bc38b57de9a3e6d6761a958725cc959b24a1565
+DIST cmst-2015.12.03.tar.gz 1137034 SHA256 a67bd61a7b30d262b5ba4ac0dc2fed4c11bb14e0d605ec9aeae453cefb446010 SHA512 7705d15e71fac5b951c14d187c7424ff5329a7b5621bb9f765c564fd268cd2925c8130410c4e66760bcc7214a1ecf4e3ff0c8242f1bdcda0c4a3b97d1645324f WHIRLPOOL 014444884f9e90034e012d19b3938bd41f64f106cda7e648c7d251d41c2755e75c8371b5728f549adbf4c499285f35636e0e019d4edaa99062328dfc52805143
diff --git a/net-misc/cmst/cmst-2015.12.03.ebuild b/net-misc/cmst/cmst-2015.12.03.ebuild
new file mode 100644
index 000000000000..799b5a1da88d
--- /dev/null
+++ b/net-misc/cmst/cmst-2015.12.03.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ sed -i misc/desktop/cmst.desktop \
+ -e 's/Version=1.1/Version=1.0/' \
+ -e '/Categories/ s/$/;/' || die
+
+ default
+}
+
+src_configure() {
+ export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+ eqmake5
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ rm -r "${D}"/usr/share/licenses || die
+}
diff --git a/net-misc/curl/curl-7.45.0.ebuild b/net-misc/curl/curl-7.45.0.ebuild
index f3058ebf42ef..9b8c77be2b8b 100644
--- a/net-misc/curl/curl-7.45.0.ebuild
+++ b/net-misc/curl/curl-7.45.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
IUSE+=" elibc_Winnt"
diff --git a/net-misc/icaclient/icaclient-13.2.0.322243.ebuild b/net-misc/icaclient/icaclient-13.2.0.322243.ebuild
index 2727de733eeb..1d48d2a0700a 100644
--- a/net-misc/icaclient/icaclient-13.2.0.322243.ebuild
+++ b/net-misc/icaclient/icaclient-13.2.0.322243.ebuild
@@ -54,19 +54,23 @@ RDEPEND="dev-libs/atk
x11-terms/xterm"
DEPEND=""
-if use amd64 ; then
- ICAARCH=linuxx64
-elif use x86 ; then
- ICAARCH=linuxx86
-fi
-S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-
pkg_nofetch() {
elog "Download the client file ${A} from
http://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-13-2.html"
elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
}
+src_unpack() {
+ default
+
+ if use amd64 ; then
+ ICAARCH=linuxx64
+ elif use x86 ; then
+ ICAARCH=linuxx86
+ fi
+ S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
src_install() {
dodir "${ICAROOT}"
diff --git a/net-misc/icaclient/icaclient-13.2.1.328635.ebuild b/net-misc/icaclient/icaclient-13.2.1.328635.ebuild
index 8175699fd0de..ed5a5aea95ac 100644
--- a/net-misc/icaclient/icaclient-13.2.1.328635.ebuild
+++ b/net-misc/icaclient/icaclient-13.2.1.328635.ebuild
@@ -54,19 +54,23 @@ RDEPEND="dev-libs/atk
x11-terms/xterm"
DEPEND=""
-if use amd64 ; then
- ICAARCH=linuxx64
-elif use x86 ; then
- ICAARCH=linuxx86
-fi
-S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
-
pkg_nofetch() {
elog "Download the client file ${A} from
http://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html"
elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
}
+src_unpack() {
+ default
+
+ if use amd64 ; then
+ ICAARCH=linuxx64
+ elif use x86 ; then
+ ICAARCH=linuxx86
+ fi
+ S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
src_install() {
dodir "${ICAROOT}"
diff --git a/net-misc/ntp/ntp-4.2.8_p4-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p4-r1.ebuild
new file mode 100644
index 000000000000..c4e395e0ec23
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p4-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+ mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks read