summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/checkrestart/metadata.xml3
-rw-r--r--app-admin/checksec/Manifest1
-rw-r--r--app-admin/checksec/checksec-1.7.2.ebuild30
-rw-r--r--app-admin/checksec/files/checksec-1.7.2-path.patch24
-rw-r--r--app-admin/checksec/metadata.xml (renamed from dev-java/jpf/metadata.xml)8
-rw-r--r--app-admin/collectd/collectd-5.4.1-r2.ebuild8
-rw-r--r--app-admin/collectd/collectd-5.5.0.ebuild15
-rw-r--r--app-admin/collectd/files/collectd-5.5.0-lt.patch35
-rw-r--r--app-admin/collectd/metadata.xml1
-rw-r--r--app-admin/fifo-cronolog/metadata.xml3
-rw-r--r--app-admin/hddtemp/files/hddgentoo.db1
-rw-r--r--app-admin/puppet-agent/Manifest14
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild65
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild76
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.4.ebuild77
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.5.ebuild77
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.6.ebuild77
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild97
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.3.0.ebuild97
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.3.1.ebuild97
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.3.2.ebuild4
-rw-r--r--app-admin/puppetdb/Manifest4
-rw-r--r--app-admin/puppetdb/puppetdb-3.0.1.ebuild91
-rw-r--r--app-admin/puppetdb/puppetdb-3.0.2.ebuild91
-rw-r--r--app-admin/puppetdb/puppetdb-3.1.0.ebuild91
-rw-r--r--app-admin/puppetdb/puppetdb-3.2.0.ebuild91
-rw-r--r--app-admin/puppetdb/puppetdb-3.2.2.ebuild2
-rw-r--r--app-admin/puppetserver/Manifest2
-rw-r--r--app-admin/puppetserver/puppetserver-2.1.2.ebuild104
-rw-r--r--app-admin/puppetserver/puppetserver-2.2.0.ebuild104
-rw-r--r--app-admin/puppetserver/puppetserver-2.2.1.ebuild2
-rw-r--r--app-admin/qtpass/Manifest1
-rw-r--r--app-admin/qtpass/metadata.xml18
-rw-r--r--app-admin/qtpass/qtpass-1.0.5.ebuild62
-rw-r--r--app-arch/rar/rar-5.3.0.ebuild2
-rw-r--r--app-backup/backintime/backintime-1.1.8-r1.ebuild2
-rw-r--r--app-backup/duplicity/duplicity-0.6.26.ebuild2
-rw-r--r--app-backup/obnam/obnam-1.18.2-r1.ebuild4
-rw-r--r--app-backup/obnam/obnam-1.18.2-r2.ebuild51
-rw-r--r--app-dicts/mecab-unidic/Manifest1
-rw-r--r--app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild19
-rw-r--r--app-dicts/mecab-unidic/metadata.xml (renamed from app-text/epubcheck/metadata.xml)6
-rw-r--r--app-dicts/myspell-de/Manifest3
-rw-r--r--app-dicts/myspell-de/myspell-de-2015.12.28.ebuild55
-rw-r--r--app-editors/kile/kile-2.1.3-r2.ebuild (renamed from app-editors/kile/kile-2.1.3-r1.ebuild)2
-rw-r--r--app-emulation/libvirt/files/libvirtd.init-r1635
-rw-r--r--app-emulation/libvirt/libvirt-1.3.0-r1.ebuild384
-rw-r--r--app-emulation/lxd/Manifest2
-rw-r--r--app-emulation/lxd/files/lxd-0.26-dont-go-get.patch (renamed from app-emulation/lxd/files/lxd-0.23-dont-go-get.patch)8
-rw-r--r--app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch (renamed from app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch)0
-rw-r--r--app-emulation/lxd/files/lxd-0.26.confd (renamed from app-emulation/lxd/files/lxd-0.23.confd)0
-rw-r--r--app-emulation/lxd/files/lxd-0.26.initd (renamed from app-emulation/lxd/files/lxd-0.23.initd)8
-rw-r--r--app-emulation/lxd/lxd-0.26.ebuild (renamed from app-emulation/lxd/lxd-0.23.ebuild)2
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild6
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild6
-rw-r--r--app-emulation/xen-tools/Manifest7
-rw-r--r--app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild391
-rw-r--r--app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild391
-rw-r--r--app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild6
-rw-r--r--app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild6
-rw-r--r--app-emulation/xen/Manifest5
-rw-r--r--app-emulation/xen/metadata.xml1
-rw-r--r--app-emulation/xen/xen-4.2.5-r11.ebuild167
-rw-r--r--app-emulation/xen/xen-4.2.5-r12.ebuild170
-rw-r--r--app-emulation/xen/xen-4.5.2-r3.ebuild2
-rw-r--r--app-emulation/xen/xen-4.6.0-r5.ebuild2
-rw-r--r--app-eselect/eselect-php/Manifest2
-rw-r--r--app-eselect/eselect-php/eselect-php-0.8.0.ebuild38
-rw-r--r--app-eselect/eselect-php/eselect-php-0.8.1.ebuild54
-rw-r--r--app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild (renamed from app-eselect/eselect-php/eselect-php-0.8.2.ebuild)3
-rw-r--r--app-eselect/eselect-php/files/70_mod_php5.backcompat.conf28
-rw-r--r--app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild2
-rw-r--r--app-misc/abook/Manifest1
-rw-r--r--app-misc/abook/abook-0.6.0_pre2.ebuild7
-rw-r--r--app-misc/abook/abook-0.6.1.ebuild47
-rw-r--r--app-misc/anki/anki-2.0.33.ebuild2
-rw-r--r--app-misc/c_rehash/c_rehash-1.7-r1.ebuild2
-rw-r--r--app-misc/carbon-c-relay/Manifest2
-rw-r--r--app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild (renamed from app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild)2
-rw-r--r--app-misc/chkcrontab/Manifest1
-rw-r--r--app-misc/chkcrontab/chkcrontab-1.6.ebuild27
-rw-r--r--app-misc/chkcrontab/metadata.xml13
-rw-r--r--app-misc/elasticsearch/Manifest1
-rw-r--r--app-misc/elasticsearch/elasticsearch-2.1.1.ebuild62
-rw-r--r--app-misc/lirc/lirc-0.9.0-r2.ebuild427
-rw-r--r--app-misc/lirc/lirc-0.9.0-r3.ebuild429
-rw-r--r--app-misc/lirc/lirc-0.9.0-r4.ebuild431
-rw-r--r--app-misc/lirc/lirc-0.9.0-r5.ebuild8
-rw-r--r--app-misc/taskd/taskd-1.1.0-r1.ebuild4
-rw-r--r--app-portage/eix/Manifest1
-rw-r--r--app-portage/eix/eix-0.30.10.ebuild4
-rw-r--r--app-portage/eix/eix-0.30.11.ebuild4
-rw-r--r--app-portage/eix/eix-0.30.4.ebuild4
-rw-r--r--app-portage/eix/eix-0.30.7.ebuild4
-rw-r--r--app-portage/eix/eix-0.30.8.ebuild4
-rw-r--r--app-portage/eix/eix-0.31.1.ebuild4
-rw-r--r--app-portage/eix/eix-0.31.2.ebuild2
-rw-r--r--app-portage/eix/eix-0.31.3.ebuild2
-rw-r--r--app-portage/eix/eix-0.31.4.ebuild2
-rw-r--r--app-portage/eix/eix-0.31.5.ebuild71
-rw-r--r--app-shells/bash/Manifest2
-rw-r--r--app-shells/bash/bash-4.3_p42-r1.ebuild (renamed from app-shells/bash/bash-4.3_p42.ebuild)2
-rw-r--r--app-shells/push/Manifest1
-rw-r--r--app-shells/push/push-1.8.ebuild21
-rw-r--r--app-text/blogc/Manifest2
-rw-r--r--app-text/blogc/blogc-0.6.ebuild (renamed from app-text/blogc/blogc-0.5.1.ebuild)0
-rw-r--r--app-text/epubcheck/Manifest1
-rw-r--r--app-text/epubcheck/epubcheck-1.1.ebuild55
-rw-r--r--app-text/highlight/Manifest1
-rw-r--r--app-text/highlight/highlight-3.25.ebuild66
-rw-r--r--dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild2
-rw-r--r--dev-java/css-validator/Manifest1
-rw-r--r--dev-java/css-validator/css-validator-20120222.ebuild78
-rw-r--r--dev-java/css-validator/files/css-validator-20120222-build.xml.patch37
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r4.ebuild71
-rw-r--r--dev-java/dom4j/dom4j-1.6.1-r5.ebuild27
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild4
-rw-r--r--dev-java/icedtea-web/icedtea-web-1.6.1.ebuild2
-rw-r--r--dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild2
-rw-r--r--dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild2
-rw-r--r--dev-java/jaxen/Manifest1
-rw-r--r--dev-java/jaxen/jaxen-1.1.6.ebuild37
-rw-r--r--dev-java/jdom/Manifest1
-rw-r--r--dev-java/jdom/jdom-1.1.3.ebuild14
-rw-r--r--dev-java/jdom/jdom-2.0.6-r4.ebuild24
-rw-r--r--dev-java/jdom/jdom-2.0.6.ebuild76
-rw-r--r--dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild11
-rw-r--r--dev-java/jigsaw/Manifest1
-rw-r--r--dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch48
-rw-r--r--dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild68
-rw-r--r--dev-java/jpf/Manifest1
-rw-r--r--dev-java/jpf/jpf-1.5.1.ebuild47
-rw-r--r--dev-java/jpfcodegen/Manifest1
-rw-r--r--dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild36
-rw-r--r--dev-java/jpfcodegen/metadata.xml8
-rw-r--r--dev-java/mg4j/Manifest1
-rw-r--r--dev-java/mg4j/files/mg4j-build.patch56
-rw-r--r--dev-java/mg4j/metadata.xml17
-rw-r--r--dev-java/mg4j/mg4j-0.9.1-r2.ebuild45
-rw-r--r--dev-java/milton-api/Manifest3
-rw-r--r--dev-java/milton-api/milton-api-2.5.1.5.ebuild33
-rw-r--r--dev-java/milton-api/milton-api-2.7.1.3.ebuild (renamed from dev-java/milton-api/milton-api-2.6.5.5.ebuild)14
-rw-r--r--dev-java/milton-mail-api/Manifest2
-rw-r--r--dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild (renamed from dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild)20
-rw-r--r--dev-java/oracle-javamail/Manifest1
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild45
-rw-r--r--dev-java/webgraph/Manifest1
-rw-r--r--dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch36
-rw-r--r--dev-java/webgraph/metadata.xml11
-rw-r--r--dev-java/webgraph/webgraph-1.4.1-r1.ebuild53
-rw-r--r--dev-java/wstx/wstx-3.2.9-r1.ebuild17
-rw-r--r--dev-java/wstx/wstx-3.2.9.ebuild64
-rw-r--r--dev-java/xstream/xstream-1.3.1-r3.ebuild84
-rw-r--r--dev-java/xstream/xstream-1.3.1-r4.ebuild33
-rw-r--r--dev-lang/R/Manifest1
-rw-r--r--dev-lang/R/R-3.2.3.ebuild206
-rw-r--r--dev-lang/lua/lua-5.1.4-r8.ebuild12
-rw-r--r--dev-lang/lua/lua-5.1.5-r100.ebuild8
-rw-r--r--dev-lang/lua/lua-5.1.5-r3.ebuild8
-rw-r--r--dev-lang/lua/lua-5.2.3-r1.ebuild8
-rw-r--r--dev-lang/luajit/luajit-2.0.4.ebuild2
-rw-r--r--dev-lang/python/python-2.7.10-r3.ebuild353
-rw-r--r--dev-lang/python/python-2.7.10-r5.ebuild375
-rw-r--r--dev-lang/python/python-2.7.11-r2.ebuild (renamed from dev-lang/python/python-2.7.11-r1.ebuild)2
-rw-r--r--dev-lang/python/python-3.3.5-r1.ebuild328
-rw-r--r--dev-lang/python/python-3.3.5-r2.ebuild16
-rw-r--r--dev-lang/python/python-3.4.3-r1.ebuild (renamed from dev-lang/python/python-3.4.3.ebuild)2
-rw-r--r--dev-lang/python/python-3.4.3-r2.ebuild313
-rw-r--r--dev-lang/python/python-3.5.0-r2.ebuild (renamed from dev-lang/python/python-3.5.0-r1.ebuild)2
-rw-r--r--dev-lang/python/python-3.5.0-r5.ebuild353
-rw-r--r--dev-libs/cloog/cloog-0.18.4.ebuild2
-rw-r--r--dev-libs/glib/glib-2.46.2-r1.ebuild1
-rw-r--r--dev-libs/injeqt/injeqt-1.0.0.ebuild2
-rw-r--r--dev-libs/isl/isl-0.15.ebuild2
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild2
-rw-r--r--dev-libs/libindicate/libindicate-12.10.1-r2.ebuild8
-rw-r--r--dev-libs/libintl/libintl-0.19.6.ebuild2
-rw-r--r--dev-libs/liblinear/liblinear-210-r1.ebuild2
-rw-r--r--dev-libs/nss/nss-3.21-r1.ebuild1
-rw-r--r--dev-libs/nss/nss-3.21-r2.ebuild328
-rw-r--r--dev-libs/nss/nss-3.21.ebuild1
-rw-r--r--dev-libs/qtkeychain/qtkeychain-0.5.0.ebuild2
-rw-r--r--dev-libs/sdformat/Manifest2
-rw-r--r--dev-libs/sdformat/sdformat-3.6.0.ebuild1
-rw-r--r--dev-libs/sdformat/sdformat-3.7.0.ebuild (renamed from dev-libs/sdformat/sdformat-3.1.1-r1.ebuild)1
-rw-r--r--dev-ml/mirage-profile/Manifest2
-rw-r--r--dev-ml/mirage-profile/mirage-profile-0.6.1.ebuild32
-rw-r--r--dev-ml/mirage-profile/mirage-profile-0.6.ebuild32
-rw-r--r--dev-ml/ocaml-re/Manifest1
-rw-r--r--dev-ml/ocaml-re/ocaml-re-1.5.0.ebuild25
-rw-r--r--dev-ml/ocaml-sqlite3/Manifest1
-rw-r--r--dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.0.3.ebuild29
-rw-r--r--dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.180.0-r1.ebuild19
-rw-r--r--dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.220.0.ebuild26
-rw-r--r--dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.230.0.ebuild2
-rw-r--r--dev-perl/Apache-AuthCookie/Manifest2
-rw-r--r--dev-perl/Apache-Reload/Apache-Reload-0.130.0.ebuild2
-rw-r--r--dev-perl/Apache-Session/Apache-Session-1.930.0.ebuild2
-rw-r--r--dev-perl/Apache-Test/Apache-Test-1.390.0.ebuild2
-rw-r--r--dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild2
-rw-r--r--dev-perl/BSD-Resource/BSD-Resource-1.290.800.ebuild2
-rw-r--r--dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild2
-rw-r--r--dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild2
-rw-r--r--dev-perl/CGI-Fast/CGI-Fast-2.100.0.ebuild2
-rw-r--r--dev-perl/CGI/CGI-3.650.0.ebuild27
-rw-r--r--dev-perl/CGI/Manifest1
-rw-r--r--dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild2
-rw-r--r--dev-perl/Cairo/Cairo-1.106.0.ebuild2
-rw-r--r--dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild2
-rw-r--r--dev-perl/Clone/Clone-0.380.0.ebuild2
-rw-r--r--dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild2
-rw-r--r--dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild2
-rw-r--r--dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild2
-rw-r--r--dev-perl/Curses/Curses-1.320.0.ebuild2
-rw-r--r--dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild2
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild2
-rw-r--r--dev-perl/DBI/DBI-1.634.0.ebuild2
-rw-r--r--dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild2
-rw-r--r--dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild2
-rw-r--r--dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0-r1.ebuild26
-rw-r--r--dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.560.0.ebuild2
-rw-r--r--dev-perl/DateTime-Format-Strptime/Manifest1
-rw-r--r--dev-perl/DateTime/DateTime-1.200.0.ebuild2
-rw-r--r--dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild2
-rw-r--r--dev-perl/Devel-Cycle/Devel-Cycle-1.110.0-r1.ebuild17
-rw-r--r--dev-perl/Devel-Cycle/Devel-Cycle-1.120.0.ebuild2
-rw-r--r--dev-perl/Devel-Cycle/Manifest1
-rw-r--r--dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild2
-rw-r--r--dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r1.ebuild17
-rw-r--r--dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r2.ebuild2
-rw-r--r--dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild23
-rw-r--r--dev-perl/Devel-StackTrace/Devel-StackTrace-2.0.0.ebuild2
-rw-r--r--dev-perl/Devel-StackTrace/Manifest1
-rw-r--r--dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild2
-rw-r--r--dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.800.0-r1.ebuild18
-rw-r--r--dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild2
-rw-r--r--dev-perl/Digest-Perl-MD5/Manifest1
-rw-r--r--dev-perl/EV/EV-4.220.0.ebuild (renamed from dev-perl/EV/EV-4.150.0-r1.ebuild)19
-rw-r--r--dev-perl/EV/Manifest2
-rw-r--r--dev-perl/Email-Abstract/Email-Abstract-3.3.0-r1.ebuild23
-rw-r--r--dev-perl/Email-Abstract/Email-Abstract-3.7.0.ebuild2
-rw-r--r--dev-perl/Email-Abstract/Manifest1
-rw-r--r--dev-perl/Email-Address/Email-Address-1.905.0.ebuild26
-rw-r--r--dev-perl/Email-Address/Email-Address-1.907.0.ebuild2
-rw-r--r--dev-perl/Email-Address/Email-Address-1.908.0.ebuild27
-rw-r--r--dev-perl/Email-Address/Manifest2
-rw-r--r--dev-perl/Email-FolderType/Email-FolderType-0.813.0.ebuild20
-rw-r--r--dev-perl/Email-FolderType/Manifest1
-rw-r--r--dev-perl/Email-MIME/Email-MIME-1.926.0.ebuild34
-rw-r--r--dev-perl/Email-MIME/Email-MIME-1.929.0.ebuild2
-rw-r--r--dev-perl/Email-MIME/Email-MIME-1.936.0.ebuild38
-rw-r--r--dev-perl/Email-MIME/Manifest2
-rw-r--r--dev-perl/Email-MessageID/Email-MessageID-1.402.0-r1.ebuild24
-rw-r--r--dev-perl/Email-MessageID/Email-MessageID-1.405.0.ebuild2
-rw-r--r--dev-perl/Email-MessageID/Email-MessageID-1.406.0.ebuild26
-rw-r--r--dev-perl/Email-MessageID/Manifest2
-rw-r--r--dev-perl/Email-Reply/Email-Reply-1.204.0.ebuild29
-rw-r--r--dev-perl/Email-Reply/Manifest1
-rw-r--r--dev-perl/Email-Send/Email-Send-2.198.0-r1.ebuild26
-rw-r--r--dev-perl/Email-Send/Email-Send-2.199.0-r1.ebuild26
-rw-r--r--dev-perl/Email-Send/Email-Send-2.201.0.ebuild2
-rw-r--r--dev-perl/Email-Send/Manifest2
-rw-r--r--dev-perl/Email-Sender/Email-Sender-0.120.2-r1.ebuild44
-rw-r--r--dev-perl/Email-Sender/Email-Sender-1.300.11.ebuild46
-rw-r--r--dev-perl/Email-Sender/Email-Sender-1.300.16.ebuild2
-rw-r--r--dev-perl/Email-Sender/Manifest2
-rw-r--r--dev-perl/Email-Simple/Email-Simple-2.203.ebuild28
-rw-r--r--dev-perl/Email-Simple/Email-Simple-2.206.0.ebuild (renamed from dev-perl/Email-Simple/Email-Simple-2.206.ebuild)2
-rw-r--r--dev-perl/Email-Simple/Email-Simple-2.208.0.ebuild29
-rw-r--r--dev-perl/Email-Simple/Manifest2
-rw-r--r--dev-perl/Email-Valid/Email-Valid-1.192.0-r1.ebuild27
-rw-r--r--dev-perl/Email-Valid/Email-Valid-1.196.0.ebuild2
-rw-r--r--dev-perl/Email-Valid/Email-Valid-1.198.0.ebuild36
-rw-r--r--dev-perl/Email-Valid/Manifest2
-rw-r--r--dev-perl/Error/Error-0.170.210.ebuild27
-rw-r--r--dev-perl/Error/Error-0.170.230.ebuild29
-rw-r--r--dev-perl/Error/Error-0.170.240.ebuild2
-rw-r--r--dev-perl/Error/Manifest2
-rw-r--r--dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild2
-rw-r--r--dev-perl/Event-RPC/Event-RPC-1.30.0.ebuild23
-rw-r--r--dev-perl/Event-RPC/Manifest1
-rw-r--r--dev-perl/Event/Event-1.240.0.ebuild2
-rw-r--r--dev-perl/Exception-Base/Exception-Base-0.250.100.ebuild (renamed from dev-perl/Exception-Base/Exception-Base-0.250-r1.ebuild)14
-rw-r--r--dev-perl/Exception-Base/Manifest1
-rw-r--r--dev-perl/IO-CaptureOutput/IO-CaptureOutput-1.110.400.ebuild2
-rw-r--r--dev-perl/Module-Runtime/Module-Runtime-0.14.0.ebuild2
-rw-r--r--dev-perl/MooX-Types-MooseLike/Manifest1
-rw-r--r--dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.270.0.ebuild29
-rw-r--r--dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0.ebuild2
-rw-r--r--dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild (renamed from dev-perl/Test-MockModule/Test-MockModule-0.50.0-r1.ebuild)9
-rw-r--r--dev-perl/Throwable/Manifest3
-rw-r--r--dev-perl/Throwable/Throwable-0.102.80.ebuild22
-rw-r--r--dev-perl/Throwable/Throwable-0.200.11.ebuild2
-rw-r--r--dev-perl/Throwable/Throwable-0.200.3-r1.ebuild27
-rw-r--r--dev-perl/Throwable/Throwable-0.200.4.ebuild27
-rw-r--r--dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild2
-rw-r--r--dev-perl/strictures/Manifest2
-rw-r--r--dev-perl/strictures/strictures-1.4.4-r1.ebuild17
-rw-r--r--dev-perl/strictures/strictures-2.0.0.ebuild23
-rw-r--r--dev-perl/strictures/strictures-2.0.1.ebuild2
-rw-r--r--dev-python/Babel/Babel-2.2.0.ebuild50
-rw-r--r--dev-python/Babel/Manifest1
-rw-r--r--dev-python/alembic/Manifest1
-rw-r--r--dev-python/alembic/alembic-0.8.4.ebuild47
-rw-r--r--dev-python/bsddb3/bsddb3-6.1.1.ebuild2
-rw-r--r--dev-python/cytoolz/Manifest1
-rw-r--r--dev-python/cytoolz/cytoolz-0.7.4.ebuild38
-rw-r--r--dev-python/flake8/Manifest1
-rw-r--r--dev-python/flake8/flake8-2.5.1.ebuild46
-rw-r--r--dev-python/hacking/hacking-0.10.2.ebuild4
-rw-r--r--dev-python/ipaddr/ipaddr-2.1.11.ebuild4
-rw-r--r--dev-python/ipykernel/Manifest1
-rw-r--r--dev-python/ipykernel/ipykernel-4.2.2.ebuild32
-rw-r--r--dev-python/logbook/logbook-0.9.1.ebuild6
-rw-r--r--dev-python/nose/nose-1.3.4.ebuild4
-rw-r--r--dev-python/nose/nose-1.3.6.ebuild4
-rw-r--r--dev-python/nose/nose-1.3.7.ebuild22
-rw-r--r--dev-python/nose/nose-9999.ebuild4
-rw-r--r--dev-python/numpy/numpy-1.10.2-r2.ebuild (renamed from dev-python/numpy/numpy-1.10.2-r1.ebuild)27
-rw-r--r--dev-python/peewee/Manifest1
-rw-r--r--dev-python/peewee/peewee-2.7.4.ebuild38
-rw-r--r--dev-python/pillow/Manifest1
-rw-r--r--dev-python/pillow/pillow-3.1.0.ebuild94
-rw-r--r--dev-python/prompt_toolkit/Manifest1
-rw-r--r--dev-python/prompt_toolkit/prompt_toolkit-0.57.ebuild31
-rw-r--r--dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild8
-rw-r--r--dev-python/pycurl/Manifest1
-rw-r--r--dev-python/pycurl/metadata.xml2
-rw-r--r--dev-python/pycurl/pycurl-7.21.5.ebuild71
-rw-r--r--dev-python/pyopencl/Manifest1
-rw-r--r--dev-python/pyopencl/pyopencl-2015.2.4.ebuild47
-rw-r--r--dev-python/pyshark/pyshark-0.3.6.ebuild7
-rw-r--r--dev-python/pyxattr/pyxattr-0.5.5.ebuild2
-rw-r--r--dev-python/terminado/Manifest1
-rw-r--r--dev-python/terminado/terminado-0.6.ebuild28
-rw-r--r--dev-python/trollius/trollius-2.0.ebuild6
-rw-r--r--dev-python/websocket-client/Manifest1
-rw-r--r--dev-python/websocket-client/websocket-client-0.35.0.ebuild36
-rw-r--r--dev-python/xlsxwriter/Manifest1
-rw-r--r--dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild33
-rw-r--r--dev-python/zope-event/Manifest1
-rw-r--r--dev-python/zope-event/zope-event-4.1.0.ebuild28
-rw-r--r--dev-ros/visp_tracker/visp_tracker-0.9.1.ebuild2
-rw-r--r--dev-ros/visp_tracker/visp_tracker-9999.ebuild2
-rw-r--r--dev-ruby/bacon/bacon-1.2.0-r1.ebuild19
-rw-r--r--dev-ruby/bacon/bacon-1.2.0-r2.ebuild4
-rw-r--r--dev-ruby/childprocess/Manifest4
-rw-r--r--dev-ruby/childprocess/childprocess-0.5.5.ebuild35
-rw-r--r--dev-ruby/childprocess/childprocess-0.5.6.ebuild35
-rw-r--r--dev-ruby/childprocess/childprocess-0.5.9.ebuild (renamed from dev-ruby/childprocess/childprocess-0.5.7.ebuild)4
-rw-r--r--dev-ruby/chunky_png/Manifest2
-rw-r--r--dev-ruby/chunky_png/chunky_png-1.3.3.ebuild34
-rw-r--r--dev-ruby/chunky_png/chunky_png-1.3.4.ebuild34
-rw-r--r--dev-ruby/hoe/hoe-3.14.1.ebuild4
-rw-r--r--dev-ruby/maxitest/Manifest1
-rw-r--r--dev-ruby/maxitest/maxitest-1.5.5.ebuild49
-rw-r--r--dev-ruby/mimemagic/Manifest1
-rw-r--r--dev-ruby/mimemagic/mimemagic-0.3.1.ebuild25
-rw-r--r--dev-ruby/paint/Manifest2
-rw-r--r--dev-ruby/paint/paint-1.0.1.ebuild (renamed from dev-ruby/paint/paint-0.9.0.ebuild)7
-rw-r--r--dev-ruby/pkg-config/Manifest1
-rw-r--r--dev-ruby/pkg-config/pkg-config-1.1.7.ebuild34
-rw-r--r--dev-ruby/rqrcode/Manifest1
-rw-r--r--dev-ruby/rqrcode/rqrcode-0.9.0.ebuild31
-rw-r--r--dev-ruby/ruby-gettext/Manifest1
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.2.0.ebuild66
-rw-r--r--dev-ruby/text/text-1.3.1.ebuild4
-rw-r--r--dev-ruby/webmock/Manifest1
-rw-r--r--dev-ruby/webmock/webmock-1.22.3.ebuild3
-rw-r--r--dev-ruby/webmock/webmock-1.22.5.ebuild52
-rw-r--r--dev-ruby/will_paginate/Manifest3
-rw-r--r--dev-ruby/will_paginate/will_paginate-3.0.5.ebuild31
-rw-r--r--dev-ruby/will_paginate/will_paginate-3.1.0.ebuild (renamed from dev-ruby/will_paginate/will_paginate-3.0.6.ebuild)4
-rw-r--r--dev-tex/catdvi/catdvi-0.14-r1.ebuild9
-rw-r--r--dev-tex/hevea/Manifest1
-rw-r--r--dev-tex/hevea/hevea-2.28.ebuild58
-rw-r--r--dev-tex/rubber/Manifest1
-rw-r--r--dev-tex/rubber/rubber-1.4.ebuild26
-rw-r--r--dev-util/debootstrap/debootstrap-1.0.75.ebuild2
-rw-r--r--dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild (renamed from dev-util/kdevplatform/kdevplatform-1.7.2.ebuild)5
-rw-r--r--dev-vcs/git/Manifest6
-rw-r--r--dev-vcs/git/files/git-2.6.0-send-email_connection_closed_fix.patch34
-rw-r--r--dev-vcs/git/git-2.7.0.ebuild (renamed from dev-vcs/git/git-2.6.3.ebuild)2
-rw-r--r--dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild106
-rw-r--r--dev-vcs/gitolite-gentoo/gitolite-gentoo-9999.ebuild7
-rw-r--r--dev-vcs/gitolite/gitolite-3.6.4-r1.ebuild97
-rw-r--r--dev-vcs/gitolite/gitolite-9999.ebuild7
-rw-r--r--dev-vcs/mercurial/Manifest2
-rw-r--r--dev-vcs/mercurial/mercurial-3.6.3.ebuild (renamed from dev-vcs/mercurial/mercurial-3.6.1.ebuild)2
-rw-r--r--eclass/kde5-functions.eclass4
-rw-r--r--eclass/kde5.eclass6
-rw-r--r--games-action/lugaru/lugaru-20151204.ebuild2
-rw-r--r--games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild2
-rw-r--r--games-board/freedoko/freedoko-0.7.13-r1.ebuild2
-rw-r--r--games-board/freedoko/freedoko-0.7.13.ebuild98
-rw-r--r--games-emulation/dolphin/dolphin-5.0.ebuild3
-rw-r--r--games-emulation/dolphin/dolphin-9999.ebuild5
-rw-r--r--games-fps/quake3-excessiveplus/Manifest1
-rw-r--r--games-fps/quake3-excessiveplus/quake3-excessiveplus-2.2b.ebuild23
-rw-r--r--games-fps/quakeforge/quakeforge-0.7.2.ebuild2
-rw-r--r--games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild2
-rw-r--r--games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild2
-rw-r--r--games-mud/tintin/tintin-2.01.1.ebuild2
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild2
-rw-r--r--games-puzzle/tetrinet/tetrinet-0.11.ebuild10
-rw-r--r--games-roguelike/hengband/hengband-1.6.2-r1.ebuild2
-rw-r--r--games-roguelike/moria/moria-5.5.2.ebuild2
-rw-r--r--games-roguelike/scourge/scourge-0.21.1.ebuild5
-rw-r--r--games-roguelike/tome/tome-2.3.5.ebuild2
-rw-r--r--games-roguelike/tomenet/Manifest1
-rw-r--r--games-roguelike/tomenet/files/tomenet-4.5.9-makefile.patch75
-rw-r--r--games-roguelike/tomenet/tomenet-4.5.9.ebuild100
-rw-r--r--games-roguelike/tomenet/tomenet-4.6.0.ebuild2
-rw-r--r--games-rpg/manaplus/Manifest1
-rw-r--r--games-rpg/manaplus/manaplus-1.5.11.21.ebuild2
-rw-r--r--games-rpg/manaplus/manaplus-1.5.8.15.ebuild75
-rw-r--r--games-rpg/sumwars/sumwars-0.5.8.ebuild2
-rw-r--r--games-sports/speed-dreams/speed-dreams-1.4.0.ebuild2
-rw-r--r--games-strategy/dopewars/dopewars-1.5.12-r2.ebuild2
-rw-r--r--games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch64
-rw-r--r--games-strategy/galaxyhack/galaxyhack-1.74.ebuild3
-rw-r--r--games-strategy/uqm/uqm-0.7.0-r2.ebuild2
-rw-r--r--gnome-base/gnome-light/gnome-light-3.14.0.ebuild51
-rw-r--r--gnome-base/gnome-light/gnome-light-3.16.0.ebuild4
-rw-r--r--gnome-base/gnome-light/gnome-light-3.18.0.ebuild4
-rw-r--r--gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild2
-rw-r--r--gnome-base/libbonoboui/metadata.xml8
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild46
-rw-r--r--gnome-extra/gnome-dvb-daemon/metadata.xml5
-rw-r--r--gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild4
-rw-r--r--gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild2
-rw-r--r--kde-apps/dolphin/dolphin-4.14.3-r1.ebuild59
-rw-r--r--kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild26
-rw-r--r--kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild (renamed from kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild)3
-rw-r--r--kde-apps/konsole/konsole-4.14.3-r2.ebuild45
-rw-r--r--kde-apps/konsolepart/Manifest1
-rw-r--r--kde-apps/konsolepart/konsolepart-4.14.3.ebuild65
-rw-r--r--kde-apps/konsolepart/metadata.xml (renamed from dev-java/css-validator/metadata.xml)2
-rw-r--r--kde-apps/krdc/krdc-15.08.3.ebuild2
-rw-r--r--kde-apps/krdc/krdc-4.14.3.ebuild2
-rw-r--r--kde-frameworks/attica/Manifest1
-rw-r--r--kde-frameworks/attica/attica-5.15.0.ebuild17
-rw-r--r--kde-frameworks/baloo/Manifest1
-rw-r--r--kde-frameworks/baloo/baloo-5.15.0.ebuild32
-rw-r--r--kde-frameworks/bluez-qt/Manifest1
-rw-r--r--kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild29
-rw-r--r--kde-frameworks/extra-cmake-modules/Manifest1
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild45
-rw-r--r--kde-frameworks/frameworkintegration/Manifest1
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.15.0-r1.ebuild49
-rw-r--r--kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild49
-rw-r--r--kde-frameworks/kactivities/Manifest1
-rw-r--r--kde-frameworks/kactivities/kactivities-5.15.0-r1.ebuild36
-rw-r--r--kde-frameworks/kactivities/kactivities-5.15.0.ebuild36
-rw-r--r--kde-frameworks/kapidox/Manifest1
-rw-r--r--kde-frameworks/kapidox/kapidox-5.15.0.ebuild29
-rw-r--r--kde-frameworks/karchive/Manifest1
-rw-r--r--kde-frameworks/karchive/karchive-5.15.0.ebuild28
-rw-r--r--kde-frameworks/kauth/Manifest1
-rw-r--r--kde-frameworks/kauth/kauth-5.15.0.ebuild33
-rw-r--r--kde-frameworks/kbookmarks/Manifest1
-rw-r--r--kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild30
-rw-r--r--kde-frameworks/kcmutils/Manifest1
-rw-r--r--kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild32
-rw-r--r--kde-frameworks/kcodecs/Manifest1
-rw-r--r--kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild14
-rw-r--r--kde-frameworks/kcompletion/Manifest1
-rw-r--r--kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild22
-rw-r--r--kde-frameworks/kconfig/Manifest1
-rw-r--r--kde-frameworks/kconfig/kconfig-5.15.0.ebuild27
-rw-r--r--kde-frameworks/kconfigwidgets/Manifest1
-rw-r--r--kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild30
-rw-r--r--kde-frameworks/kcoreaddons/Manifest1
-rw-r--r--kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild41
-rw-r--r--kde-frameworks/kcrash/Manifest1
-rw-r--r--kde-frameworks/kcrash/kcrash-5.15.0.ebuild39
-rw-r--r--kde-frameworks/kdbusaddons/Manifest1
-rw-r--r--kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild29
-rw-r--r--kde-frameworks/kdeclarative/Manifest1
-rw-r--r--kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild32
-rw-r--r--kde-frameworks/kded/Manifest1
-rw-r--r--kde-frameworks/kded/kded-5.15.0.ebuild28
-rw-r--r--kde-frameworks/kdelibs4support/Manifest1
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild83
-rw-r--r--kde-frameworks/kdesignerplugin/Manifest1
-rw-r--r--kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild54
-rw-r--r--kde-frameworks/kdesu/Manifest1
-rw-r--r--kde-frameworks/kdesu/kdesu-5.15.0.ebuild33
-rw-r--r--kde-frameworks/kdewebkit/Manifest1
-rw-r--r--kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild30
-rw-r--r--kde-frameworks/kdnssd/Manifest1
-rw-r--r--kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild32
-rw-r--r--kde-frameworks/kdoctools/Manifest1
-rw-r--r--kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild24
-rw-r--r--kde-frameworks/kemoticons/Manifest1
-rw-r--r--kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild26
-rw-r--r--kde-frameworks/kfilemetadata/Manifest1
-rw-r--r--kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild39
-rw-r--r--kde-frameworks/kglobalaccel/Manifest1
-rw-r--r--kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild31
-rw-r--r--kde-frameworks/kguiaddons/Manifest1
-rw-r--r--kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild23
-rw-r--r--kde-frameworks/khtml/Manifest1
-rw-r--r--kde-frameworks/khtml/khtml-5.15.0.ebuild66
-rw-r--r--kde-frameworks/ki18n/Manifest1
-rw-r--r--kde-frameworks/ki18n/ki18n-5.15.0.ebuild21
-rw-r--r--kde-frameworks/kiconthemes/Manifest1
-rw-r--r--kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild27
-rw-r--r--kde-frameworks/kidletime/Manifest1
-rw-r--r--kde-frameworks/kidletime/kidletime-5.15.0.ebuild25
-rw-r--r--kde-frameworks/kimageformats/Manifest1
-rw-r--r--kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild34
-rw-r--r--kde-frameworks/kinit/Manifest1
-rw-r--r--kde-frameworks/kinit/kinit-5.15.0.ebuild38
-rw-r--r--kde-frameworks/kio/Manifest1
-rw-r--r--kde-frameworks/kio/kio-5.15.0.ebuild77
-rw-r--r--kde-frameworks/kitemmodels/Manifest1
-rw-r--r--kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild15
-rw-r--r--kde-frameworks/kitemviews/Manifest1
-rw-r--r--kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild21
-rw-r--r--kde-frameworks/kjobwidgets/Manifest1
-rw-r--r--kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild36
-rw-r--r--kde-frameworks/kjs/Manifest1
-rw-r--r--kde-frameworks/kjs/kjs-5.15.0.ebuild22
-rw-r--r--kde-frameworks/kjsembed/Manifest1
-rw-r--r--kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild26
-rw-r--r--kde-frameworks/kmediaplayer/Manifest1
-rw-r--r--kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild21
-rw-r--r--kde-frameworks/knewstuff/Manifest1
-rw-r--r--kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild33
-rw-r--r--kde-frameworks/knotifications/Manifest1
-rw-r--r--kde-frameworks/knotifications/knotifications-5.15.0.ebuild43
-rw-r--r--kde-frameworks/knotifyconfig/Manifest1
-rw-r--r--kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild25
-rw-r--r--kde-frameworks/kpackage/Manifest1
-rw-r--r--kde-frameworks/kpackage/kpackage-5.15.0.ebuild22
-rw-r--r--kde-frameworks/kparts/Manifest1
-rw-r--r--kde-frameworks/kparts/kparts-5.15.0.ebuild32
-rw-r--r--kde-frameworks/kpeople/Manifest1
-rw-r--r--kde-frameworks/kpeople/kpeople-5.15.0.ebuild33
-rw-r--r--kde-frameworks/kplotting/Manifest1
-rw-r--r--kde-frameworks/kplotting/kplotting-5.15.0.ebuild19
-rw-r--r--kde-frameworks/kpty/Manifest1
-rw-r--r--kde-frameworks/kpty/kpty-5.15.0.ebuild19
-rw-r--r--kde-frameworks/kross/Manifest1
-rw-r--r--kde-frameworks/kross/kross-5.15.0.ebuild32
-rw-r--r--kde-frameworks/krunner/Manifest1
-rw-r--r--kde-frameworks/krunner/krunner-5.15.0.ebuild28
-rw-r--r--kde-frameworks/kservice/Manifest1
-rw-r--r--kde-frameworks/kservice/kservice-5.15.0.ebuild29
-rw-r--r--kde-frameworks/ktexteditor/Manifest1
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild53
-rw-r--r--kde-frameworks/ktextwidgets/Manifest1
-rw-r--r--kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild29
-rw-r--r--kde-frameworks/kunitconversion/Manifest1
-rw-r--r--kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild19
-rw-r--r--kde-frameworks/kwallet/Manifest1
-rw-r--r--kde-frameworks/kwallet/kwallet-5.15.0.ebuild41
-rw-r--r--kde-frameworks/kwidgetsaddons/Manifest1
-rw-r--r--kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild22
-rw-r--r--kde-frameworks/kwindowsystem/Manifest1
-rw-r--r--kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild41
-rw-r--r--kde-frameworks/kxmlgui/Manifest1
-rw-r--r--kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild42
-rw-r--r--kde-frameworks/kxmlrpcclient/Manifest1
-rw-r--r--kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild23
-rw-r--r--kde-frameworks/modemmanager-qt/Manifest1
-rw-r--r--kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild22
-rw-r--r--kde-frameworks/networkmanager-qt/Manifest1
-rw-r--r--kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild27
-rw-r--r--kde-frameworks/plasma/Manifest1
-rw-r--r--kde-frameworks/plasma/plasma-5.15.0-r1.ebuild68
-rw-r--r--kde-frameworks/plasma/plasma-5.15.0.ebuild71
-rw-r--r--kde-frameworks/solid/Manifest1
-rw-r--r--kde-frameworks/solid/solid-5.15.0.ebuild33
-rw-r--r--kde-frameworks/sonnet/Manifest1
-rw-r--r--kde-frameworks/sonnet/sonnet-5.15.0.ebuild31
-rw-r--r--kde-frameworks/threadweaver/Manifest1
-rw-r--r--kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild17
-rw-r--r--kde-misc/krcstat/krcstat-0.7.6-r1.ebuild (renamed from kde-misc/krcstat/krcstat-0.7.6.ebuild)2
-rw-r--r--kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild (renamed from kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild)2
-rw-r--r--kde-misc/yakuake/yakuake-2.9.9-r3.ebuild (renamed from kde-misc/yakuake/yakuake-2.9.9-r2.ebuild)2
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.4.3.ebuild3
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.5.0.ebuild3
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.5.1.ebuild3
-rw-r--r--kde-plasma/libkscreen/libkscreen-5.5.2.ebuild3
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0-r1.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.0.ebuild)4
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1-r1.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.1.ebuild)4
-rw-r--r--kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2-r1.ebuild (renamed from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.5.2.ebuild)4
-rw-r--r--mail-client/trojita/trojita-0.5.ebuild2
-rw-r--r--mail-mta/postfix/Manifest2
-rw-r--r--mail-mta/postfix/postfix-3.1_pre20160104.ebuild (renamed from mail-mta/postfix/postfix-3.1_pre20151218.ebuild)2
-rw-r--r--media-fonts/cantarell/Manifest1
-rw-r--r--media-fonts/cantarell/cantarell-0.0.20.ebuild27
-rw-r--r--media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch12
-rw-r--r--media-gfx/geeqie/geeqie-1.2.2-r2.ebuild76
-rw-r--r--media-gfx/gphoto2/Manifest1
-rw-r--r--media-gfx/gphoto2/gphoto2-2.5.9.ebuild59
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.4.0.ebuild6
-rw-r--r--media-libs/hamlib/hamlib-3.0.ebuild2
-rw-r--r--media-libs/libgphoto2/Manifest1
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.9.ebuild214
-rw-r--r--media-libs/liblastfm/liblastfm-1.0.9.ebuild2
-rw-r--r--media-libs/openal/Manifest3
-rw-r--r--media-libs/openal/files/openal-1.17.0-jackfix.patch11
-rw-r--r--media-libs/openal/openal-1.15.1-r1.ebuild56
-rw-r--r--media-libs/openal/openal-1.15.1.ebuild43
-rw-r--r--media-libs/openal/openal-1.16.0.ebuild60
-rw-r--r--media-libs/openal/openal-1.17.1.ebuild (renamed from media-libs/openal/openal-1.17.0.ebuild)12
-rw-r--r--media-libs/sdl2-mixer/files/sdl2-mixer-2.0.1-mp3.patch39
-rw-r--r--media-libs/sdl2-mixer/sdl2-mixer-2.0.1.ebuild10
-rw-r--r--media-libs/taglib/Manifest1
-rw-r--r--media-libs/taglib/taglib-1.10.ebuild59
-rw-r--r--media-libs/varconf/varconf-0.6.7-r1.ebuild2
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.1.ebuild6
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.2.ebuild6
-rw-r--r--media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211-r5.ebuild4
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.1.ebuild6
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.2.ebuild6
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.1.ebuild6
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.2.ebuild6
-rw-r--r--media-radio/tlf/tlf-1.2.2.ebuild2
-rw-r--r--media-sound/amarok/amarok-2.8.0-r3.ebuild1
-rw-r--r--media-sound/amarok/files/amarok-2.8.0-taglib110.patch40
-rw-r--r--media-sound/flacon/Manifest1
-rw-r--r--media-sound/flacon/flacon-1.0.0.ebuild65
-rw-r--r--media-sound/flacon/flacon-1.2.0.ebuild2
-rw-r--r--media-sound/freebirth/freebirth-0.3.2-r1.ebuild8
-rw-r--r--media-sound/gejengel/gejengel-0.1.4-r2.ebuild2
-rw-r--r--media-sound/kid3/files/kid3-3.2.1-fix-cmake.patch61
-rw-r--r--media-sound/kid3/kid3-3.2.1.ebuild2
-rw-r--r--media-sound/mpd/mpd-0.19.11.ebuild2
-rw-r--r--media-sound/ncmpcpp/Manifest1
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.7.1.ebuild67
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.7.ebuild2
-rw-r--r--media-sound/qtractor/Manifest1
-rw-r--r--media-sound/qtractor/qtractor-0.7.3.ebuild77
-rw-r--r--media-sound/quodlibet/Manifest2
-rw-r--r--media-sound/quodlibet/quodlibet-2.6.3.ebuild71
-rw-r--r--media-sound/quodlibet/quodlibet-3.1.2.ebuild69
-rw-r--r--media-sound/sonic-visualiser/Manifest1
-rw-r--r--media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild106
-rw-r--r--media-sound/soundkonverter/soundkonverter-2.1.2.ebuild2
-rw-r--r--media-video/dvdstyler/Manifest1
-rw-r--r--media-video/dvdstyler/dvdstyler-2.9.6.ebuild69
-rw-r--r--media-video/ffmpeg/ffmpeg-2.8.4.ebuild5
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild5
-rw-r--r--media-video/mkvtoolnix/Manifest1
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-8.7.0.ebuild115
-rw-r--r--media-video/mpv/mpv-0.11.0-r1.ebuild4
-rw-r--r--media-video/mpv/mpv-0.14.0.ebuild4
-rw-r--r--media-video/mpv/mpv-0.9.2-r1.ebuild4
-rw-r--r--media-video/mpv/mpv-9999.ebuild4
-rw-r--r--net-analyzer/dhcpdump/dhcpdump-1.8.ebuild4
-rw-r--r--net-analyzer/icinga2/icinga2-2.4.1-r2.ebuild157
-rw-r--r--net-dns/bind/files/named.init-r135
-rw-r--r--net-dns/unbound/Manifest1
-rw-r--r--net-dns/unbound/files/unbound-1.5.7-trust-anchor-file.patch12
-rw-r--r--net-dns/unbound/unbound-1.5.7.ebuild125
-rw-r--r--net-fs/samba/files/samba-4.2.7-pam.patch36
-rw-r--r--net-fs/samba/samba-4.2.7.ebuild20
-rw-r--r--net-fs/samba/samba-4.3.3.ebuild16
-rw-r--r--net-im/gajim/gajim-0.16.5.ebuild2
-rw-r--r--net-im/kadu/kadu-2.1.ebuild2
-rw-r--r--net-im/pidgin/pidgin-2.10.12.ebuild3
-rw-r--r--net-libs/farstream/farstream-0.1.2-r1.ebuild93
-rw-r--r--net-libs/farstream/farstream-0.1.2-r2.ebuild2
-rw-r--r--net-libs/gssdp/Manifest1
-rw-r--r--net-libs/gssdp/gssdp-0.14.13.ebuild59
-rw-r--r--net-libs/gupnp/Manifest1
-rw-r--r--net-libs/gupnp/gupnp-0.20.15.ebuild77
-rw-r--r--net-libs/libetpan/libetpan-1.6.ebuild2
-rw-r--r--net-libs/librsync/librsync-2.0.0.ebuild2
-rw-r--r--net-mail/lbdb/lbdb-0.39-r1.ebuild53
-rw-r--r--net-misc/electrum/Manifest2
-rw-r--r--net-misc/electrum/electrum-2.1.1.ebuild4
-rw-r--r--net-misc/electrum/electrum-2.3.3.ebuild4
-rw-r--r--net-misc/electrum/electrum-2.5.4.ebuild (renamed from net-misc/electrum/electrum-2.5.1.ebuild)6
-rw-r--r--net-misc/icaclient/icaclient-13.2.0.322243.ebuild6
-rw-r--r--net-misc/icaclient/icaclient-13.2.1.328635.ebuild6
-rw-r--r--net-misc/ntpclient/Manifest1
-rw-r--r--net-misc/ntpclient/metadata.xml2
-rw-r--r--net-misc/ntpclient/ntpclient-2015.365.ebuild31
-rw-r--r--net-misc/ocsync/ocsync-0.90.4.ebuild5
-rw-r--r--net-misc/rsync/rsync-3.1.2.ebuild2
-rw-r--r--net-misc/vde/vde-2.3.2-r2.ebuild2
-rw-r--r--net-misc/youtube-dl/youtube-dl-2016.01.01.ebuild2
-rw-r--r--net-nds/nsscache/Manifest1
-rw-r--r--net-nds/nsscache/files/authorized-keys-command.py52
-rw-r--r--net-nds/nsscache/nsscache-0.30-r2.ebuild (renamed from net-nds/nsscache/nsscache-0.30-r1.ebuild)6
-rw-r--r--net-nntp/nzbget/files/nzbget.initd25
-rw-r--r--net-p2p/i2p/Manifest1
-rw-r--r--net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch43
-rw-r--r--net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch102
-rw-r--r--net-p2p/i2p/files/i2p-0.9.23_initd36
-rw-r--r--net-p2p/i2p/i2p-0.9.23.ebuild122
-rw-r--r--net-p2p/i2p/metadata.xml2
-rw-r--r--net-proxy/haproxy/Manifest2
-rw-r--r--net-proxy/haproxy/haproxy-1.6.3.ebuild (renamed from net-proxy/haproxy/haproxy-1.6.1.ebuild)2
-rw-r--r--net-wireless/gnuradio/Manifest1
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.9.ebuild237
-rw-r--r--net-wireless/gnuradio/gnuradio-9999.ebuild10
-rw-r--r--net-wireless/gr-scan/Manifest1
-rw-r--r--net-wireless/gr-scan/gr-scan-20160104.ebuild24
-rw-r--r--net-wireless/gr-scan/metadata.xml (renamed from dev-java/jigsaw/metadata.xml)3
-rw-r--r--profiles/arch/alpha/package.use.mask13
-rw-r--r--profiles/arch/alpha/package.use.stable.mask21
-rw-r--r--profiles/arch/arm/package.use.mask8
-rw-r--r--profiles/arch/arm/package.use.stable.mask12
-rw-r--r--profiles/arch/arm64/package.use.mask4
-rw-r--r--profiles/arch/nios2/package.use.mask4
-rw-r--r--profiles/arch/powerpc/package.use.mask8
-rw-r--r--profiles/arch/powerpc/ppc32/package.use.mask5
-rw-r--r--profiles/arch/powerpc/ppc32/package.use.stable.mask6
-rw-r--r--profiles/arch/powerpc/ppc64/package.use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/package.use.stable.mask6
-rw-r--r--profiles/arch/sparc/package.use.mask9
-rw-r--r--profiles/base/package.use.stable.mask10
-rw-r--r--profiles/features/prefix/make.defaults3
-rw-r--r--profiles/package.mask437
-rw-r--r--profiles/prefix/package.mask9
-rw-r--r--profiles/targets/desktop/plasma/package.use1
-rw-r--r--profiles/thirdpartymirrors2
-rw-r--r--sci-electronics/gtkwave/gtkwave-3.3.68.ebuild2
-rw-r--r--sci-electronics/voacapl/voacapl-0.6.7.ebuild2
-rw-r--r--sci-electronics/xnec2c/xnec2c-3.4.ebuild2
-rw-r--r--sci-geosciences/qmapshack/Manifest1
-rw-r--r--sci-geosciences/qmapshack/qmapshack-1.5.1.ebuild22
-rw-r--r--sci-geosciences/routino/Manifest1
-rw-r--r--sci-geosciences/routino/files/makefile-conf.patch35
-rw-r--r--sci-geosciences/routino/metadata.xml17
-rw-r--r--sci-geosciences/routino/routino-3.0_p1.ebuild23
-rw-r--r--sci-libs/blas-reference/blas-reference-20070226-r4.ebuild2
-rw-r--r--sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild2
-rw-r--r--sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild2
-rw-r--r--sci-libs/libbufr/Manifest2
-rw-r--r--sci-libs/libbufr/files/libbufr-000405-makefile.patch80
-rw-r--r--sci-libs/libbufr/libbufr-000405.ebuild (renamed from sci-libs/libbufr/libbufr-000387.ebuild)105
-rw-r--r--sci-libs/libbufr/metadata.xml15
-rw-r--r--sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild2
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.14.1.ebuild14
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.15.1.ebuild14
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.15.2.ebuild14
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.16.1.ebuild11
-rw-r--r--sci-libs/scikits_learn/scikits_learn-0.17.ebuild12
-rw-r--r--sci-libs/udunits/udunits-2.1.24-r1.ebuild2
-rw-r--r--sci-mathematics/flint/Manifest1
-rw-r--r--sci-mathematics/flint/flint-2.5.2.ebuild60
-rw-r--r--sci-mathematics/nestedsums/nestedsums-1.4.12-r1.ebuild4
-rw-r--r--sci-physics/herwig++/herwig++-2.7.1-r1.ebuild (renamed from sci-physics/herwig++/herwig++-2.7.1.ebuild)4
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r10.ebuild4
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild4
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-2.20151208-r1.ebuild4
-rw-r--r--sec-policy/selinux-cgmanager/selinux-cgmanager-9999.ebuild4
-rw-r--r--sys-apps/dtc/Manifest2
-rw-r--r--sys-apps/dtc/dtc-1.3.0-r1.ebuild52
-rw-r--r--sys-apps/dtc/dtc-1.3.0.ebuild46
-rw-r--r--sys-apps/dtc/dtc-1.4.0.ebuild52
-rw-r--r--sys-apps/dtc/dtc-1.4.1-r1.ebuild11
-rw-r--r--sys-apps/dtc/dtc-9999.ebuild12
-rw-r--r--sys-apps/dtc/files/dtc-1.3.0-fdtdump.patch118
-rw-r--r--sys-apps/fakeroot/fakeroot-1.20.2.ebuild4
-rw-r--r--sys-apps/firejail/Manifest1
-rw-r--r--sys-apps/firejail/firejail-0.9.36.ebuild21
-rw-r--r--sys-apps/firejail/metadata.xml16
-rw-r--r--sys-apps/i2c-tools/i2c-tools-3.1.1-r1.ebuild2
-rw-r--r--sys-apps/pciutils/Manifest1
-rw-r--r--sys-apps/pciutils/pciutils-3.4.1.ebuild108
-rw-r--r--sys-apps/portage/portage-2.2.26.ebuild2
-rw-r--r--sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild2
-rw-r--r--sys-apps/util-linux/util-linux-2.27.1.ebuild4
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild4
-rw-r--r--sys-auth/yubikey-personalization-gui/Manifest4
-rw-r--r--sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.18.ebuild41
-rw-r--r--sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.20.ebuild41
-rw-r--r--sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild (renamed from sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.21.ebuild)2
-rw-r--r--sys-block/nbd/Manifest1
-rw-r--r--sys-block/nbd/nbd-3.13.ebuild29
-rw-r--r--sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild144
-rw-r--r--sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild5
-rw-r--r--sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild142
-rw-r--r--sys-devel/clang/clang-3.7.1-r100.ebuild36
-rw-r--r--sys-devel/gdb/gdb-7.10.1.ebuild2
-rw-r--r--sys-devel/llvm/Manifest5
-rw-r--r--sys-devel/llvm/llvm-3.7.1.ebuild539
-rw-r--r--sys-devel/prelink/files/prelink-20061201-prelink-conf.patch31
-rw-r--r--sys-devel/prelink/prelink-20130503-r1.ebuild79
-rw-r--r--sys-firmware/seabios/seabios-1.8.2.ebuild15
-rw-r--r--sys-firmware/sgabios/sgabios-0.1_pre8.ebuild4
-rw-r--r--sys-fs/lvm2/files/lvm.rc-2.02.116-r4 (renamed from sys-fs/lvm2/files/lvm.rc-2.02.116-r3)3
-rw-r--r--sys-fs/lvm2/lvm2-2.02.116-r4.ebuild (renamed from sys-fs/lvm2/lvm2-2.02.116-r3.ebuild)8
-rw-r--r--sys-fs/zfs-kmod/Manifest2
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r2.ebuild (renamed from sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r1.ebuild)6
-rw-r--r--sys-fs/zfs/Manifest1
-rw-r--r--sys-fs/zfs/zfs-0.6.5.3-r2.ebuild230
-rw-r--r--sys-kernel/genkernel/Manifest1
-rw-r--r--sys-kernel/genkernel/genkernel-3.4.52.4.ebuild162
-rw-r--r--sys-kernel/git-sources/Manifest1
-rw-r--r--sys-kernel/git-sources/git-sources-4.4_rc8.ebuild40
-rw-r--r--sys-kernel/hardened-sources/Manifest1
-rw-r--r--sys-kernel/hardened-sources/hardened-sources-4.3.3-r4.ebuild45
-rw-r--r--sys-libs/libcxx/Manifest7
-rw-r--r--sys-libs/libcxx/libcxx-0.0_p20130725.ebuild168
-rw-r--r--sys-libs/libcxx/libcxx-0.0_p20131222.ebuild169
-rw-r--r--sys-libs/libcxx/libcxx-0.0_p20140322.ebuild169
-rw-r--r--sys-libs/libcxx/libcxx-3.6.1.ebuild170
-rw-r--r--sys-libs/libcxx/libcxx-3.6.2.ebuild170
-rw-r--r--sys-libs/libcxx/libcxx-3.7.1.ebuild (renamed from sys-libs/libcxx/libcxx-3.6.0.ebuild)0
-rw-r--r--sys-libs/newlib/Manifest1
-rw-r--r--sys-libs/newlib/newlib-2.3.0.20160104.ebuild82
-rw-r--r--virtual/checkpassword/checkpassword-0.ebuild1
-rw-r--r--virtual/linux-sources/linux-sources-0.ebuild1
-rw-r--r--virtual/linux-sources/linux-sources-1.ebuild1
-rw-r--r--virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r5.ebuild4
-rw-r--r--virtual/perl-autodie/perl-autodie-2.230.0.ebuild4
-rw-r--r--virtual/perl-autodie/perl-autodie-2.260.0.ebuild4
-rw-r--r--www-apps/bugzilla/Manifest2
-rw-r--r--www-apps/bugzilla/bugzilla-4.2.11.ebuild139
-rw-r--r--www-apps/bugzilla/bugzilla-4.4.11.ebuild2
-rw-r--r--www-apps/bugzilla/bugzilla-4.4.6.ebuild139
-rw-r--r--www-apps/bugzilla/bugzilla-5.0.2.ebuild2
-rw-r--r--www-apps/joomla/Manifest2
-rw-r--r--www-apps/joomla/joomla-3.4.8.ebuild (renamed from www-apps/joomla/joomla-3.4.3.ebuild)11
-rw-r--r--www-apps/joomla/metadata.xml2
-rw-r--r--www-apps/wordpress/Manifest5
-rw-r--r--www-apps/wordpress/wordpress-4.2.4.ebuild60
-rw-r--r--www-apps/wordpress/wordpress-4.3.1.ebuild60
-rw-r--r--www-apps/wordpress/wordpress-4.3.ebuild60
-rw-r--r--www-apps/wordpress/wordpress-4.4.1.ebuild (renamed from www-apps/wordpress/wordpress-4.4.ebuild)2
-rw-r--r--www-client/google-chrome-unstable/Manifest4
-rw-r--r--www-client/google-chrome-unstable/google-chrome-unstable-49.0.2612.0_p1.ebuild (renamed from www-client/google-chrome-unstable/google-chrome-unstable-49.0.2593.0_p1.ebuild)2
-rw-r--r--www-client/seamonkey/seamonkey-2.39.ebuild5
-rw-r--r--www-client/vivaldi/Manifest8
-rw-r--r--www-client/vivaldi/vivaldi-1.0.344.34_p1.ebuild107
-rw-r--r--www-client/vivaldi/vivaldi-1.0.344.37_p1.ebuild110
-rw-r--r--www-client/vivaldi/vivaldi-1.0.365.3_p1.ebuild (renamed from www-client/vivaldi/vivaldi-1.0.352.3_p1.ebuild)2
-rw-r--r--www-plugins/chrome-binary-plugins/Manifest4
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2612.0_alpha1.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2593.0_alpha1.ebuild)2
-rw-r--r--x11-drivers/nvidia-drivers/Manifest1
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-352.68.ebuild487
-rw-r--r--x11-libs/gtk+/gtk+-3.16.7.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.18.5.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.18.6.ebuild2
-rw-r--r--x11-libs/libkscreen/libkscreen-1.0.5_p20150822.ebuild2
-rw-r--r--x11-libs/vte/Manifest2
-rw-r--r--x11-libs/vte/vte-0.36.4.ebuild70
-rw-r--r--x11-libs/vte/vte-0.38.3.ebuild76
-rw-r--r--x11-misc/bbrun/bbrun-1.6-r1.ebuild3
-rw-r--r--x11-misc/bbrun/files/bbrun-1.6-list.patch127
-rw-r--r--x11-misc/bbrun/files/bbrun-1.6-respectflags.patch26
-rw-r--r--x11-misc/i3status/files/i3status-2.10-pulseaudio.patch46
-rw-r--r--x11-misc/i3status/i3status-2.10-r1.ebuild (renamed from x11-misc/i3status/i3status-2.10.ebuild)9
-rw-r--r--x11-plugins/asmon/asmon-0.71-r1.ebuild40
-rw-r--r--x11-plugins/asmon/files/asmon-0.7.cflags.diff31
-rw-r--r--x11-plugins/asmon/files/asmon-0.71-list.patch127
-rw-r--r--x11-plugins/pidgin-otr/files/pidgin-otr-4.0.1-bug-88-auth-dialog-crash.patch27
-rw-r--r--x11-plugins/pidgin-otr/pidgin-otr-4.0.1-r1.ebuild32
-rw-r--r--x11-plugins/wmcube/files/wmcube-0.98-list.patch127
-rw-r--r--x11-plugins/wmcube/wmcube-0.98.ebuild6
-rw-r--r--x11-plugins/wmgtemp/files/wmgeneral-list.patch129
-rw-r--r--x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch127
-rw-r--r--x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild43
-rw-r--r--x11-plugins/wminet/files/wminet-3.0.0-list.patch300
-rw-r--r--x11-plugins/wminet/wminet-3.0.0-r1.ebuild36
-rw-r--r--x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch127
-rw-r--r--x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild8
-rw-r--r--x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch127
-rw-r--r--x11-plugins/wmmon/wmmon-1.2_beta1.ebuild3
-rw-r--r--x11-plugins/wmmsg/files/wmmsg-1.0.1-list.patch132
-rw-r--r--x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild7
-rw-r--r--x11-plugins/wmmsg/wmmsg-1.0.1.ebuild4
-rw-r--r--x11-plugins/wmpasman/files/wmpasman-0.8.5.3-list.patch116
-rw-r--r--x11-plugins/wmpasman/wmpasman-0.8.5.3.ebuild7
-rw-r--r--x11-plugins/wmpop3lb/files/wmpop3lb-2.4.2-list.patch127
-rw-r--r--x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild4
-rw-r--r--x11-plugins/wmtop/files/wmtop-0.9.0-list.patch127
-rw-r--r--x11-plugins/wmtop/wmtop-0.9.0-r1.ebuild3
-rw-r--r--x11-plugins/wmtz/files/wmtz-0.7-list.patch127
-rw-r--r--x11-plugins/wmtz/wmtz-0.7.ebuild5
-rw-r--r--x11-terms/guake/guake-0.8.3.ebuild2
881 files changed, 11166 insertions, 14034 deletions
diff --git a/app-admin/checkrestart/metadata.xml b/app-admin/checkrestart/metadata.xml
index 1470e032181..8870e4ffc77 100644
--- a/app-admin/checkrestart/metadata.xml
+++ b/app-admin/checkrestart/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>aidecoe@gentoo.org</email>
+ <name>Amadeusz Żołnowski</name>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
new file mode 100644
index 00000000000..fd6dfbefc1a
--- /dev/null
+++ b/app-admin/checksec/Manifest
@@ -0,0 +1 @@
+DIST checksec-1.7.2.tar.gz 16717 SHA256 eb17f2162e7f563ba0f97d9cf15f92cf1ba2d360c8293a33d66573d5a48822a8 SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1 WHIRLPOOL 3abf206d666751b2449387848afb320185102ddc0f1685db2aa6f4e974a3349e1c4d9551565459d9070cac5218354af1919c5c70af6f0131b9443fcf24a72d35
diff --git a/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild
new file mode 100644
index 00000000000..97a2ca76256
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-path.patch
+}
+
+src_install() {
+ default
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/files/checksec-1.7.2-path.patch b/app-admin/checksec/files/checksec-1.7.2-path.patch
new file mode 100644
index 00000000000..aa048b079d5
--- /dev/null
+++ b/app-admin/checksec/files/checksec-1.7.2-path.patch
@@ -0,0 +1,24 @@
+From 2065e51b255b5f9c014a0db35ffe5ce9ea946693 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 6 Jan 2016 17:28:36 +0100
+Subject: [PATCH] Extend ${PATH} so that sysctl is found
+
+---
+ checksec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/checksec b/checksec
+index 3660e82..0ac685f 100755
+--- a/checksec
++++ b/checksec
+@@ -59,6 +59,7 @@
+
+ #set global lang to C
+ export LC_ALL="C"
++export PATH="${PATH}:/usr/sbin/" # for sysctl
+
+ # global vars
+ debug=false
+--
+2.7.0
+
diff --git a/dev-java/jpf/metadata.xml b/app-admin/checksec/metadata.xml
index 9c3dfc5d5f1..16bcc9f800a 100644
--- a/dev-java/jpf/metadata.xml
+++ b/app-admin/checksec/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
- <upstream>
- <remote-id type="sourceforge">jpf</remote-id>
- </upstream>
+ <maintainer>
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index 5b6a9550fb9..a7fc037f2f9 100644
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
sensors serial snmp statsd swap syslog table tail target_notification
target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
- tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ tokyotyrant unixsock uptime users uuid varnish vmem wireless
write_graphite write_http write_mongodb"
COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -107,9 +107,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java? ( >=virtual/jdk-1.6 )
- kernel_linux? (
- collectd_plugins_vserver? ( sys-kernel/vserver-sources )
- )"
+"
RDEPEND="${COMMON_DEPEND}
collectd_plugins_java? ( >=virtual/jre-1.6 )
@@ -240,7 +238,7 @@ src_configure() {
# should work independent of the operating system.
local linux_plugins="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
- memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+ memory md netlink nfs numa processes serial swap tcpconns thermal users vmem
wireless"
local libstatgrab_plugins="cpu disk interface load memory swap users"
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
index 012278f2d73..d32eaf8e0e2 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind ceph
rrdcached rrdtool sensors serial smart snmp statsd swap syslog table tail
target_notification target_replace target_scale target_set tcpconns teamspeak2
ted thermal threshold tokyotyrant turbostat unixsock uptime users uuid varnish
- virt vmem vserver wireless write_graphite write_http write_log write_mongodb
+ virt vmem wireless write_graphite write_http write_log write_mongodb
write_redis write_sensu write_tsdb zfs_arc zookeeper"
COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -113,9 +113,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java? ( >=virtual/jdk-1.6 )
- kernel_linux? (
- collectd_plugins_vserver? ( sys-kernel/vserver-sources )
- )"
+"
RDEPEND="${COMMON_DEPEND}
collectd_plugins_java? ( >=virtual/jre-1.6 )
@@ -126,8 +124,9 @@ REQUIRED_USE="
collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}/${PN}-5.4.1"-{libocci,lt}.patch
- "${FILESDIR}/${PN}-4.10.3"-werror.patch
+ "${FILESDIR}/${PN}-5.4.1-libocci.patch"
+ "${FILESDIR}/${PN}-5.5.0-lt.patch"
+ "${FILESDIR}/${PN}-4.10.3-werror.patch"
)
# @FUNCTION: collectd_plugin_kernel_linux
@@ -220,7 +219,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ epatch ${PATCHES[@]}
epatch_user
# There's some strange prefix handling in the default config file, resulting in
@@ -249,7 +248,7 @@ src_configure() {
local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
ethstat interface iptables ipvs irq ipc load memory md netlink nfs
numa processes serial swap tcpconns thermal turbostat users vmem
- vserver wireless zfs_arc"
+ wireless zfs_arc"
local libstatgrab_plugins="cpu disk interface load memory swap users"
local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc"
diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch
new file mode 100644
index 00000000000..b14736bf266
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch
@@ -0,0 +1,35 @@
+diff --git Makefile.am Makefile.am
+index 5267123..a7e0d0c 100644
+--- Makefile.am
++++ Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+--- configure.ac.old 2016-01-04 13:55:39.286846436 +0400
++++ configure.ac 2016-01-04 13:56:07.905362298 +0400
+@@ -2,12 +2,10 @@
+ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
+ AC_CONFIG_SRCDIR(src/)
+ AC_CONFIG_HEADERS(src/config.h)
+-AC_CONFIG_AUX_DIR([libltdl/config])
+
+ m4_ifdef([LT_PACKAGE_VERSION],
+ # libtool >= 2.2
+ [
+- LT_CONFIG_LTDL_DIR([libltdl])
+ LT_INIT([dlopen])
+ LTDL_INIT([convenience])
+ AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -19,7 +17,6 @@
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+ AC_LIBTOOL_DLOPEN
+- AC_CONFIG_SUBDIRS(libltdl)
+ AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ ]
+ )
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 1f920dde419..268c9abc954 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -115,7 +115,6 @@
<flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag>
<flag name='collectd_plugins_virt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
<flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag>
- <flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag>
<flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
<flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
<flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
index 36a3c38d49a..f6c0a9ad3a3 100644
--- a/app-admin/fifo-cronolog/metadata.xml
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -11,7 +11,4 @@
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
- <maintainer>
- <email>infra-bugs@gentoo.org</email>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 503421568d3..079816aa8fd 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -234,3 +234,4 @@
"WDC WD7500BFCX-68N6GN0" 194 C "Western Digital Red 750GB SATA"
"Hitachi HTS547575A9E384" 190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
"WDC WD30PURX-64P6ZY0" 194 C "Western Digital Purple 3TB 64MB Cache"
+"WDC WD10EZEX-00BN5A0" 194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index b9b401ccf40..7cd11d08674 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,16 +1,2 @@
-DIST puppet-agent_1.2.2-1wheezy_amd64.deb 14860604 SHA256 5910ff850e8814092b50dc70a68d8c5497d5fe3d960bfef9cd13f8dc689dc665 SHA512 ad11b0ba820186f4b315ac156e8bf78348acd69d11e4c03cb12314fc73e4e3fbfef0814664e7fd04f692e8db42f9e137194e267354b2fc4ec8dda424af9f5d98 WHIRLPOOL 25c42e9f7871ccf61eb55b83327813e6090ee359c42e1e473ef09155db69adebfe412fd61a5752b4b634e5ad8aa7bd45d4a86f7e5ba29c1bdb74033b91f45c3f
-DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612
-DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653fcbe461db0934645b1da876f24595d531c7ad8c81d4 SHA512 dc7656a7f79f1f2e5144bf625b87548ed1b78290ae03c969abb850f0b1c346536c37c2b204ac0e6add830c1fd692ca4f946ea01bba50bb9794c094069f237d73 WHIRLPOOL 3809a0f9c5db1c73c6edcc344e6fdc7fb5acf340e36225611c72088175fe64ea26c3770ba126a61ed91fa275cf898828d9d192872a216a52b8345f25de1df7e6
-DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d
-DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1babf406f9b8a4c387fe6dec7d3645f5e7ad5d7625f0d SHA512 25557aa4d5fa3d2ba0aa226c835d6779d075f0ef7c054cfda9826b1fedd08c90f5143630206b1bd51550f193aecdf4eef6395437f24e5fdfe10d3ed10fb4b75f WHIRLPOOL d6ef920932a708d1a143245f84380384b3a22320c0bb21e60be9807e29af1d3da6dbfef2f498fcb90fe4584618ae338546103c71eb305b743d326e9c20704f1f
-DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e
-DIST puppet-agent_1.2.6-1wheezy_amd64.deb 15187698 SHA256 3448a92d6761bc1c284b17508bf541b0a8c40394b03e7608826e4f2a900e40cc SHA512 b5e6e43f22728cd7d9f4d103aa4de8fa1eccb3159abc31a921fa8f387dd0436a8d0f915b38be8ce233e39448b94f30be90e18da4e2861d6aeda9ef8a312474d2 WHIRLPOOL eca0f32e11b29050e53d93d02a68e874cc5f0f90d823aa7ea5241599872ef39d65f45103542fac84083b40ec47cf09435f27c4fb91b5a5c9a4dee84aa50a2c41
-DIST puppet-agent_1.2.6-1wheezy_i386.deb 15122826 SHA256 271d62f7f6634b49632308d95c75519620335d176d3ee694a3cee42bb445d658 SHA512 3eae7b5a112baf1123c6d942e0b60ee07d76b02a8313a7122884b66f08077fbe430447857e5862182de7cf64ef90f931a49936d6967134937ccff84dd419ae4c WHIRLPOOL bce7ce95c3f6c21ca658d7ba25b3cb7b04c20e5af5499e3f4efb1df997dedd01e0982c67da332fcd8da901f06ce8683219baa6c7e02a7a4eed5ce20547bcfa35
-DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097da507b32f1503abbff332c68df10291dcb975243ed SHA512 f2e8d37415d9b6c260c8b4fdee44cc1b85ab784b57c944b856082cc9a65b3de32985527a65aac49ae3c3eea54736bf3c26e11af91c09fd6bfb3b065e98ca99d0 WHIRLPOOL e6b62d968dd0a10031b42afd052c2a280e5d50caae5d51f493a3f432cb4f74ff783db8c4cb77fd2bb6defb4fd1743ce220bf9143fa7c1c02a1b8dffe01a474b2
-DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75
-DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e1a773b22ed2dd77081f3580d7df729f0d02885326f SHA512 20b5a2e516e98db30450b54f0ae042b4c6d5ccf4f44bc3403381bc663c73a7349b393fefaafabfbe334a49afbfcabc8eeae727e4eca54ef7eaa81463a7f05ed2 WHIRLPOOL df75fda9fa2ddc46fea419a65dc0de7eccd9ded41534c96f9be6688b07287fb3f6343ae908fcede47f857d37af1513e74ae5b25302150b1b186f0dc698d85860
-DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98
-DIST puppet-agent_1.3.1-1wheezy_amd64.deb 18079810 SHA256 c7df7a99ac0ee08564e60596ec4547f4208010d196c7e229f54fe8c8939cf7fd SHA512 c205c24a2c8aee1f57ddb9c1e0b09172455e953de8b51452c274e43edd95e3d5999c8ff74d00935b3a3b3221532d264bd4e9917a994095e9deee8430e91cc572 WHIRLPOOL fb492b8f6e98565e664bfb14dcb8b06fcae20b5bcefb9a04abd064099271fbae8d21c47b6605e32e0efce7fb6bcceeb9e3e330c1e7338491b700e66945870c5b
-DIST puppet-agent_1.3.1-1wheezy_i386.deb 18015662 SHA256 7a6df5b1ff33ab6791c76d7080fc2b8174e6efdf701c774d7945238f3be28e5a SHA512 3960327559ef9b7f58b6b0997789ec89b74afab2628c8067383556e66cdbfe5a5951ddf5c11840bf0fc76052a8548500f2608dc823ae757c669272ee10a22af5 WHIRLPOOL 9c8c50401e3388af6114a24b70753b6ee96beee5f73e9fbb50ff1e6c63ae6e94ae4110ad197558288f4d310ef36714ca9132d08ff0f122aab8a4885b4ab682cc
DIST puppet-agent_1.3.2-1wheezy_amd64.deb 18316012 SHA256 9d36e5d2902e8ffa9cb19a51c0df26bfe9e15fa28daaff8fc7724185df460ae6 SHA512 d63a52a9e5cf6a0cb1438715ed3f1c8edddaf4c21335aac80771b283c577151519bfbf73028c3d6af702d03372220964b052c4b45190f838a0a7e5ade247923a WHIRLPOOL 789b9316dc0edf701da9ef73c6034501b261e71db86c29db2d4f737719a3d37a53ef71f5eb43d8b7c5d2ff465d44ab59f4f744a39ed20b6a7600624e5ef4b993
DIST puppet-agent_1.3.2-1wheezy_i386.deb 18248404 SHA256 7e6570f592a712c342c192643cacfb74ca103efea26191cb8b8baa0f359b0fca SHA512 66a092cd7579af5aff89e3c45897c2f3d036fc2fb6e35be3492bdfb273d33c356e4d5ff53362d303eead6b3c53aeef9e82da1371b3555c94f67f11a65f0f5b6d WHIRLPOOL 8cf9f5ddad6815511f2c09d76e66d456aa15c68af0485dfda86a081fa3f6ecbdeeaf4815838c2f6113a65890532164bbba1fb12fb9607c5d1fa8c95d4df14217
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
deleted file mode 100644
index f9888cf28fd..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
- !app-admin/mcollective
- !dev-ruby/hiera
- !dev-ruby/facter"
-
-DEPEND="
- ${DEPEND}
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
deleted file mode 100644
index 2af998ef77b..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
deleted file mode 100644
index d0c66a57f01..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
deleted file mode 100644
index d0c66a57f01..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
deleted file mode 100644
index 7de77c52fb1..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
deleted file mode 100644
index c46e0fc86c3..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
- /opt/puppetlabs/puppet
- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
- /opt/puppetlabs/puppet/lib/engines/*
- /opt/puppetlabs/puppet/lib/virt-what/*
- /opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
deleted file mode 100644
index 696bcc79467..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
- /opt/puppetlabs/puppet
- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
- /opt/puppetlabs/puppet/lib/engines/*
- /opt/puppetlabs/puppet/lib/virt-what/*
- /opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild
deleted file mode 100644
index 696bcc79467..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
- amd64? ( ${SRC_BASE}_amd64.deb )
- x86? ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
- !app-admin/mcollective
- !app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what"
-
-DEPEND="
- ${CDEPEND}"
-RDEPEND="${CDEPEND}
- sys-apps/dmidecode
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
- /opt/puppetlabs/puppet
- /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
- /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
- /opt/puppetlabs/puppet/lib/engines/*
- /opt/puppetlabs/puppet/lib/virt-what/*
- /opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/mcollective
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/mcollective
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- newinitd "${FILESDIR}/mcollective.initd" mcollective
- systemd_dounit "${FILESDIR}/puppet.service"
- systemd_dounit "${FILESDIR}/mcollective.service"
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym /opt/puppetlabs/bin/facter /usr/bin/facter
- dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym /opt/puppetlabs/bin/mco /usr/bin/mco
- dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
- dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
- dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
- dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
index 696bcc79467..2fb3b341c4c 100644
--- a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
@@ -49,8 +49,10 @@ QA_PREBUILT="
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
/opt/puppetlabs/puppet/lib/engines/*
/opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
/opt/puppetlabs/puppet/bin/*"
pkg_setup() {
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3c4be16c652..6ddfff75385 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,5 +1 @@
-DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f014da8886506819b21a6c2719366 SHA512 00960de13270a8063de1845f7f0c42a3fa4bdec10ab2b8f66ce0dba27acda1b78974c57c0f3c6e2c09187f63e85d799b94f95de563bcbc179e9d692470a1e902 WHIRLPOOL ec136a91b2712b9249defaff6ea24b6f1ed917e519850515d8c0b995c5dcbc049550b2ac9efbe585c197a5747edcdb10e490a016de2067b593c833e02d8a7426
-DIST puppetdb-3.0.2.tar.gz 24698063 SHA256 976ef25948b206ad9a0abfee1ac8a4e737e87b7d8b26c3af24bc3237d1dd757b SHA512 9bf8ed30f2156bd7e544899d0e135aeaa0a30b3df76245878ce27f3a195bb4a6356a143b65a7ba1bb8c8382e64d1d616131ffe7dbeea15d2d1b5bdd34a93fc8e WHIRLPOOL e55c7405b814ab39e7e58941c3c71ea31f7ebd42bb23de2d98f722a99382f50999fa83105b3d730d49188d137aee1bdf7ed63fc30f8a879809b6e4762ba00873
-DIST puppetdb-3.1.0.tar.gz 25250202 SHA256 e341de9cf9c2a698bb68fef75ef366fbd4760595131bdced3cd925f439d67535 SHA512 95dd5119e198f481f79f83fd7071932bf266b14e21730b5e4b5b19cf43bb1643d82f0c478da725da677f6dc58cfdd10ab4658481638fd48348c4113777e2a564 WHIRLPOOL cd338cf9ebd0a3ce4ec917ce7450a85e1c5dc8bb3c0fb7482bf62aceacbf2dab7d7fa3ddd83e1689f20dc022460ceb4bda231b436fa09c511dc307207cacfc28
-DIST puppetdb-3.2.0.tar.gz 25274763 SHA256 09527c4c4d70d14079f57dacf4744ecbfc1459ce10db0e2277909c37255adcc1 SHA512 71b68866ddb9c25d2903a30653c6e411464cbe2202f32d2d46edf6d72988ff00331a791d863f2c5f9dc3195038e35f753855c37ce68ac0a2b65a559d245c1ad6 WHIRLPOOL c7b7670b5571f6dcfcda74d091c1172e81f80705b9add1598a6687d2024f72f00ec21312e53209fbfda693f406d63a40616f3cb567c7cda873375fcac6f4b10d
DIST puppetdb-3.2.2.tar.gz 25273184 SHA256 c6ed59055ef54a3af0fc571fae54f23a99e4f4781783c0a9be4ef0df1012b2dd SHA512 5fdd22c3a14e447a997bf223e7147be22c51e8dd44d636ab51bf35c44c813ac2898fbfe72efba3896189244d56abd9cbac3782c7c8ab2f1648b6b1f01b53de45 WHIRLPOOL e138e39a277fad9a0dc56a2c573515ca257b272356381ed5e4d031743e014c3605c9754bf07307389192bee8ed057d02697096102300c15c5ed83990171c61e0
diff --git a/app-admin/puppetdb/puppetdb-3.0.1.ebuild b/app-admin/puppetdb/puppetdb-3.0.1.ebuild
deleted file mode 100644
index 512445aa334..00000000000
--- a/app-admin/puppetdb/puppetdb-3.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/export
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/import
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-3.0.2.ebuild b/app-admin/puppetdb/puppetdb-3.0.2.ebuild
deleted file mode 100644
index 512445aa334..00000000000
--- a/app-admin/puppetdb/puppetdb-3.0.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/export
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/import
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-3.1.0.ebuild b/app-admin/puppetdb/puppetdb-3.1.0.ebuild
deleted file mode 100644
index 9d2bed7b5e7..00000000000
--- a/app-admin/puppetdb/puppetdb-3.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/export
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/import
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-3.2.0.ebuild b/app-admin/puppetdb/puppetdb-3.2.0.ebuild
deleted file mode 100644
index 9d2bed7b5e7..00000000000
--- a/app-admin/puppetdb/puppetdb-3.2.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppetdb
- enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/export
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/import
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-3.2.2.ebuild b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
index 512445aa334..9d2bed7b5e7 100644
--- a/app-admin/puppetdb/puppetdb-3.2.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-1.7.0"
DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 93cc8628574..8d9a1d37b2c 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,3 +1 @@
-DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d WHIRLPOOL 357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537
-DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a WHIRLPOOL 6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f
DIST puppetserver-2.2.1.tar.gz 42665674 SHA256 583662380b161fc35e0f0c5e7e2964892ec4b7e0cb848cadcd76b29684a85843 SHA512 9b7036d886467a41d0d62d4651a91676d885dfa684aa757d9e27ce5ef5f8183f188f490e1594b6b936219a3dd9bee8f609df6229d5d26fd331677fcf1f61d034 WHIRLPOOL f0f15512be55fd49da80b2e839cef9bd9684ef23eab5e872d331b0802f790451c0fb16320b97d25d0bbb8e9bad08cd66c788c0a47643c8da4d973d6649f0da2c
diff --git a/app-admin/puppetserver/puppetserver-2.1.2.ebuild b/app-admin/puppetserver/puppetserver-2.1.2.ebuild
deleted file mode 100644
index fd0caba716d..00000000000
--- a/app-admin/puppetserver/puppetserver-2.1.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
- >=virtual/jdk-1.7.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/ca.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- dodir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # init type tasks
- newconfd ext/default puppetserver
- systemd_dounit ext/redhat/puppetserver.service
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
-}
-
-pkg_postinst() {
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
-}
diff --git a/app-admin/puppetserver/puppetserver-2.2.0.ebuild b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
deleted file mode 100644
index 0151a4d796a..00000000000
--- a/app-admin/puppetserver/puppetserver-2.2.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND+="
- >=virtual/jdk-1.7.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/auth.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym /opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- dodir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # init type tasks
- newconfd ext/default puppetserver
- systemd_dounit ext/redhat/puppetserver.service
- newinitd "${FILESDIR}/puppetserver.initd" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
-}
-
-pkg_postinst() {
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
-}
diff --git a/app-admin/puppetserver/puppetserver-2.2.1.ebuild b/app-admin/puppetserver/puppetserver-2.2.1.ebuild
index 0151a4d796a..cea870e96d7 100644
--- a/app-admin/puppetserver/puppetserver-2.2.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.2.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+="
>=virtual/jdk-1.7.0
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
new file mode 100644
index 00000000000..f720394d423
--- /dev/null
+++ b/app-admin/qtpass/Manifest
@@ -0,0 +1 @@
+DIST qtpass-1.0.5.tar.gz 636461 SHA256 0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281 SHA512 e1b63f1058dc9c194f06376d52acbbb8594d429f4d7fe4ba27baed2cafe10b1c36137b3e33626c1bf33c7f3e1444e6fbe48fc66a83e0f7cd82f5b47f0193d178 WHIRLPOOL acb914d89bcd667343f648e38bb9eb316ebbf0b01f75686d3a7694e82eedd3e3f52ffc99f530bbe3ccbb6089ced727796924fcf48a94c071a3e20b27141b28df
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
new file mode 100644
index 00000000000..6c4ad75441b
--- /dev/null
+++ b/app-admin/qtpass/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>spiderx@spiderx.dp.ua</email>
+ <name>Vladimir Pavljuchenkov</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <longdescription>
+QtPass is a multi-platform GUI for pass, the standard unix password manager.
+ </longdescription>
+ <upstream>
+ <changelog>https://github.com/IJHack/qtpass/releases</changelog>
+ <doc>https://github.com/IJHack/qtpass/wiki</doc>
+ <bugs-to>https://github.com/IJHack/qtpass/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/qtpass/qtpass-1.0.5.ebuild b/app-admin/qtpass/qtpass-1.0.5.ebuild
new file mode 100644
index 00000000000..ed2aa21369c
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="+qt5"
+DOCS=( FAQ.md README.md CONTRIBUTING.md )
+
+RDEPEND="qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[xcb]
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5
+ )
+ !qt5? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ app-admin/pass"
+DEPEND="${RDEPEND}
+ qt5? ( dev-qt/linguist-tools:5 )"
+
+src_prepare() {
+ # Modify install path
+ sed -i "s/target.path = \$\$PREFIX/target.path = \$\$PREFIX\/bin/" \
+ ${PN}.pro \
+ || die "sed failed to modify install path for ${PN}.pro"
+
+ # Backport segfault fix https://github.com/IJHack/qtpass/issues/122
+ # (ToDo: remove this in 1.0.6)
+ sed -e "/QtPass = NULL;/{n;d};/startupPhase = true;/a autoclearTimer = NULL;" \
+ -i mainwindow.cpp || die "sed failed mainwindow.cpp"
+
+ epatch_user
+}
+
+src_configure() {
+ if use qt5 ; then
+ eqmake5 PREFIX="${D}"/usr
+ else
+ eqmake4 PREFIX="${D}"/usr
+ fi
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/applications
+ doins "${PN}.desktop"
+
+ newicon artwork/icon.svg "${PN}-icon.svg"
+}
diff --git a/app-arch/rar/rar-5.3.0.ebuild b/app-arch/rar/rar-5.3.0.ebuild
index bf31841b9ca..6e7d95d2603 100644
--- a/app-arch/rar/rar-5.3.0.ebuild
+++ b/app-arch/rar/rar-5.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE="all_sfx static"
DEPEND="all_sfx? ( app-arch/unrar )"
diff --git a/app-backup/backintime/backintime-1.1.8-r1.ebuild b/app-backup/backintime/backintime-1.1.8-r1.ebuild
index ce92e3352aa..e1e6148a501 100644
--- a/app-backup/backintime/backintime-1.1.8-r1.ebuild
+++ b/app-backup/backintime/backintime-1.1.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="qt4"
DEPEND="${PYTHON_DEPS}
diff --git a/app-backup/duplicity/duplicity-0.6.26.ebuild b/app-backup/duplicity/duplicity-0.6.26.ebuild
index eb05c0b5694..a752613e1bd 100644
--- a/app-backup/duplicity/duplicity-0.6.26.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="
diff --git a/app-backup/obnam/obnam-1.18.2-r1.ebuild b/app-backup/obnam/obnam-1.18.2-r1.ebuild
index dff2085b7a6..4b283461555 100644
--- a/app-backup/obnam/obnam-1.18.2-r1.ebuild
+++ b/app-backup/obnam/obnam-1.18.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ DEPEND="${PYTHON_DEPS}
dev-python/cliapp[${PYTHON_USEDEP}]
dev-python/fuse-python[${PYTHON_USEDEP}]
dev-python/larch[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/tracing[${PYTHON_USEDEP}]
dev-python/ttystatus[${PYTHON_USEDEP}]
diff --git a/app-backup/obnam/obnam-1.18.2-r2.ebuild b/app-backup/obnam/obnam-1.18.2-r2.ebuild
new file mode 100644
index 00000000000..dc2efb705da
--- /dev/null
+++ b/app-backup/obnam/obnam-1.18.2-r2.ebuild
@@ -0,0 +1,51 @@
+# 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 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[${PYTHON_USEDEP}]
+ dev-python/fuse-python[${PYTHON_USEDEP}]
+ dev-python/larch[${PYTHON_USEDEP}]
+ <dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/tracing[${PYTHON_USEDEP}]
+ dev-python/ttystatus[${PYTHON_USEDEP}]
+ "
+RDEPEND="${DEPEND}"
+
+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-dicts/mecab-unidic/Manifest b/app-dicts/mecab-unidic/Manifest
new file mode 100644
index 00000000000..1ad050d6ce7
--- /dev/null
+++ b/app-dicts/mecab-unidic/Manifest
@@ -0,0 +1 @@
+DIST unidic-mecab-2.1.2_src.zip 140517811 SHA256 6cce98269214ce7de6159f61a25ffc5b436375c098cc86d6aa98c0605cbf90d4 SHA512 db80feab873851df874781fe81430ee90e238f166b90e77755a112602e0f22a7c4c5deb4ce8bcd357d258d8d806d917652e6723bf2a1b786942952fbbcb52782 WHIRLPOOL 019dba71eef24f71814c1e493822d0699d40cd4cc58c5cfba622006f637ae788712948b4f534896f5f9b92f7c9e9991e68a63d6eafa73b140ff5fdb58bea102f
diff --git a/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
new file mode 100644
index 00000000000..166c88bfa00
--- /dev/null
+++ b/app-dicts/mecab-unidic/mecab-unidic-2.1.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="unidic-mecab-${PV}_src"
+
+DESCRIPTION="IPA dictionary for MeCab"
+HOMEPAGE="https://osdn.jp/projects/unidic/"
+SRC_URI="mirror://sourceforge.jp/unidic/58338/${MY_P}.zip"
+
+LICENSE="|| ( BSD GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="app-text/mecab"
+S="${WORKDIR}/${MY_P}"
diff --git a/app-text/epubcheck/metadata.xml b/app-dicts/mecab-unidic/metadata.xml
index fc4e4eb003b..0f2bc9a7af2 100644
--- a/app-text/epubcheck/metadata.xml
+++ b/app-dicts/mecab-unidic/metadata.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>flameeyes@gentoo.org</email>
- </maintainer>
+ <herd>cjk</herd>
<upstream>
- <remote-id type="github">IDPF/epubcheck</remote-id>
+ <remote-id type="sourceforge-jp">unidic</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index 9271416a4bf..387c5b9e85c 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -1,3 +1,6 @@
DIST dict-de_at-frami_2013-12-06.oxt 5923995 SHA256 3e1d962188a9a5d49388231d5bd6b286f3c64ba7ed39a2ce84e579ebf40019b5 SHA512 a37e061be99ba074ff52b3e0320bbb814d3f504ad353c4e562ea9617d0b60f9b2feb4d1453b55c78a6b659420c7baf0e7601e66489c9c25df9a8bad92d9aebb5 WHIRLPOOL 61c356dd5ea765ebb470861394aaf7939c30b2006e9a0d2fa78938a3d700b6adb07d2a4a158a0d3cc9ffab8189c7792c244ae587611168fb91f79f5f5f7c2bb3
+DIST dict-de_at-frami_2015-12-28.oxt 8110628 SHA256 07851d417063e12a28eef21b8b343f49fdf218079f434ec79c1e18282246bbab SHA512 2d4188174fb3f7cb2ca175d54342395980497183c0c6ea233217491226b19a0f19f806935e0eb3798229db89fd3ebf93cb5b210ba326dcb1cc8b862c48aecd02 WHIRLPOOL ce2f9e31a2d008e021d10746c68524a4682ab7943ea4f11dd56a35fd70095eb1fbfe4963c19bb8ad5c6b5fe8770e28dc397dd1e799457188e30cd3163a9d6e9e
DIST dict-de_ch-frami_2013-12-06.oxt 5914138 SHA256 b053ba0f63b276bafbc1910414a735d099b59955d592f01feedbb8faf6af4ad6 SHA512 d93107b639fc9630ccd0f2afa5a9d639ea444f14e08bd4ebe5ba7c082d7cb516c2a59aa8c3ef7c743872687cc47c45b5ffb5f4be70d2449e61bf65e5cf6c84d6 WHIRLPOOL 2573ae9008191182dabbe06b67910aa82bcd76c6ef5d55757bac402f177e8c4ca105104c04dbba0b68447d6e25c0730f9c71fb3247f14c931b3503967b81c6db
+DIST dict-de_ch-frami_2015-12-28.oxt 8101312 SHA256 7c5fe404f403f8c7138de6992b71fe448913392cfb1d06826e3584d6e61fcfcb SHA512 b62ad082fbef3785b5cd29bb530a4f5367771af6237d10a9ee922f0deaff0ccdd7c0a9cd93a9218444b07bf278efdb18f497660513af4b8862998ab3bb434f5a WHIRLPOOL 621bef6ca473025800fe96a74df8d2ef39c15d2e1214bd4363ec38b4513bdb6fd8ddf54d6d38245c3371f2cd6357607558d60c9fb6b36c1610e41cfca0f404b7
DIST dict-de_de-frami_2013-12-06.oxt 5924352 SHA256 c82ebfc13b047c5acb28a7b12b42447a7e7c07fbdf24ab5ef77bf099cfbab0a9 SHA512 bf852bd6be13ee02673d9011cabb6ac89b4095e529b3c44651473a06c5c0b1f9ad1261934c157654933b1ce35470e9b900f381219654d6ecc81bb3ebb221ab6f WHIRLPOOL 273da46a23667c59092f33a584f559368f1b82149fc78ec5eef78bef9bde0246252affc3097090fa076a3037da88f2fba9b16bd961041e3efea89a2c021a5d74
+DIST dict-de_de-frami_2015-12-28.oxt 8110832 SHA256 4c9520497b38712d093ca8ea57edb4d04569d4f700ea35379c082862628389c6 SHA512 242cfa3f9f8046badbd56560d05cc47a2b0bc89b263f9141443b3401981e91a1124d1c2f76ae77ea017b02a34567cf4c160c31e2250f90d095a74b92dd3d636a WHIRLPOOL 140c9c7e11b69481526d94cc803e63eb8df8a073ac99d515c8bad7ebace43a04fb41b11f8215447a58385157f40fe223e9173304af4210f5eba6eebc07a12fb6
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
new file mode 100644
index 00000000000..bc11de16971
--- /dev/null
+++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MYSPELL_DICT=(
+ "de_AT.aff"
+ "de_AT.dic"
+ "de_DE.aff"
+ "de_DE.dic"
+ "de_CH.aff"
+ "de_CH.dic"
+)
+
+MYSPELL_HYPH=(
+ "hyph_de_AT.dic"
+ "hyph_de_DE.dic"
+ "hyph_de_CH.dic"
+)
+
+MYSPELL_THES=(
+ "th_de_AT_v2.dat"
+ "th_de_AT_v2.idx"
+ "th_de_DE_v2.dat"
+ "th_de_DE_v2.idx"
+ "th_de_CH_v2.dat"
+ "th_de_CH_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="German dictionaries for myspell/hunspell"
+HOMEPAGE="
+ http://extensions.libreoffice.org/extension-center/german-de-at-frami-dictionaries
+ http://extensions.libreoffice.org/extension-center/german-de-de-frami-dictionaries
+ http://extensions.libreoffice.org/extension-center/german-de-ch-frami-dictionaries
+"
+SRC_URI="
+ http://extensions.libreoffice.org/extension-center/german-de-at-frami-dictionaries/pscreleasefolder.2011-11-05.7614737245/${PV}/dict-de_at-frami_${PV//./-}.oxt
+ http://extensions.libreoffice.org/extension-center/german-de-de-frami-dictionaries/releases/${PV}/dict-de_de-frami_${PV//./-}.oxt
+ http://extensions.libreoffice.org/extension-center/german-de-ch-frami-dictionaries/pscreleasefolder.2011-11-05.5296069116/${PV}/dict-de_ch-frami_${PV//./-}.oxt
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+ # rename the tarballs
+ for i in *_frami.*; do
+ mv "${i}" "${i/_frami}" || die
+ done
+}
diff --git a/app-editors/kile/kile-2.1.3-r1.ebuild b/app-editors/kile/kile-2.1.3-r2.ebuild
index e6f2e9ee83b..88bf9771a7b 100644
--- a/app-editors/kile/kile-2.1.3-r1.ebuild
+++ b/app-editors/kile/kile-2.1.3-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdeapps_dep kdebase-data)
- $(add_kdeapps_dep konsole)
+ || ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
|| (
$(add_kdeapps_dep okular 'pdf?,postscript')
app-text/acroread
diff --git a/app-emulation/libvirt/files/libvirtd.init-r16 b/app-emulation/libvirt/files/libvirtd.init-r16
new file mode 100644
index 00000000000..2aa9a880dba
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirtd.init-r16
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Virtual Machine Management daemon (libvirt)"
+
+LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
+LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+
+command="/usr/sbin/libvirtd"
+command_args="-d ${LIBVIRTD_OPTS}"
+start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
+pidfile="/var/run/libvirtd.pid"
+retry="${LIBVIRTD_TERMTIMEOUT}"
+
+depend() {
+ need virtlogd
+ use dbus virtlockd
+ after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
+ USE_FLAG_FIREWALLD
+ USE_FLAG_AVAHI
+ USE_FLAG_ISCSI
+ USE_FLAG_RBD
+}
+
+start_pre() {
+ # Test configuration directories in /etc/libvirt/ to be either not
+ # present or a directory, i.e. not a regular file, bug #532892
+
+ checkpath --directory /etc/libvirt/lxc || return 1
+ checkpath --directory /etc/libvirt/nwfilter || return 1
+ checkpath --directory /etc/libvirt/qemu || return 1
+ checkpath --directory /etc/libvirt/storage || return 1
+}
diff --git a/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
new file mode 100644
index 00000000000..f4d64e71197
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS="20151222" # CVE-2015-5313
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+ SRC_URI=""
+ KEYWORDS=""
+ SLOT="0"
+else
+ # Versions with 4 numbers are stable updates:
+ if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+ SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+ else
+ SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+ fi
+ SRC_URI+=" ${BACKPORTS:+
+ https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+ lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+ selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+ xen"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ uml? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/netcat6-1.0-r2
+ >=net-libs/gnutls-1.0.25
+ net-libs/libssh2
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ >=sys-apps/util-linux-2.17
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
+ caps? ( sys-libs/libcap-ng )
+ firewalld? ( net-firewall/firewalld )
+ fuse? ( >=sys-fs/fuse-2.8.6 )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+ lxc? ( !systemd? ( sys-power/pm-utils ) )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ openvz? ( sys-kernel/openvz-sources:* )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-0.13.0
+ dev-libs/yajl
+ !systemd? ( sys-power/pm-utils )
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ systemd? ( sys-apps/systemd )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )"
+
+DEPEND="${RDEPEND}
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ virtual/pkgconfig"
+
+pkg_setup() {
+ enewgroup qemu 77
+ enewuser qemu 77 -1 -1 qemu kvm
+
+ # Some people used the masked ebuild which was not adding the qemu
+ # user to the kvm group originally. This results in VMs failing to
+ # start for some users. bug #430808
+ egetent group kvm | grep -q qemu
+ if [[ $? -ne 0 ]]; then
+ gpasswd -a qemu kvm
+ fi
+
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~DEVPTS_MULTIPLE_INSTANCES
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap"
+
+ if [[ ${PV} = *9999* ]]; then
+ # git checkouts require bootstrapping to create the configure script.
+ # Additionally the submodules must be cloned to the right locations
+ # bug #377279
+ ./bootstrap || die "bootstrap failed"
+ (
+ git submodule status | sed 's/^[ +-]//;s/ .*//'
+ git hash-object bootstrap.conf
+ ) >.git-module-status
+ fi
+
+ epatch \
+ "${FILESDIR}"/${P}-do_not_use_sysconf.patch \
+ "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+ "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+ [[ -n ${BACKPORTS} ]] &&
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+ epatch_user
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -e "s/USE_FLAG_AVAHI/$(usex avahi 'use avahi-daemon' '')/" \
+ -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
+ -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+
+ AUTOTOOLS_AUTORECONF=true
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with apparmor)
+ $(use_with apparmor apparmor-profiles)
+ $(use_with audit)
+ $(use_with avahi)
+ $(use_with caps capng)
+ $(use_with firewalld)
+ $(use_with fuse)
+ $(use_with glusterfs)
+ $(use_with glusterfs storage-gluster)
+ $(use_with iscsi storage-iscsi)
+ $(use_with libvirtd)
+ $(use_with lvm storage-lvm)
+ $(use_with lvm storage-mpath)
+ $(use_with lxc)
+ $(use_with macvtap)
+ $(use_enable nls)
+ $(use_with numa numactl)
+ $(use_with numa numad)
+ $(use_with openvz)
+ $(use_with parted storage-disk)
+ $(use_with pcap libpcap)
+ $(use_with phyp)
+ $(use_with policykit polkit)
+ $(use_with qemu)
+ $(use_with qemu yajl)
+ $(use_with rbd storage-rbd)
+ $(use_with sasl)
+ $(use_with selinux)
+ $(use_with systemd systemd-daemon)
+ $(usex systemd --with-init-script=systemd '')
+ $(use_with udev)
+ $(use_with uml)
+ $(use_with vepa virtualport)
+ $(use_with virt-network network)
+ $(use_with wireshark-plugins wireshark-dissector)
+ $(use_with xen)
+ $(use_with xen xen-inotify)
+ $(usex xen --with-libxl '')
+
+ --without-hal
+ --without-netcf
+ --without-sanlock
+ --without-xenapi
+ --with-esx
+ --with-qemu-group=$(usex caps qemu root)
+ --with-qemu-user=$(usex caps qemu root)
+ --with-remote
+ --with-storage-fs
+ --with-vmware
+
+ --disable-static
+ --disable-werror
+
+ --with-html-subdir=${PF}/html
+ --localstatedir=/var
+ )
+
+ if use virtualbox && has_version app-emulation/virtualbox-ose; then
+ myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+ else
+ myeconfargs+=( $(use_with virtualbox vbox) )
+ fi
+
+ autotools-utils_src_configure
+
+ if [[ ${PV} = *9999* ]]; then
+ # Restore gnulib's config.sub and config.guess
+ # bug #377279
+ (cd .gnulib && git reset --hard > /dev/null)
+ fi
+
+ # Workaround: Sometimes this subdirectory is missing and leads to a
+ # build failure.
+ mkdir -p "${BUILD_DIR}"/docs/internals
+}
+
+src_test() {
+ # Explicitly allow parallel build of tests
+ export VIR_TEST_DEBUG=1
+ HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+ autotools-utils_src_compile install \
+ DESTDIR="${D}" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+ find "${D}" -name '*.la' -delete || die
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var/cache
+ rm -rf "${D}"/var/run
+ rm -rf "${D}"/var/log
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ use systemd && systemd_install_serviced \
+ "${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd || die
+ newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+ FORCE_PRINT_ELOG=true
+ fi
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index fafcf9f1d47..6711b5bdcd7 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,3 @@
-DIST lxd-0.23.tar.bz2 2606330 SHA256 06335bd15b00db2dec06114427b1d934fe1ac5271b85eb19074c508cb2466695 SHA512 2f73817c800c55c722a3017ee3064587c04730d5da9846b44be99b4541e739b466bcb7e924fcb18a15f1d49d010d471510378060530f6a15f6e60363b4d556b3 WHIRLPOOL 455b782ed2d21d5a720e06e356e1dd2115df174893e66710c74d02596deb8a66ff6e77b400f2ebeb047209b3bfed0927ff21a3a9f7cf9924719b84742f0eb5a7
DIST lxd-0.24.tar.bz2 1973022 SHA256 e3851bded0f2639e4aec9c63797135bfa3b27def17123c8e506c784b1ab4c99a SHA512 e7593136fd1fb13542a8415d964ff3bab8bcc7f7a7d806874e7c21fd9d96652aa5716a9d3318cea3d849a19aa96b40bfea27f4edd528c8307efaeeac88971f2e WHIRLPOOL 69b6722a25c9e75e533436a37951dc893cbf3d3c0f5d31b3ccc2cf0a7dede9cf16c53e68562348ab9bf9e621421030b826df21e5fb32df8a496127601fa5d898
DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
+DIST lxd-0.26.tar.bz2 1985288 SHA256 71079140946e3e66563cc3025c3e4f756fd45cc413af1d5396c56a608427d0aa SHA512 25aa73274b03163698646fe2f49c2401ae93a9b90be46f0ba0414521bc920e68c61db7e6617d75a19675e22a705afd5d3220e24a518e30819daf3dc75670b900 WHIRLPOOL d59471f02744efbe3d3dbb1ae32dcf17141f8414a1614535451e75c5422928d3c5d54dceebcf0d829f7395ae3cb49bf424ff7999d1e32b9384a3f81b3d3ab01e
diff --git a/app-emulation/lxd/files/lxd-0.23-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
index 1b229ea99cd..9964af6aec4 100644
--- a/app-emulation/lxd/files/lxd-0.23-dont-go-get.patch
+++ b/app-emulation/lxd/files/lxd-0.26-dont-go-get.patch
@@ -1,9 +1,10 @@
---- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
-+++ Makefile 2015-09-17 20:53:27.715800926 -0500
-@@ -12,15 +12,11 @@
+--- Makefile.orig 2015-12-28 19:23:28.425122306 -0600
++++ Makefile 2015-12-28 19:25:09.482123654 -0600
+@@ -12,17 +12,11 @@
.PHONY: default
default:
+- # Must run twice due to go get race
- -go get -t -v -d ./...
- -go get -t -v -d ./...
go install -v ./...
@@ -11,6 +12,7 @@
.PHONY: client
client:
+- # Must run twice due to go get race
- -go get -t -v -d ./...
- -go get -t -v -d ./...
go install -v ./lxc
diff --git a/app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
index 7373b66969b..7373b66969b 100644
--- a/app-emulation/lxd/files/lxd-0.23-nc-binary-name.patch
+++ b/app-emulation/lxd/files/lxd-0.26-nc-binary-name.patch
diff --git a/app-emulation/lxd/files/lxd-0.23.confd b/app-emulation/lxd/files/lxd-0.26.confd
index 3d553276a5e..3d553276a5e 100644
--- a/app-emulation/lxd/files/lxd-0.23.confd
+++ b/app-emulation/lxd/files/lxd-0.26.confd
diff --git a/app-emulation/lxd/files/lxd-0.23.initd b/app-emulation/lxd/files/lxd-0.26.initd
index c5ba3a66db1..ec23258c19d 100644
--- a/app-emulation/lxd/files/lxd-0.23.initd
+++ b/app-emulation/lxd/files/lxd-0.26.initd
@@ -6,7 +6,7 @@
DAEMON=/usr/sbin/lxd
PIDFILE=/run/lxd.pid
-extra_commands="shutdown"
+extra_commands="stopall"
depend() {
need net
@@ -32,7 +32,7 @@ start() {
stop() {
if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then
- shutdown
+ stopall
else
ebegin "Stopping lxd service (but not containers)"
start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
@@ -40,9 +40,9 @@ stop() {
fi
}
-shutdown() {
+stopall() {
ebegin "Stopping lxd service and containers"
- if ${DAEMON} shutdown; then
+ if "${DAEMON}" shutdown; then
/etc/init.d/lxd zap
rm -f ${PIDFILE}
fi
diff --git a/app-emulation/lxd/lxd-0.23.ebuild b/app-emulation/lxd/lxd-0.26.ebuild
index 549dff584e5..ce1664213fe 100644
--- a/app-emulation/lxd/lxd-0.23.ebuild
+++ b/app-emulation/lxd/lxd-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
index 8e1c138209c..f074d914da9 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 -x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,7 +36,7 @@ DEPEND="sys-devel/gettext
sys-devel/bin86
sys-apps/texinfo"
-RDEPEND=">=app-emulation/xen-4.2.1"
+RDEPEND=">=app-emulation/xen-tools-${PV}"
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
index 25ada738dfa..eb54859f438 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 -x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,7 +37,7 @@ DEPEND="sys-devel/gettext
sys-apps/texinfo
x11-libs/pixman"
-RDEPEND=">=app-emulation/xen-4.2.1"
+RDEPEND=">=app-emulation/xen-tools-${PV}"
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 69abb000df1..008dddbd022 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,20 +1,13 @@
DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac
-DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a
DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
-DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a
-DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
-DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
-DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
-DIST xen-gentoo-patches-5.tar.xz 23664 SHA256 41e23ec6fb5a4ef5a1f8746de0e33579de2c725368afed6bd2b7506df5e8c2b5 SHA512 8370cef1aa06585e8fa8f8c6eb7f29375ac6f5a240c859ebb6982d1c1ec159c9c331c861f39838f53093cdceca24ee1b0d98c1c92874dd4113e73eb884842eac WHIRLPOOL 4b65283220b66555a69b65331d3dcb8b8353fef584eb723c2a703712bc6eac57b70f500eeeffc511e75d3ab5d3a1eac8aac83133baf4c90ab498b1843764eb9f
DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4
DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346
DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6
DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f
-DIST xen-security-patches-6.tar.xz 24780 SHA256 b41422583e5f7b4c85b82d89ab66f3e0fa8de8fdb2ae42aa3da40822e9507ef5 SHA512 c58831eb5e26a78a3072623b83bad125ddd4cd67c0075a708be81a7f50ee936cd2e5832a9b88129e11ec81ebafc9cfbc339fb8296d6f4b44c04630b349c4a621 WHIRLPOOL edecaefef0b6dd1a10c479362362640d9bd7a43623085c1f20b1171c65746220d7fdfd0e20892f60ea7d2f6052389da2a1d3c0179a88d7c4d52b3aa33cbef05e
DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild
deleted file mode 100644
index d29aab3691f..00000000000
--- a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild
+++ /dev/null
@@ -1,391 +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='xml,threads'
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
- REPO="xen-unstable.hg"
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
- S="${WORKDIR}/${REPO}"
- live_eclass="mercurial"
-else
- KEYWORDS="amd64 x86"
- UPSTREAM_VER=9
- SECURITY_VER=6
- # xen-tools's gentoo patches tarball
- GENTOO_VER=1
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=0
- SEABIOS_VER=1.6.3.2
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
- http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
- https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
- S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
-
-REQUIRED_USE="hvm? ( qemu )
- ${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libgcrypt:0
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pypam[${PYTHON_USEDEP}]
- sys-libs/zlib
- sys-power/iasl
- system-seabios? ( sys-firmware/seabios )
- sys-firmware/ipxe
- dev-ml/findlib
- hvm? ( media-libs/libsdl )
- ${PYTHON_DEPS}
- api? ( dev-libs/libxml2
- net-misc/curl )
- ${PYTHON_DEPS}
- pygrub? ( $(python_gen_impl_dep ncurses) )
- sys-devel/bin86
- sys-devel/dev86
- dev-lang/perl
- app-misc/pax-utils
- doc? (
- app-doc/doxygen
- dev-tex/latex2html[png,gif]
- media-gfx/transfig
- media-gfx/graphviz
- dev-tex/xcolor
- dev-texlive/texlive-latexextra
- virtual/latex-base
- dev-tex/latexmk
- dev-texlive/texlive-latex
- dev-texlive/texlive-pictures
- dev-texlive/texlive-latexrecommended
- )
- hvm? ( x11-proto/xproto
- !net-libs/libiscsi )"
-RDEPEND="sys-apps/iproute2
- net-misc/bridge-utils
- ocaml? ( >=dev-lang/ocaml-4 )
- screen? (
- app-misc/screen
- app-admin/logrotate
- )
- virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if has_version dev-libs/libgcrypt:0; then
- export "CONFIG_GCRYPT=y"
- fi
-
- if use qemu; then
- export "CONFIG_IOEMU=y"
- else
- export "CONFIG_IOEMU=n"
- fi
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- use api && export "LIBXENAPI_BINDINGS=y"
- use flask && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patcheset"
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- epatch "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patcheset"
- source "${WORKDIR}"/patches-security/${PV}.conf
- # apply main xen patches
- for i in ${XEN_SECURITY_MAIN}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
- fi
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patcheset"
- source "${FILESDIR}"/gentoo-patches.conf
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
-
- if gcc-specs-pie; then
- epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
- fi
-
- # if the user *really* wants to use their own custom-cflags, let them
- if use custom-cflags; then
- einfo "User wants their own CFLAGS - removing defaults"
-
- # try and remove all the default cflags
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
- -exec sed \
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
- -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"
- fi
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
- fi
-
- # Disable hvm support on systems that don't support x86_32 binaries.
- if ! use hvm; then
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- # Don't bother with qemu, only needed for fully virtualised guests
- if ! use qemu; then
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
- fi
-
- mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
- sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
- # Bug 445986
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
-
- # fix QA warning, create /var/run/, /var/lock dynamically
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
- tools/libxl/Makefile || die
-
- sed -i -e "/\/var\/run\//d" \
- tools/xenstore/Makefile \
- tools/pygrub/Makefile || die
-
- sed -i -e "/\/var\/lock\/subsys/d" \
- tools/Makefile || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons || die
-
- epatch_user
-}
-
-src_compile() {
- export VARTEXFONTS="${T}/fonts"
- 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
- emake -C docs man-pages
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
- # Fix the remaining Python shebangs.
- python_fix_shebang "${ED}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}"tmp || die
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=1:autoballoon=1:' \
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
- -i tools/examples/xl.conf || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
- dohtml -r docs/
- docinto pdf
- dodoc ${DOCS[@]}
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
- fi
-
- rm -rf "${D}"/usr/share/doc/xen/
- doman docs/man?/*
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
- mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # xend expects these to exist
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Temp QA workaround
- dodir "$(get_udevdir)"
- mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
- rm -rf "${D}"/etc/udev
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
- elog "http://wiki.xen.org/wiki/Main_Page"
- elog ""
- 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"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- 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-tools/xen-tools-4.2.5-r11.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild
deleted file mode 100644
index 392be102451..00000000000
--- a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild
+++ /dev/null
@@ -1,391 +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='xml,threads'
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
- REPO="xen-unstable.hg"
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
- S="${WORKDIR}/${REPO}"
- live_eclass="mercurial"
-else
- KEYWORDS="amd64 x86"
- UPSTREAM_VER=10
- SECURITY_VER=7
- # xen-tools's gentoo patches tarball
- GENTOO_VER=5
- # xen-tools's gentoo patches version which apply to this specific ebuild
- GENTOO_GPV=1
- SEABIOS_VER=1.6.3.2
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
- http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
- https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
- S="${WORKDIR}/xen-${PV}"
-fi
-
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
-
-DESCRIPTION="Xend daemon and tools"
-HOMEPAGE="http://xen.org/"
-DOCS=( README docs/README.xen-bugtool )
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
-
-REQUIRED_USE="hvm? ( qemu )
- ${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-libs/lzo:2
- dev-libs/glib:2
- dev-libs/yajl
- dev-libs/libgcrypt:0
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pypam[${PYTHON_USEDEP}]
- sys-libs/zlib
- sys-power/iasl
- system-seabios? ( sys-firmware/seabios )
- sys-firmware/ipxe
- dev-ml/findlib
- hvm? ( media-libs/libsdl )
- ${PYTHON_DEPS}
- api? ( dev-libs/libxml2
- net-misc/curl )
- ${PYTHON_DEPS}
- pygrub? ( $(python_gen_impl_dep ncurses) )
- sys-devel/bin86
- sys-devel/dev86
- dev-lang/perl
- app-misc/pax-utils
- doc? (
- app-doc/doxygen
- dev-tex/latex2html[png,gif]
- media-gfx/transfig
- media-gfx/graphviz
- dev-tex/xcolor
- dev-texlive/texlive-latexextra
- virtual/latex-base
- dev-tex/latexmk
- dev-texlive/texlive-latex
- dev-texlive/texlive-pictures
- dev-texlive/texlive-latexrecommended
- )
- hvm? ( x11-proto/xproto
- !net-libs/libiscsi )"
-RDEPEND="sys-apps/iproute2
- net-misc/bridge-utils
- ocaml? ( >=dev-lang/ocaml-4 )
- screen? (
- app-misc/screen
- app-admin/logrotate
- )
- virtual/udev"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
-
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- export "CONFIG_LOMOUNT=y"
-
- #bug 522642, disable compile tools/tests
- export "CONFIG_TESTS=n"
-
- if has_version dev-libs/libgcrypt:0; then
- export "CONFIG_GCRYPT=y"
- fi
-
- if use qemu; then
- export "CONFIG_IOEMU=y"
- else
- export "CONFIG_IOEMU=n"
- fi
-
- if [[ -z ${XEN_TARGET_ARCH} ]] ; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64 ; then
- export XEN_TARGET_ARCH="x86_64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- use api && export "LIBXENAPI_BINDINGS=y"
- use flask && export "FLASK_ENABLE=y"
-}
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- einfo "Try to apply Xen Upstream patcheset"
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- epatch "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patcheset"
- source "${WORKDIR}"/patches-security/${PV}.conf
- # apply main xen patches
- for i in ${XEN_SECURITY_MAIN}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/xen/$i
- done
-
- # apply qemu-traditional patches
- pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
- for i in ${XEN_SECURITY_QEMUT}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/qemut/$i
- done
- popd > /dev/null
-
- # apply qemu-xen/upstream patches
- pushd "${S}"/tools/qemu-xen/ > /dev/null
- for i in ${XEN_SECURITY_QEMUU}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/qemuu/$i
- done
- popd > /dev/null
- fi
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
- einfo "Try to apply Gentoo specific patcheset"
- source "${FILESDIR}"/gentoo-patches.conf
- _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
- for i in ${!_gpv}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-gentoo/$i
- done
- fi
-
- use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
-
- if gcc-specs-pie; then
- epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
- fi
-
- # if the user *really* wants to use their own custom-cflags, let them
- if use custom-cflags; then
- einfo "User wants their own CFLAGS - removing defaults"
-
- # try and remove all the default cflags
- find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
- -exec sed \
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
- -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"
- fi
-
- if ! use pygrub; then
- sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
- fi
-
- # Disable hvm support on systems that don't support x86_32 binaries.
- if ! use hvm; then
- sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
- sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
- # Bug 351648
- elif ! use x86 && ! has x86 $(get_all_abis); then
- mkdir -p "${WORKDIR}"/extra-headers/gnu || die
- touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
- export CPATH="${WORKDIR}"/extra-headers
- fi
-
- # Don't bother with qemu, only needed for fully virtualised guests
- if ! use qemu; then
- sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
- sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
- fi
-
- mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
- pushd tools/firmware/ > /dev/null
- ln -s seabios-dir-remote seabios-dir || die
- popd > /dev/null
-
- # Reset bash completion dir; Bug 472438
- sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
- -i Config.mk || die
- sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
- # Bug 445986
- sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
-
- # fix QA warning, create /var/run/, /var/lock dynamically
- sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
- tools/libxl/Makefile || die
-
- sed -i -e "/\/var\/run\//d" \
- tools/xenstore/Makefile \
- tools/pygrub/Makefile || die
-
- sed -i -e "/\/var\/lock\/subsys/d" \
- tools/Makefile || die
-
- # xencommons, Bug #492332, sed lighter weight than patching
- sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
- -i tools/hotplug/Linux/init.d/xencommons || die
-
- epatch_user
-}
-
-src_compile() {
- export VARTEXFONTS="${T}/fonts"
- 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
- emake -C docs man-pages
-}
-
-src_install() {
- # Override auto-detection in the build system, bug #382573
- export INITD_DIR=/tmp/init.d
- export CONFIG_LEAF_DIR=../tmp/default
-
- # Let the build system compile installed Python modules.
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
- XEN_PYTHON_NATIVE_INSTALL=y install-tools
- # Fix the remaining Python shebangs.
- python_fix_shebang "${ED}"
-
- # Remove RedHat-specific stuff
- rm -rf "${D}"tmp || die
-
- # uncomment lines in xl.conf
- sed -e 's:^#autoballoon=1:autoballoon=1:' \
- -e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
- -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
- -i tools/examples/xl.conf || die
-
- if use doc; then
- emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-
- dohtml -r docs/
- docinto pdf
- dodoc ${DOCS[@]}
- [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
- fi
-
- rm -rf "${D}"/usr/share/doc/xen/
- doman docs/man?/*
-
- newconfd "${FILESDIR}"/xendomains.confd xendomains
- newconfd "${FILESDIR}"/xenstored.confd xenstored
- newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
- newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
- newinitd "${FILESDIR}"/xenstored.initd xenstored
- newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
- newinitd "${FILESDIR}"/xencommons.initd xencommons
- newconfd "${FILESDIR}"/xencommons.confd xencommons
-
- if use screen; then
- cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
- cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
- keepdir /var/log/xen-consoles
- fi
-
- if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
- mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
- mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
- fi
-
- # For -static-libs wrt Bug 384355
- if ! use static-libs; then
- rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
- fi
-
- # xend expects these to exist
- keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
-
- # for xendomains
- keepdir /etc/xen/auto
-
- # Temp QA workaround
- dodir "$(get_udevdir)"
- mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
- rm -rf "${D}"/etc/udev
-
- # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
- find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
- -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the offical wiki page:"
- elog "https://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
- elog "http://wiki.xen.org/wiki/Main_Page"
- elog ""
- 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"
- elog "support enable the hvm use flag."
- elog "An x86 or amd64 system is required to build HVM support."
- 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-tools/xen-tools-4.5.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
index a14716903af..acef34ad2ca 100644
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=
SECURITY_VER=7
# vars set to reflect https://dev.gentoo.org/~idella4/
@@ -85,6 +85,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-python/lxml[${PYTHON_USEDEP}]
+ x86? ( sys-devel/dev86
+ sys-power/iasl )
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
hvm? ( media-libs/libsdl )
${PYTHON_DEPS}
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
index ceb140202d3..3481cb69607 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=0
SECURITY_VER=7
# vars set to reflect https://dev.gentoo.org/~idella4/
@@ -86,6 +86,8 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-python/lxml[${PYTHON_USEDEP}]
+ x86? ( sys-devel/dev86
+ sys-power/iasl )
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
${PYTHON_DEPS}
api? ( dev-libs/libxml2
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index df9efb1e4af..ad42f723962 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,6 +1,3 @@
-DIST xen-4.2.5-upstream-patches-10.tar.xz 41428 SHA256 b29ce85b049420838c3386b67184f4ba56794846d056837fa780ae89a80b40d0 SHA512 9e8046e27506d864e2d69728897cbba3eea1dd5ca748a3febb722901c5a67cca2ab49bb420071292538bd0345023fa337eb2d176b9ca05ca6bce47562f6710ec WHIRLPOOL 29e534ef6b951cf220a3a9476d1f76ac344bfc5c74998f2b472ec83cbe4781746298272e3c1fe8661a838cbc7d734d2730de6a1e9985b8a60f40c98f54449e2a
-DIST xen-4.2.5-upstream-patches-9.tar.xz 23208 SHA256 2206e9a8aeeed207abbae995c5d2baa14d5f0da4120ae44f2de733ecf7ea5af1 SHA512 8a2edaba48002449a521edf2ae078ffe1b3db4f491a85b063886a147a0be3ec7fdb819ce84c90cdae80ed34c10ab2d637506700be10052a67be6ef128fa40fb1 WHIRLPOOL 037820e0fad60d1f7ed054efa797585c992d08f1ffd533705c515ad289f8cdddc72b97f2a3d75ebd683c6bb6988d7285452b4f3cebbe9a879f701156e387ff3b
-DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
@@ -8,6 +5,4 @@ DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412
DIST xen-security-patches-1.tar.gz 7040 SHA256 30733e9ca71bf4291ff212eb191afb22687ccd9b2579767fe0ee013152980c76 SHA512 89c72897f18a86c2060bb76a182e7cca72ad2f33a3aab964ecae66e057aeecafee2e9986204d6feb98f81ccb740460ee2cb37663b1ab79f47adc1dd73e0091bc WHIRLPOOL c27e612b87b4a30abbf59e6be019e2c21a78bfbdf1715da5498d95607d390d616251768d419ac5ce76087bbf7cdfc410dd0088ba48e425082cea971efcb64346
DIST xen-security-patches-2.tar.gz 7370 SHA256 f24bf4b0cba29b51ee71f6ef82654cddf157c63d62fc1119f17255b2388e03ab SHA512 209dea670467ff1df18428c15b25229c05d676d1a2f646cddb221544ae888241ade48a22be037f97dce249ac322c1f30bb477675e5e2cc04a2fbd839e02f1f57 WHIRLPOOL ae66a2fbc0d0f0a555d407ebd3198fa58ee043515fb9821d7b9eda46d088bc87b3de16fe015fd1142294429dd2c1c7826e414a55980e27123185c1a86fb0a8a6
DIST xen-security-patches-3.tar.gz 7349 SHA256 a1876b918c0a608618f349deed11b547a65c5909c31d72a89340d4908c572f46 SHA512 f5e8e7ab5d9be6aa036e52627931f1b2648de642664b2922f9cab64f44d19ac8682f5beb7fdbcb842ee19346202093fade3f10e39ba60fcb12a101deb4408818 WHIRLPOOL 14ee65babe4edd901914c8b8ddb5d7b54e6738d77642514fe611bf84541ae0a932bcb48f86179d5e7a6741135b9c7b129e8244cc22922c4e592604a696b6082f
-DIST xen-security-patches-3.tar.xz 17028 SHA256 fb6301beb9a5c2d1e5d4de8783d8670e382b1bef48ec61e73d2d9be6901d289f SHA512 787fee8f7822577c6de91c4cf4d56d0e73ce46bac5524537ff66a718b6d7eae9d362265515743e8577b2c75f2841baed9837f71467b3b7b91a3111220da5f236 WHIRLPOOL 5c136289e654776bf918fe125fbecba7dac0929b236f7ae8158026a6bd6be12bc786a5ec96cb4022c18a5e7ffde82155deb57eb9639600e4c42c9c209f4a2ed6
DIST xen-security-patches-4.tar.gz 7731 SHA256 b51c6616a303b4d5123fed1e58240163c8e0cf8e0de32db58c11a40a48124d52 SHA512 cef89bb68bdb4a5f947d6be8ae7a799276fd187e396c5ba85f8aa2b0b5349ba606d3742d5b8d8212df6da38f8af9711416d9a25176e713240a0a7f2194d84fc5 WHIRLPOOL 912dc869fa4eb355a86023133adcb818e87f4979d537a885b3f1c6e35ff141b7d7a33e81105dcddf34aafa4c306df79a210346f5037337173923e1dc8280ac47
-DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index 67c5e0f5daf..caf273c95df 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -4,7 +4,6 @@
<herd>xen</herd>
<use>
<flag name='flask'>Enable the Flask XSM module from NSA</flag>
- <flag name='pae'>Enable support for PAE kernels (usually x86-32 with >4GB memory)</flag>
<flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
<flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
</use>
diff --git a/app-emulation/xen/xen-4.2.5-r11.ebuild b/app-emulation/xen/xen-4.2.5-r11.ebuild
deleted file mode 100644
index ad795852c06..00000000000
--- a/app-emulation/xen/xen-4.2.5-r11.ebuild
+++ /dev/null
@@ -1,167 +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 )
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
- REPO="xen-unstable.hg"
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
- S="${WORKDIR}/${REPO}"
- live_eclass="mercurial"
-else
- KEYWORDS="amd64 x86"
- UPSTREAM_VER=9
- SECURITY_VER=3
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask pae xsm"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="
- flask? ( xsm )
- "
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- if use flask ; then
- export "XSM_ENABLE=y"
- export "FLASK_ENABLE=y"
- elif use xsm ; then
- export "XSM_ENABLE=y"
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- epatch "${WORKDIR}"/patches-upstream
- fi
-
- # Security patchset
- if [[ -n ${SECURITY_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- epatch "${WORKDIR}/patches-security/${PV}"
- fi
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-gentoo
- fi
-
- # Drop .config and fix gcc-4.6
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
-
- if use efi; then
- epatch "${FILESDIR}"/${PN}-4.2-efi.patch
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="boot"
- fi
-
- # if the user *really* wants to use their own custom-cflags, let them
- if use custom-cflags; then
- einfo "User wants their own CFLAGS - removing defaults"
- # try and remove all the default custom-cflags
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
- -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"
- fi
-
- # not strictly necessary to fix this
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
- epatch_user
-}
-
-src_configure() {
- use debug && myopt="${myopt} debug=y"
- use pae && myopt="${myopt} pae=y"
-
- if use custom-cflags; then
- filter-flags -fPIE -fstack-protector
- replace-flags -O3 -O2
- else
- unset CFLAGS
- fi
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
- use pae && myopt="${myopt} pae=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the unoffical wiki page:"
- elog " https://wiki.gentoo.org/wiki/Xen"
- elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
- use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
- use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-}
diff --git a/app-emulation/xen/xen-4.2.5-r12.ebuild b/app-emulation/xen/xen-4.2.5-r12.ebuild
deleted file mode 100644
index dd72287ca48..00000000000
--- a/app-emulation/xen/xen-4.2.5-r12.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
- REPO="xen-unstable.hg"
- EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
- S="${WORKDIR}/${REPO}"
- live_eclass="mercurial"
-else
- KEYWORDS="amd64 x86"
- UPSTREAM_VER=10
- SECURITY_VER=7
- GENTOO_VER=
-
- [[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
- [[ -n ${SECURITY_VER} ]] && \
- SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
- [[ -n ${GENTOO_VER} ]] && \
- GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
- SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
- ${UPSTREAM_PATCHSET_URI}
- ${SECURITY_PATCHSET_URI}
- ${GENTOO_PATCHSET_URI}"
-fi
-
-inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags debug efi flask pae xsm"
-
-DEPEND="${PYTHON_DEPS}
- efi? ( >=sys-devel/binutils-2.22[multitarget] )
- !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-RESTRICT="test"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="
- flask? ( xsm )
- "
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if [[ -z ${XEN_TARGET_ARCH} ]]; then
- if use x86 && use amd64; then
- die "Confusion! Both x86 and amd64 are set in your use flags!"
- elif use x86; then
- export XEN_TARGET_ARCH="x86_32"
- elif use amd64; then
- export XEN_TARGET_ARCH="x86_64"
- else
- die "Unsupported architecture!"
- fi
- fi
-
- if use flask ; then
- export "XSM_ENABLE=y"
- export "FLASK_ENABLE=y"
- elif use xsm ; then
- export "XSM_ENABLE=y"
- fi
-}
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${UPSTREAM_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_OPTS="-p1" \
- epatch "${WORKDIR}"/patches-upstream
- fi
-
- if [[ -n ${SECURITY_VER} ]]; then
- einfo "Try to apply Xen Security patcheset"
- source "${WORKDIR}"/patches-security/${PV}.conf
- # apply main xen patches
- for i in ${XEN_SECURITY_MAIN}; do
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-security/xen/$i
- done
- fi
-
- # Gentoo's patchset
- if [[ -n ${GENTOO_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"/patches-gentoo
- fi
-
- # Drop .config and fix gcc-4.6
- epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
-
- if use efi; then
- epatch "${FILESDIR}"/${PN}-4.2-efi.patch
- export EFI_VENDOR="gentoo"
- export EFI_MOUNTPOINT="boot"
- fi
-
- # if the user *really* wants to use their own custom-cflags, let them
- if use custom-cflags; then
- einfo "User wants their own CFLAGS - removing defaults"
- # try and remove all the default custom-cflags
- find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
- -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
- -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
- -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"
- fi
-
- # not strictly necessary to fix this
- sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
-
- epatch_user
-}
-
-src_configure() {
- use debug && myopt="${myopt} debug=y"
- use pae && myopt="${myopt} pae=y"
-
- if use custom-cflags; then
- filter-flags -fPIE -fstack-protector
- replace-flags -O3 -O2
- else
- unset CFLAGS
- fi
-}
-
-src_compile() {
- # Send raw LDFLAGS so that --as-needed works
- emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
- local myopt
- use debug && myopt="${myopt} debug=y"
- use pae && myopt="${myopt} pae=y"
-
- # The 'make install' doesn't 'mkdir -p' the subdirs
- if use efi; then
- mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
- fi
-
- emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-}
-
-pkg_postinst() {
- elog "Official Xen Guide and the unoffical wiki page:"
- elog " https://wiki.gentoo.org/wiki/Xen"
- elog " http://en.gentoo-wiki.com/wiki/Xen/"
-
- use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
- use efi && einfo "The efi executable is installed in boot/efi/gentoo"
-}
diff --git a/app-emulation/xen/xen-4.5.2-r3.ebuild b/app-emulation/xen/xen-4.5.2-r3.ebuild
index 434306c6645..d76cc3dbf41 100644
--- a/app-emulation/xen/xen-4.5.2-r3.ebuild
+++ b/app-emulation/xen/xen-4.5.2-r3.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-emulation/xen/xen-4.6.0-r5.ebuild b/app-emulation/xen/xen-4.6.0-r5.ebuild
index f3e0d7609b0..f4d07387fec 100644
--- a/app-emulation/xen/xen-4.6.0-r5.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r5.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=0
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 158f9cbc675..b3703617ec7 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,4 +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
-DIST eselect-php-0.8.1.tar.xz 44412 SHA256 aa118e936bff176fe64911d68bb72e6e9e03d33c106674169396826a3063a962 SHA512 3679c8ac4d980424a108d93c8e2e575b93196d7140f31f900e7f925ab26cf821233d12b9083fd7bdd7bd596c3b59544e972660be8ffce7c24d4a7980fbe5f770 WHIRLPOOL 19c6f05a02aa1a40586f352822679f7e655200374a100834d4370678b35856d5e255b0d83f07eafd69481ee3ee72cb976665e6c2b2df990be00b54bfa53a5a92
DIST eselect-php-0.8.2.tar.xz 51832 SHA256 3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512 da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d WHIRLPOOL dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4
diff --git a/app-eselect/eselect-php/eselect-php-0.8.0.ebuild b/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
deleted file mode 100644
index ea571784c70..00000000000
--- a/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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-eselect/eselect-php/eselect-php-0.8.1.ebuild b/app-eselect/eselect-php/eselect-php-0.8.1.ebuild
deleted file mode 100644
index d7a5283e275..00000000000
--- a/app-eselect/eselect-php/eselect-php-0.8.1.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
-
-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_php.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}}"
- doins "${FILESDIR}/70_mod_php.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
-}
-
-pkg_postinst() {
- if use apache2 ; then
- elog
- elog "If you are upgrading, be warned that our mod_php configuration"
- elog "file has changed! You should now define -DPHP for the apache2"
- elog "daemon, and inspect the new 70_mod_php.conf which has been"
- elog "installed. Module loading involves eselect as of this version."
- elog
- elog "You must run eselect at least once to choose your apache2 target"
- elog "before the new configuration will work. Afterwards, and after you"
- elog "have reviewed your new configuration, you are advised to remove"
- elog "the obsolete 70_mod_php5.conf file."
- elog
- fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.8.2.ebuild b/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild
index e52f00465d1..012e47663ea 100644
--- a/app-eselect/eselect-php/eselect-php-0.8.2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,6 +30,7 @@ src_install() {
if use apache2 ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
doins "${FILESDIR}/70_mod_php.conf"
+ newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
fi
if use fpm ; then
diff --git a/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf b/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf
new file mode 100644
index 00000000000..bd79f78aa6b
--- /dev/null
+++ b/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf
@@ -0,0 +1,28 @@
+###########
+# WARNING #
+###########
+#
+# This file is provided for backwards compatibility only. The Apache
+# PHP configuration is now located in 70_mod_php.conf and requires you
+# to set -DPHP in your Apache conf.d file. Please examine
+# 70_mod_php.conf and update your Apache configuration to use -DPHP
+# instead of -DPHP5. Afterwards you may delete this file.
+#
+<IfDefine PHP5>
+ # Load the module first
+ <IfModule !mod_php5.c>
+ LoadModule php5_module modules/libphp5.so
+ </IfModule>
+
+ # Set it to handle the files
+ # NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+ # NOTE: Please read the related news item!
+ <FilesMatch "\.(php|php5|phtml)$">
+ SetHandler application/x-httpd-php
+ </FilesMatch>
+ <FilesMatch "\.phps$">
+ SetHandler application/x-httpd-php-source
+ </FilesMatch>
+
+ DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
index 5d8824fd9b7..839664afde2 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="boost opencc lua"
DEPEND="sys-apps/sed"
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index e154d0f2db1..c266294a5ae 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1 +1,2 @@
DIST abook-0.6.0pre2.tar.gz 411412 SHA256 59d444504109dd96816e003b3023175981ae179af479349c34fa70bc12f6d385 SHA512 d1bc437981964a5dd873b12458833c60306d37b36904a04b072cefe7501175933dd7817ca51f8634bbd6722f79f768b39e00b68d0699086d5efaf28d0cbdf1ed WHIRLPOOL fbaed8cc4dff1b7b7786c4f5b4124e94893d59e97b67372b0b1f1cf176a16ef23141c37255589cfb352f1e4993ae69d1f77077f2396aaa2c482e85b3c617fc5f
+DIST abook-0.6.1.tar.gz 319558 SHA256 f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9 SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66 WHIRLPOOL 5257a6000707ea58f21fa95841edcfcdb8a1f4921fa452b8aefdbd9bd2eecba01078d116d0e79316bde5b484a721640ffc501c0402a6601803c9312e1e4a2e6a
diff --git a/app-misc/abook/abook-0.6.0_pre2.ebuild b/app-misc/abook/abook-0.6.0_pre2.ebuild
index e383d809c9b..e3d70b02b5a 100644
--- a/app-misc/abook/abook-0.6.0_pre2.ebuild
+++ b/app-misc/abook/abook-0.6.0_pre2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,6 +32,11 @@ src_configure() {
econf $(use_enable nls)
}
+src_compile() {
+ # bug 570428
+ emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dodoc BUGS ChangeLog FAQ README TODO sample.abookrc || die "dodoc failed"
diff --git a/app-misc/abook/abook-0.6.1.ebuild b/app-misc/abook/abook-0.6.1.ebuild
new file mode 100644
index 00000000000..ee129acf941
--- /dev/null
+++ b/app-misc/abook/abook-0.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+MY_P="${P/_/}"
+DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
+HOMEPAGE="http://abook.sourceforge.net/"
+SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="sys-libs/ncurses
+ sys-libs/readline
+ dev-libs/libvformat
+ nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # TODO: do the right thing and find out whats wrong with Makefile.in
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-curses \
+ --with-readline \
+ --enable-vformat \
+ $(use_enable nls)
+}
+
+src_compile() {
+ # bug 570428
+ emake CFLAGS="${CFLAGS} -std=gnu89"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc BUGS ChangeLog FAQ README TODO sample.abookrc
+}
diff --git a/app-misc/anki/anki-2.0.33.ebuild b/app-misc/anki/anki-2.0.33.ebuild
index b342d633e5c..b4581368c39 100644
--- a/app-misc/anki/anki-2.0.33.ebuild
+++ b/app-misc/anki/anki-2.0.33.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="latex +recording +sound"
RDEPEND="${PYTHON_DEPS}
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 c959c33bf46..5b6eb298107 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 ~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 ~x86-winnt"
IUSE=""
RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 686dbc9cdf3..c53a99fe9e4 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
DIST carbon-c-relay-0.44.tar.gz 54533 SHA256 424f5eebdfcd8cd42f07495b97c440e9133723966013d63fe3f6d8220bd031dc SHA512 ae0ded77d189c22bab0400922831211f411d47b92bde44f9a4c4208a094a57ac875a52e04ef6297238281bb44c8869f0510b3a3b6dc1c564e02e4f22bb69e268 WHIRLPOOL b7351576d7f1bdb5c0929967faacd6861a10f8d8d3bedebcc9bf7a3f15e0b9ea2d3475ecd8e700e3f2fb190698ea343fcb4530d10522591512f1de9d787a0ab2
DIST carbon-c-relay-0.45.tar.gz 63208 SHA256 ba76d93d0448eae64147d580c2767ed42a8a9dd4a6c0f3e15a41276793bc53df SHA512 7a5068a6a1502c80b03c642abb72639de644351edc2967736c6f40939a6e28598727ad7bec9008eb76c3211552d6583f0ec9670e7c32952c0f49f6b4cb9a6085 WHIRLPOOL 089a9a6c3fb40e1bfc680b7002bf9967c4a182ae00616933cd5b3ba9febda20853e716df69d552ade131aa272cd16dafb65d1ba84afeacb4383d87f9e028bf97
-DIST carbon-c-relay-1.3.tar.gz 69269 SHA256 80003400f0959562e9ada4fb6311c67dcc9bc4c4b5ba75dc10a8b3089826837b SHA512 7734d71944def438b66566ed6cfb94ad1d8d25de016af9c90e145161ce831a7e23f804545f2b711e3faefa8eab24f53d2e76f0fd29a8ea3765f4ce8c55218ebc WHIRLPOOL b9f1c30db5356778e3dc5ee3fbf1c002898708c69e613732bfbe58f1087fdd03f31d601a3094d8e23ee7bf2df21d1f17537649a02832249cfa4e7a4c7d5394be
+DIST carbon-c-relay-1.4.tar.gz 71367 SHA256 8575be832d204a0c12e4cd793ae05d5c2683974a90e93aeb70e69199b7991d45 SHA512 389d08bccdbd2e566a2580017fb14afd37b0c609f20ecdef526f4810d50c84e06f396a161f0ad4eb7d1810cada9f24640b19afe7a18dd241a16d435cc72d8d0d WHIRLPOOL ad639e96e7589e7cd84e71d4840afeab9f18e768ee98fa9ab6e3d69e4255ad74e5b715e71667eaf330e9a7cc20ce2158058683081bb91785863cbcd5e6a4dccf
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
index e20b1c5dec8..263b0462af5 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-1.3.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-misc/chkcrontab/Manifest b/app-misc/chkcrontab/Manifest
new file mode 100644
index 00000000000..9456297b248
--- /dev/null
+++ b/app-misc/chkcrontab/Manifest
@@ -0,0 +1 @@
+DIST chkcrontab-1.6.tar.gz 24701 SHA256 be7436d5ece4ad6390365f6edf0f1dc59dfd655a9de3b4699884343ceb150f2e SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b WHIRLPOOL 13995293e761930d0d900c3e7fa5b7695fad3416ade96fc34be415a448ca5e5969f5b82889d46041ed801ca2f13e5154a01698d753898ee9027bd9a2c8e6e29f
diff --git a/app-misc/chkcrontab/chkcrontab-1.6.ebuild b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
new file mode 100644
index 00000000000..7e27c3fa3dc
--- /dev/null
+++ b/app-misc/chkcrontab/chkcrontab-1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ doman doc/${PN}.1
+ distutils-r1_python_install_all
+}
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
new file mode 100644
index 00000000000..d8aa7d5ac92
--- /dev/null
+++ b/app-misc/chkcrontab/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomas Mozes</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">lyda/chkcrontab</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 252b0af2ed3..8b453e22dab 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,2 +1,3 @@
DIST elasticsearch-1.7.3.tar.gz 28510917 SHA256 af517611493374cfb2daa8897ae17e63e2efea4d0377d316baa351c1776a2bca SHA512 0cb6b2ebd77c3d1467f6a22f845bfbf9f4a7c9c9ddedae17aeb6bd2d2bc576171fc80e3a4963e7b890af574e9fd0b0faa152e7f2671a74254826e14fe2554c9f WHIRLPOOL c86de3076389a9b95cf4d424673edb3c3b1dae0b4470b18b15a5f2e9bde6669a61b8ffd5cc3f7fc3b52f99441915a84b0396a5673ebbc12fec0d83eb41a03c74
DIST elasticsearch-2.1.0.tar.gz 28994631 SHA256 8a4e85bcb506daa369651506af1cbc55c09fd7ff387d111142ae14d0a85d4d14 SHA512 207f35c94c65dcc57e75479e0dbb9127598ea3d9fcc04c1181bf82ebf1022a4431239a0f49803ab53b7bed5152b719e99f8e0395c9b80168567148ae13281ad3 WHIRLPOOL 006a763bbfd8d1600d152a4f80fb05aa92cdf3c223cc59a6368d69ab85bc6e60ffaa84a1d888eff76270834ff407f5d5f71bdf43fb286f8cbe056170e1573272
+DIST elasticsearch-2.1.1.tar.gz 29007342 SHA256 ebd69c0483f20ba7e51caa9606d4e3ce5fe2667e1216c799f0cdbb815c317ce6 SHA512 eff12cd7342dc0036dc88f03ced9c7cc90d284222efeca86adfd9e4cf254cb8f96105c58673b239cfc9eb9764a2a669d2cd171ca73eb43b1ec1470a13c5e1776 WHIRLPOOL 2b0e069d162ee07eddc90d879d4ce5dd2cef9e4a804a9aaeb3d99e5d532f583589e2c6a36b5e856bf19a610f220eea6aaa75d28e7b6687b60eab7bf83b2def51
diff --git a/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild b/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
new file mode 100644
index 00000000000..a70e231e3e6
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-2.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+
+MY_PN="${PN%-bin}"
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://download.elasticsearch.org/${MY_PN}/release/org/${MY_PN}/distribution/tar/${MY_PN}/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_prepare() {
+ rm -rf bin/*.{bat,exe}
+ rm LICENSE.txt
+}
+
+src_install() {
+ dodir /etc/${MY_PN}
+ dodir /etc/${MY_PN}/scripts
+
+ insinto /usr/share/doc/${P}/examples
+ doins config/*
+ rm -rf config
+
+ insinto /usr/share/${MY_PN}
+ doins -r ./*
+ chmod +x "${D}"/usr/share/${MY_PN}/bin/*
+
+ keepdir /var/{lib,log}/${MY_PN}
+ keepdir /usr/share/${MY_PN}/plugins
+
+ newinitd "${FILESDIR}/elasticsearch.init5" "${MY_PN}"
+ newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
+ systemd_newunit "${FILESDIR}"/${PN}.service4 "${PN}.service"
+}
+
+pkg_postinst() {
+ elog
+ elog "You may create multiple instances of ${MY_PN} by"
+ elog "symlinking the init script:"
+ elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+ elog
+ elog "Each of the example files in /usr/share/doc/${P}/examples"
+ elog "should be extracted to the proper configuration directory:"
+ elog "/etc/${MY_PN} (for standard init)"
+ elog "/etc/${MY_PN}/instance (for symlinked init)"
+ elog
+}
diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
deleted file mode 100644
index ac9a610d39c..00000000000
--- a/app-misc/lirc/lirc-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,427 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libICE
- )
- lirc_devices_alsa_usb? ( media-libs/alsa-lib )
- lirc_devices_audio? ( >media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r3.ebuild b/app-misc/lirc/lirc-0.9.0-r3.ebuild
deleted file mode 100644
index e9c8bea1556..00000000000
--- a/app-misc/lirc/lirc-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libICE
- )
- lirc_devices_alsa_usb? ( media-libs/alsa-lib )
- lirc_devices_audio? ( >media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
- # Add support for zotac remote, bug 342848
- epatch "${FILESDIR}"/${P}-add-zotac-support.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r4.ebuild b/app-misc/lirc/lirc-0.9.0-r4.ebuild
deleted file mode 100644
index 21d77903413..00000000000
--- a/app-misc/lirc/lirc-0.9.0-r4.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libICE
- )
- lirc_devices_alsa_usb? ( media-libs/alsa-lib )
- lirc_devices_audio? ( >media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
- # Add support for zotac remote, bug 342848
- epatch "${FILESDIR}"/${P}-add-zotac-support.patch
- # Use fixed font
- epatch "${FILESDIR}"/${P}-fixed-font.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r5.ebuild b/app-misc/lirc/lirc-0.9.0-r5.ebuild
index 2dbb0357768..52f34f0b4d5 100644
--- a/app-misc/lirc/lirc-0.9.0-r5.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r5.ebuild
@@ -72,7 +72,7 @@ IUSE_LIRC_DEVICES_DIRECT="
# parameter --with-driver=NAME
IUSE_LIRC_DEVICES_SPECIAL="
serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
+ remote_wonder_plus xboxusb inputlirc"
IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
@@ -119,7 +119,6 @@ DEPEND="${RDEPEND} ${DEPEND}
# adding only run-time depends
RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
lirc_devices_inputlirc? ( app-misc/inputlircd )
lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
@@ -251,11 +250,6 @@ pkg_setup() {
add_device atiusb "device xboxusb"
fi
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
if [[ "${MY_OPTS}" == "" ]]; then
if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
# on xbox: use special driver
diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild
index 643b1551d4a..e954aacb7fb 100644
--- a/app-misc/taskd/taskd-1.1.0-r1.ebuild
+++ b/app-misc/taskd/taskd-1.1.0-r1.ebuild
@@ -64,9 +64,9 @@ src_install() {
newins "${FILESDIR}"/taskd.logrotate taskd
}
-pkg_preinst() {
+pkg_setup() {
enewgroup taskd
- enewuser taskd -1 -1 /var/lib/taskd taskd
+ enewuser taskd -1 /bin/bash /var/lib/taskd taskd
}
pkg_postinst() {
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 351cd50348a..612adede7a3 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -7,3 +7,4 @@ DIST eix-0.31.1.tar.bz2 791116 SHA256 1402d474ee3d1dc6fcfe35508657629d4a5aef6cbe
DIST eix-0.31.2.tar.bz2 787190 SHA256 c03226d0971067561e931c0afe75878552a6178ede7326601c3a839b289c72d9 SHA512 61a7f58ba48030000bd4ca50575aec95ba7726c12d935bd1fa7a2b28440fbc66a272fc727bc6a2b7716e285d3b93b7a888cef017c66d8682f29e9388dc89a6a1 WHIRLPOOL d67ab5ee83ab74c895f5e7345b40a7313c1ad1a1a2af184f54e5481eed9f6134920c172fe1dcae0522b2d965832e76cfbe14020181d799eff04a1afc6938af64
DIST eix-0.31.3.tar.bz2 795783 SHA256 bc578fa28be43ec321054df6e4727f2dd4c09b1ca8e1e9b1d4ebe064bdd7f03c SHA512 f0f07fbcb0b8696d7e689fd322ba3475d4d10c2ba703981de7458cf5f37c7d06746fac753cc14a7fd0c434c9e284127a64f941bbad408ebc077807b8f33952bb WHIRLPOOL a00556d5a57ee665e327071580e63107c27df60b96690c8c249b15487867bbc720244d1926c3f54795f7d6bdb6348f09d7cbfbd29f52a43b4dc8e0994579f58b
DIST eix-0.31.4.tar.xz 579480 SHA256 87051338b523f07a734c3c07e30fe99b4ca85ed268df60a54aeed1b594e1b7d0 SHA512 1a43fd8a4686f6e6c3021fb67acaa9ac0b19baad539e10d0ebd3db38bfc6179ce4b1c91745f76f167c32e45f9164ed3f1a8129a9eb97d8bc3bd35027999c5dc2 WHIRLPOOL 0f3962b7b72b9c12d9e2b0561ab242ebfcc48161e259667ed0752d49d2419c7a6f801481b48522605d8aa20968c688f917b24a823009a8f5a9e780a845afaa09
+DIST eix-0.31.5.tar.xz 580740 SHA256 32ec5d6fdc7bf10db5fea076836b30ed034a0510962ea0cbe4f09a5919502b9c SHA512 868886a2ac6bdcfe96661030701e03eeca7d7c8a3c3a900845c90cd852e02947e481ff2ce9abe21bb62272b58e4f9415c9fdc91420897ed827b3b0220e7c7eca WHIRLPOOL 546be9401649e8a04f5f4b988f783d6b084d6a83f257bb67f78b2cc512068cff5ec200fb6f5f18746e64b1f6a56a55635b3a56fb82450b8a780a5d1ff2eb92b4
diff --git a/app-portage/eix/eix-0.30.10.ebuild b/app-portage/eix/eix-0.30.10.ebuild
index 32c62b26f2e..936a68a8b2b 100644
--- a/app-portage/eix/eix-0.30.10.ebuild
+++ b/app-portage/eix/eix-0.30.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
diff --git a/app-portage/eix/eix-0.30.11.ebuild b/app-portage/eix/eix-0.30.11.ebuild
index 7254e3d785f..6bc675cf1a2 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
diff --git a/app-portage/eix/eix-0.30.4.ebuild b/app-portage/eix/eix-0.30.4.ebuild
index 7c936abe3be..fb0235c0766 100644
--- a/app-portage/eix/eix-0.30.4.ebuild
+++ b/app-portage/eix/eix-0.30.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
diff --git a/app-portage/eix/eix-0.30.7.ebuild b/app-portage/eix/eix-0.30.7.ebuild
index 7a31b9d96b3..d75223e7076 100644
--- a/app-portage/eix/eix-0.30.7.ebuild
+++ b/app-portage/eix/eix-0.30.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
diff --git a/app-portage/eix/eix-0.30.8.ebuild b/app-portage/eix/eix-0.30.8.ebuild
index 7a31b9d96b3..d75223e7076 100644
--- a/app-portage/eix/eix-0.30.8.ebuild
+++ b/app-portage/eix/eix-0.30.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://dev.gentoo.org/~axs/distfiles/${P}.tar.xz"
diff --git a/app-portage/eix/eix-0.31.1.ebuild b/app-portage/eix/eix-0.31.1.ebuild
index c3d65169f67..aff982a78a3 100644
--- a/app-portage/eix/eix-0.31.1.ebuild
+++ b/app-portage/eix/eix-0.31.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
PLOCALES="de ru"
inherit bash-completion-r1 eutils l10n
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
HOMEPAGE="https://github.com/vaeth/eix/"
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
diff --git a/app-portage/eix/eix-0.31.2.ebuild b/app-portage/eix/eix-0.31.2.ebuild
index 6579e25c97c..aff982a78a3 100644
--- a/app-portage/eix/eix-0.31.2.ebuild
+++ b/app-portage/eix/eix-0.31.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-portage/eix/eix-0.31.3.ebuild b/app-portage/eix/eix-0.31.3.ebuild
index 6579e25c97c..aff982a78a3 100644
--- a/app-portage/eix/eix-0.31.3.ebuild
+++ b/app-portage/eix/eix-0.31.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-portage/eix/eix-0.31.4.ebuild b/app-portage/eix/eix-0.31.4.ebuild
index 8715cf5588b..38dc150bda1 100644
--- a/app-portage/eix/eix-0.31.4.ebuild
+++ b/app-portage/eix/eix-0.31.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-portage/eix/eix-0.31.5.ebuild b/app-portage/eix/eix-0.31.5.ebuild
new file mode 100644
index 00000000000..878b44951be
--- /dev/null
+++ b/app-portage/eix/eix-0.31.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="de ru"
+inherit bash-completion-r1 l10n systemd
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays and more"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
+
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+ nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+ app-shells/push"
+DEPEND="${BOTHDEPEND}
+ app-arch/xz-utils
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ case " ${REPLACING_VERSIONS}" in
+ *\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+ local eixcache="${EROOT}/var/cache/${PN}"
+ test -f "${eixcache}" && rm -f -- "${eixcache}";;
+ esac
+}
+
+src_prepare() {
+ sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+ eapply_user
+}
+
+src_configure() {
+ econf $(use_with sqlite) $(use_with doc extra-doc) \
+ $(use_enable nls) $(use_enable tools separate-tools) \
+ $(use_enable security) $(use_enable optimization) \
+ $(use_enable strong-security) \
+ $(use_enable strong-optimization) $(use_enable debug debugging) \
+ $(use_enable swap-remote) \
+ $(use_with prefix always-accept-keywords) \
+ $(use_with dep dep-default) \
+ --with-zsh-completion \
+ --with-portage-rootpath="${ROOTPATH}" \
+ --with-eprefix-default="${EPREFIX}"
+}
+
+src_install() {
+ default
+ dobashcomp bash/eix
+ systemd_dotmpfilesd tmpfiles.d/eix.conf
+}
+
+pkg_postinst() {
+ test -d "${EROOT}var/cache/${PN}" || {
+ mkdir "${EROOT}var/cache/${PN}"
+ use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+ }
+ local obs="${EROOT}var/cache/eix.previous"
+ ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
+
+pkg_postrm() {
+ [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
+}
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index c9f8bfde970..0e220a7b666 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -277,4 +277,4 @@ DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68
DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08
DIST bash43-040 1532 SHA256 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0 WHIRLPOOL a435f25ae432161f676b4965cc20cc096fa18af8a191dca7cb311a41e3504e5d27c668fb3430fece1de45e0eed9cb34357dc887e83ace9819f24d585eddf6720
DIST bash43-041 2362 SHA256 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819 WHIRLPOOL c88e754d694b69bcb3ce390ab3e29932b30a74f8f15b75b570cc46699c072b0f872824766c45bc2a98627529896bdf5aaf6493a493ffd33932d9ed6a362defb3
-DIST bash43-042 1535 SHA256 b75a53141ab3d8fff3fa74b5f3dc76468b01eae299f50bbc2bc71ae395d690af SHA512 f1530203d4ec42fa65db7ed4ee07f82b3be78dc3fa6532a222447acaaa8ff36a48979b153767b9191e5f9c2709d9822d71f816b9fc9f40e549e18831df5f9c3e WHIRLPOOL 15c84a013a7b0ed021a2ccbe5895d34a3187cd3139c382fa69bef1401961040860125448da45f82ace300c201a22ccbe7160c73dcfecd6ee0f837a10d307eebe
+DIST bash43-042 1535 SHA256 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a WHIRLPOOL 790b15282a81f5717fb675ea4ae752382ddb1b101766e32c68deb1ec1d64fcf8841b3da556b87ac685e18b528a1de31bc4b94900369f6386f8e3991ed76232c1
diff --git a/app-shells/bash/bash-4.3_p42.ebuild b/app-shells/bash/bash-4.3_p42-r1.ebuild
index 8f140fcde19..b7c54c169ec 100644
--- a/app-shells/bash/bash-4.3_p42.ebuild
+++ b/app-shells/bash/bash-4.3_p42-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
index 9f977a2aef9..7a21ba30199 100644
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@@ -1,2 +1,3 @@
DIST push-1.5.tar.gz 1971 SHA256 7c9068a619bcc49e3e13f819e23e1c05464729df0529753557f23f65e922fdad SHA512 77f4afd1a8226b0b4104008fcea2a61e5c9a7930b08266e069c387c806ef86e8d5641d70ece6dfd02557c956fc916134551d10777e5730973657d767370f8a26 WHIRLPOOL e1d71d7d9369bf23fe9046a34f7c9cd4f7ff79b4db3e13a9cef089113e31f7db2ecb6ff13e899e1db7726359b68260776723f73201d3db0472d267b8db7515b2
DIST push-1.6.tar.gz 1955 SHA256 713dea172ede55971ff82da932782503c2aa6703eba73c1ac317ec4c8eb22e80 SHA512 4623f51249138bacb7251fb5d5d1ae8dd070de7ce628e42b6eed90a4b6ffd36d28eb58b116f5b1833bc1affa8db539da9b94d104ffe03c6bd1e294b56c393c86 WHIRLPOOL 787f65542e92fd10c411969d03ec17b45a90b35e9c8e17b9fb3e732fb1d97813f04c3a03cc329a469a5bea2a194f879f4c600e2e534dd8c778f7f712d4c171b1
+DIST push-1.8.tar.gz 1942 SHA256 99ae56c932b59b8b74c6a6d0972dfe5b65458d6871581168918264c5aa50bdbd SHA512 518568fc72d161d3abaea0a0c529d94fc9ad6dc46d18d300990de1367617e095befb8436e69267ebc11bd4dcbbbd9bca6375fc184666e442af6e2eaa68a992e5 WHIRLPOOL 5a763560b8afd4593aa1d0afc8f3ed5b053041c63d5aa742e485c25046191e8c733cdaf265117e23726c2c7cc8aeb87d3858a6228932192c2ee87ff4682e626d
diff --git a/app-shells/push/push-1.8.ebuild b/app-shells/push/push-1.8.ebuild
new file mode 100644
index 00000000000..2de3b236ffc
--- /dev/null
+++ b/app-shells/push/push-1.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
+HOMEPAGE="https://github.com/vaeth/push/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+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 ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE=""
+
+src_install() {
+ insinto /usr/bin
+ doins push.sh
+ dodoc README
+}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 9eb96946aee..dd7fe7df9c1 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.5.1.tar.xz 248380 SHA256 c1d3d8cb735f0dea06410a0045b78bec57adeef1c0b3c7dbc2ade9276bfefaec SHA512 9a2e5b0858f8f7ac3d54fc9e61dcdb45617ee9ce74c4c9d975ca34181c7aa9ce554f865daffe64036d71571cca78543dafd74d134a20f9c359bfb0a7ef0d6fa3 WHIRLPOOL ac7271eaeecdc1b7268ed7ebde93417c041901335f3cd46e7a60197dbc3ecb68758bda60f9dc33f633b37ef661087011db6bf528120beb22ae4c91f079d6f073
+DIST blogc-0.6.tar.xz 261992 SHA256 86e80cbd871bb08780fde2b3de165e7b17b9f5f119bb6d354082e5882bf2c03a SHA512 b51b79f5afd91d0dee3c0ae903ad915af54684b3da8f785b20b9789bfe80b825c3c5b860dcaa1a809d22bfb620867818131652e0aabb817181cab476df211df9 WHIRLPOOL 53870581bae92bc2fcb7e85b796f6b8873bc5cfd7c1eab8c68e8e816390842607e7cde3e0a4fdd4c71e71113771f84d6fef3863a9375c576c04deec2376b04ec
diff --git a/app-text/blogc/blogc-0.5.1.ebuild b/app-text/blogc/blogc-0.6.ebuild
index ecc0d6aecdc..ecc0d6aecdc 100644
--- a/app-text/blogc/blogc-0.5.1.ebuild
+++ b/app-text/blogc/blogc-0.6.ebuild
diff --git a/app-text/epubcheck/Manifest b/app-text/epubcheck/Manifest
deleted file mode 100644
index 39f814b071c..00000000000
--- a/app-text/epubcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST epubcheck-src-1.1.zip 2442421 SHA256 f9db760358b34d9d98d243156e38f905e0f8735d26b8bf3550e3b108f2436be9 SHA512 4ba5fbb149a071c1dfed97ab00500afabb0690eb081967203e8ae6691b3ab9d676bf0a4cb29c5cf203db253a8e7a4c1bfccbd07b2ee377ec02656ba378a6d252 WHIRLPOOL 4e98ab1b4c2ef3412bc0109876d84ad4b9a212b7718d8ea60214ca8521571b6c068ca6bbb62e371e2558e199ebe8003b517413881e0a59574ab14e2e5452baee
diff --git a/app-text/epubcheck/epubcheck-1.1.ebuild b/app-text/epubcheck/epubcheck-1.1.ebuild
deleted file mode 100644
index cbec5745752..00000000000
--- a/app-text/epubcheck/epubcheck-1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Tool to validate IDPF EPUB files"
-HOMEPAGE="https://github.com/IDPF/epubcheck"
-SRC_URI="https://${PN}.googlecode.com/files/${PN}-src-${PV}.zip"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/jigsaw:0
- dev-java/saxon:6.5"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- rm -f lib/*.jar
-
- java-pkg_jar-from --into lib/ jigsaw
- java-pkg_jar-from --into lib/ saxon-6.5
-
- cd lib/
- ln -s $(java-config --tools)
-}
-
-src_compile() {
- eant buildJar
-}
-
-src_test() {
- java -cp "$(java-pkg_getjars jigsaw,saxon-6.5):dist/${P}.jar" \
- com.adobe.epubcheck.autotest.AutoTest testdocs/general/tests.xml testdocs/general/ \
- || die "tests failed"
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
-
- java-pkg_dolauncher ${PN} --main com.adobe.epubcheck.tool.Checker
-
- dodoc README.txt
-}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index dfe055e3c86..6ce947b7355 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -3,5 +3,6 @@ DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db6
DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
DIST highlight-3.18.tar.bz2 619669 SHA256 55c6f7a5aeaac2c811078a0215b27c1c80d971bba5dff51ee74a97b3303a584b SHA512 1f939e117209e96d021216addc281ca7f265822f053f577ed7cb11b8ac9a1762bf84f8e1f9f5e67277004573b98e4b8732f48549aa674fe6801bfc1c0627b930 WHIRLPOOL e08d16d632e4193e27e2a1db530218e937f04abc03d36d1cc8d096c0511a3ccf51c61078fad0bb182b145866c6aac7d7c47818014868c2ae73254c18ad80aaf7
DIST highlight-3.24.tar.bz2 625192 SHA256 4f921697de9db93fb54bb667e6245b2831c153fc00dfa592ec50e42d345679cd SHA512 41f170a436fa802393b2f37e4791b0168d1a7c723e09bc6326c389b8a266604a163c7c3bba10f456df0c5fe321914c736e07830459d5c43da9bdd6335db92086 WHIRLPOOL fc1b7eafdcb41ace65d08fd114c7dabb2169d6f1fedca99accfcb60dcd325b5db9f97e5c6c8c2ad31cc47bc9de90435cf4473e9147c562d70e87e43513320161
+DIST highlight-3.25.tar.bz2 626492 SHA256 d8a9b8989c8b4108de0a76ceb585a5777ab308a339a667a9b05ee3d059dade26 SHA512 c0249283e7c26b565170c4686fb28ddd0565716ddcd38a52cbfde03051558f4c1baf7b2605e33e1799afb7dfb79b053fffa70827d5d8dcaf42a344076d26fb11 WHIRLPOOL d2f8ae06a9b48dd88432d9550d6e456f3a3177194af72ee26023ea110046a55ea9031104e9a397bfd316d3b4c0a1f557cefaa73165bc54308725f71a7e89f1e6
DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
diff --git a/app-text/highlight/highlight-3.25.ebuild b/app-text/highlight/highlight-3.25.ebuild
new file mode 100644
index 00000000000..df1763b6c62
--- /dev/null
+++ b/app-text/highlight/highlight-3.25.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ )"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ src/core/datadir.cpp || die
+
+ if has_version '<dev-lang/lua-5.2' ; then
+ sed -i 's/-DUSE_LUA52//' src/makefile || die
+ fi
+}
+
+src_compile() {
+ myhlopts=(
+ "CXX=$(tc-getCXX)"
+ "AR=$(tc-getAR)"
+ "LDFLAGS=${LDFLAGS}"
+ "CFLAGS=${CXXFLAGS}"
+ "DESTDIR=${D}"
+ "PREFIX=${EPREFIX}/usr"
+ "HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+ "HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+ "doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+ "conf_dir=${EPREFIX}/etc/highlight/"
+ )
+ emake -f makefile "${myhlopts[@]}"
+ if use qt4 ; then
+ cd src/gui-qt
+ eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+ emake
+ fi
+}
+
+src_install() {
+ emake -f makefile "${myhlopts[@]}" install
+ use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
index 521e9b2f297..2fa905ae700 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="debug doc gnome-keyring"
# glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-java/css-validator/Manifest b/dev-java/css-validator/Manifest
deleted file mode 100644
index 7b915f8943a..00000000000
--- a/dev-java/css-validator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST css-validator-20120222.tar.bz2 27482733 SHA256 41c80ccc808c20e4f66d493ed365c9be9f77e787f5c0f5f3ba7060c520bac207 SHA512 a7f392028cdf5a8befa95b7c2b7bc4f832cc9212c9ec92d3021e357ca41f48464c6944ec0ecf7105d924dbb07c80c0c1b7b97191c7e9496ca30253e0329da02d WHIRLPOOL 291ed5f7f401f87d70e20d39f947038adbb9d0097023b8e30af14a3fd576d5981c5be35340294ca29e64721823de90436fb429ecf1d556ac7e57941d9a29d158
diff --git a/dev-java/css-validator/css-validator-20120222.ebuild b/dev-java/css-validator/css-validator-20120222.ebuild
deleted file mode 100644
index 7f4d8ac0470..00000000000
--- a/dev-java/css-validator/css-validator-20120222.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-# How to create the release tarball:
-# $ export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"
-# $ cvs login
-# $ cvs get 2002/css-validator
-# $ cd 2002
-# $ tar jcf css-validator-$(date "+%Y%m%d") css-validator --exclude=CVS
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets"
-HOMEPAGE="http://jigsaw.w3.org/css-validator/DOWNLOAD.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="java-virtuals/servlet-api:2.5
- dev-java/velocity
- dev-java/commons-lang:2.1
- dev-java/tagsoup
- dev-java/jigsaw
- dev-java/xerces:2
- dev-java/htmlparser
- "
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-EANT_BUILD_TARGET="jar war"
-EANT_DOC_TARGET="javadoc"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- rm -f tmp/*.jar
- mkdir -p "${S}/lib" || die "mkdir failed"
-
- epatch "${FILESDIR}/${P}-build.xml.patch"
-
- java-pkg_jarfrom --into lib/ servlet-api-2.5
- java-pkg_jarfrom --into lib/ velocity
- java-pkg_jarfrom --into lib/ commons-lang-2.1
- java-pkg_jarfrom --into lib/ tagsoup
- java-pkg_jarfrom --into lib/ jigsaw
- java-pkg_jarfrom --into lib/ xerces-2
- java-pkg_jarfrom --into lib/ htmlparser
-}
-
-src_install() {
- java-pkg_dojar "${PN}.jar"
-
- use source && java-pkg_dosrc org
- if use doc; then
- java-pkg_dojavadoc javadoc
-
- insinto "/usr/share/${PN}"
- doins "${PN}.war"
- einfo "Documentation for ${PN} has been installed as:"
- einfo " /usr/share/${PN}/${PN}.war"
- einfo "You need to deploy this file using one of:"
- einfo " * www-servers/tomcat"
- einfo " * www-servers/resin"
- fi
-}
diff --git a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch b/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
deleted file mode 100644
index faedcd04396..00000000000
--- a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: build.xml
-===================================================================
-RCS file: /sources/public/2002/css-validator/build.xml,v
-retrieving revision 1.23
-diff -u -r1.23 build.xml
---- build.xml 1 Nov 2011 07:51:20 -0000 1.23
-+++ build.xml 22 Feb 2012 23:57:47 -0000
-@@ -75,10 +75,10 @@
- <copy file="tmp/htmlparser-1.3.1/htmlparser-1.3.1.jar" tofile="lib/htmlparser-1.3.1.jar"/>
- </target>
-
-- <target name="build" description="Builds the validator" depends="prepare">
-+ <target name="build" description="Builds the validator">
- <mkdir dir="./build"/>
- <javac classpathref="build.class.path" destdir="./build" encoding="UTF-8"
-- debug="yes" includes="org/w3c/**" srcdir="." source="1.6" target="1.6"/>
-+ includes="org/w3c/**" srcdir="."/>
- <copy todir="./build">
- <fileset dir="./">
- <include name="org/**"/>
-@@ -91,7 +91,7 @@
- <target name="jigsaw" description="Builds the validator for Jigsaw" depends="prepare">
- <mkdir dir="./build"/>
- <javac classpathref="build.class.path" destdir="." encoding="UTF-8"
-- debug="yes" source="1.6" target="1.6">
-+ >
- <src path="./org/w3c"/>
- </javac>
- </target>
-@@ -99,6 +99,7 @@
- <target name="javadoc" description="Generates API docs">
- <mkdir dir="./javadoc"/>
- <javadoc
-+ classpathref="build.class.path"
- packagenames="org.w3c.*"
- sourcepath="./"
- destdir="./javadoc"
diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
deleted file mode 100644
index 1a72d74f13a..00000000000
--- a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 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="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-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/jaxme:0
- dev-java/relaxng-datatype:0
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/xsdlib:0
- java-virtuals/stax-api:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- test? (
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )"
-
-java_prepare() {
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- # Add missing methods to compile on Java 5 #137970
- epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,xpp2,xpp3,xsdlib"
-EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
-EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
-
-src_test() {
- # Needs X11
- rm -v src/test/org/dom4j/bean/BeansTest.java || die
- # Fails with a 1.6 JDK for some reason
- rm -v src/test/org/dom4j/io/StaxTest.java || die
- # Fails with a 1.7 JDK for some reason
- rm -v src/test/org/dom4j/rule/RuleTest.java || die
-
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
index 4ed4564591c..c43214986be 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,22 +16,27 @@ SRC_URI="
LICENSE="dom4j"
SLOT="1"
-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"
+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=""
-CDEPEND="dev-java/xpp2:0
+CDEPEND="
+ dev-java/xpp2:0
dev-java/xpp3:0
dev-java/jaxme:0
dev-java/xsdlib:0
dev-java/relaxng-datatype:0"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+
+DEPEND="
+ ${CDEPEND}
test? (
dev-java/ant-junit:0
dev-java/junitperf:0
- )"
+ )
+ >=virtual/jdk-1.6"
java_prepare() {
# Circular deps with jaxen #212993
@@ -41,9 +46,9 @@ java_prepare() {
epatch "${WORKDIR}/${P}-java5.patch"
}
-# 0 - Needs X11
-# 1 -Fails with a 1.7 JDK for some reason
-# 2 -Fails with a 1.6 JDK for some reason
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
JAVA_RM_FILES=(
src/test/org/dom4j/bean/BeansTest.java
src/test/org/dom4j/io/StaxTest.java
@@ -67,7 +72,7 @@ src_test() {
}
src_install() {
- java-pkg_dojar build/${PN}.jar
+ java-pkg_dojar "build/${PN}.jar"
use doc && java-pkg_dojavadoc build/doc/api
use source && java-pkg_dosrc src/java/*
}
diff --git a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
index e1806e210c3..dd000c72551 100644
--- a/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Build written by Andrew John Hughes (ahughes@redhat.com)
@@ -13,7 +13,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc +icedtea7 javascript +nsplugin tagsoup test"
+IUSE="doc +icedtea7 javascript nsplugin tagsoup test"
RESTRICT="test"
COMMON_DEP="
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
index 94dc000bfb3..695a064b9f7 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc javascript +nsplugin tagsoup test"
+IUSE="doc javascript nsplugin tagsoup test"
RESTRICT="test"
CDEPEND="javascript? ( dev-java/rhino:1.6 )
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
index 552d4aac349..2b60e5b951f 100644
--- a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
@@ -38,7 +38,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
RESTRICT="test"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
- javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio
+ javascript +jbootstrap kerberos nsplugin +nss pax_kernel pulseaudio
selinux source systemtap test zero +webstart"
# Ideally the following were optional at build time.
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
index d32b642aa1f..8f719d9de2c 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r3.ebuild
@@ -61,7 +61,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
RESTRICT="test"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
- jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+ jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
pulseaudio sctp selinux smartcard source +sunec test zero +webstart"
REQUIRED_USE="gtk? ( !headless-awt )"
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 44cfdde4d18..2d954613537 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1,3 @@
DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940 WHIRLPOOL 2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
+DIST jaxen-1.1.6.jar 409677 SHA256 7d865e649e3dda2a26d9aee3f7f2e9e10569aee688463feb57d0bda16745eaa2 SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48 WHIRLPOOL a46f4be76d43a0072b4b426b41d5e2df800ec71582724cb0036f010cbc3a9c8e39d4fc87511f6dba79b329cee072feaec506d730bbcc6decc5325d3ccfe866f6
diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild b/dev-java/jaxen/jaxen-1.1.6.ebuild
new file mode 100644
index 00000000000..70cfd567083
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.codehaus.org/"
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+CDEPEND="
+ dev-java/dom4j:1
+ dev-java/jdom:0
+ dev-java/xom:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+ xom
+ jdom
+ dom4j-1
+"
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 7d42334ec0d..770d574d02a 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,4 +1,3 @@
DIST JDOM-2.0.6.tar.gz 8344114 SHA256 81790196ecbd9cf62cb2aa2a9c14153d74dae3a0364a9a262f42098c6d3c165d SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1 WHIRLPOOL 71df273140951ac9f5b2f9b06b7f8aa2fe43d05d93ceec9a508856a1cd5c571d897809d5b692fcf28ea0f45c203346b02745f170fac548b77e47904a3f8ce817
DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
DIST jdom-1.1.3.tar.gz 4233403 SHA256 d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 WHIRLPOOL b9f610001e152c41fcd3a0328b4ff563b33220f2cde8571ba09dd9063bc63fe51af80229c2bfdd7aeff4a0b354cd04a8d11f9fccb42b8620b2225c6f9ecd38e0
-DIST jdom-2.0.6.zip 7464948 SHA256 86b8683187ca28a935991cbffe5d1a9cfe88e5141e14905694a95e832f775b12 SHA512 dc84ede1eb05f7178a7f5b55f4035655096becee483966d7e0934484522c5981a1fdca836ae9ea6f3d2538c50b7a3cb9029264cd6427f5308d3ac7666e160cff WHIRLPOOL d568a18d8fc369ec0cf2954b16d2360ac934726c93ea31a59d75bc1913a9b1fba5d7cd02f6822ab21000b8df51380f2087e8690a3b66352e8d1267809091b374
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 5403ba96d4f..328bd8d32f9 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,18 +13,15 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="0"
KEYWORDS="amd64 ~arm ppc ppc64 x86"
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
+IUSE=""
+
RDEPEND=">=virtual/jre-1.6"
-# ${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.6"
-# ${COMMON_DEP}"
-IUSE=""
S="${WORKDIR}/${PN}"
java_prepare() {
- find "${S}" -name '*.jar' -delete || die
+ java-pkg_clean
rm -r build/apidocs || die
@@ -43,12 +40,9 @@ java_prepare() {
}
EANT_BUILD_TARGET="package"
-#EANT_GENTOO_CLASSPATH="saxpath,xerces-2"
src_install() {
java-pkg_dojar build/*.jar
-
- #java-pkg_register-dependency "jdom-jaxen-${SLOT}"
dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
use doc && java-pkg_dojavadoc build/apidocs
use examples && java-pkg_doexamples samples
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 17153ec4366..5a1abb46927 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,17 +14,20 @@ SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
-CDEPEND="dev-java/iso-relax:0
+CDEPEND="
+ dev-java/xalan:0
dev-java/jaxen:1.1
- dev-java/xalan:0"
+ dev-java/iso-relax:0"
-RDEPEND="${CDEPEND}
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
+DEPEND="
+ ${CDEPEND}
>=virtual/jdk-1.6
test? ( dev-java/ant-junit:0 )"
@@ -34,9 +37,14 @@ EANT_TEST_TARGET="junit"
EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
S="${WORKDIR}/${PN}-${MY_P}"
+PATCHES=(
+ "${FILESDIR}/build-xml-2.patch"
+)
+
java_prepare() {
- epatch "${FILESDIR}/build-xml-2.patch"
- find -name "*.jar" -delete || die
+ java-pkg_clean
+
+ epatch "${PATCHES[@]}"
# Remove Android stuff to avoid junit RDEPEND.
rm -vr contrib/src/java/org/jdom2/contrib/android || die
diff --git a/dev-java/jdom/jdom-2.0.6.ebuild b/dev-java/jdom/jdom-2.0.6.ebuild
deleted file mode 100644
index 76dcf19c1d4..00000000000
--- a/dev-java/jdom/jdom-2.0.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="source test"
-
-#JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-COMMON_DEP="dev-java/iso-relax
- dev-java/jaxen:1.1
- dev-java/xalan
- dev-java/xml-commons-external:1.4"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
- app-arch/unzip
- test? ( dev-java/junit:0 )
- >=virtual/jdk-1.6"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${A}
- unpack ./${P}-sources.jar
-}
-
-java_prepare() {
- find "${S}" -name '*.jar' -delete || die
- mkdir "${S}"/classes "${S}"/docs
-}
-
-src_compile() {
- find org -name "*.java" > "${T}"/src.list
-
- local cp="$(java-pkg_getjars iso-relax,jaxen-1.1,xalan,xml-commons-external-1.4)"
- if use test ; then
- cp="${cp}:junit.jar"
- else
- sed -i 's/PerfTest/PerfTemp/' "${T}"/src.list || die "Failed to rename PerfTest"
- sed -i '/test/Id' "${T}"/src.list || die "Failed to remove test classes"
- sed -i 's/PerfTemp/PerfTest/' "${T}"/src.list || die "Failed to rename PerfTest"
- fi
-
- ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
- # Disabled for the time being.
- # if use doc; then
- # ejavadoc -d "${S}"/docs -classpath ${cp} "@${T}"/src.list -quiet || die "javadoc failed"
- # fi
-
- cd "${S}"/classes
- jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- # Disabled for the time being.
- # if use doc; then
- # java-pkg_dojavadoc docs
- # fi
-
- dodoc README.txt LICENSE.txt || die
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index ec538dabb3a..f427dc78324 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -17,12 +17,15 @@ SLOT="2.1"
KEYWORDS="amd64 ppc x86"
IUSE="debug"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND="
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+RDEPEND="
+ >=virtual/jre-1.6"
java_prepare() {
- find "${WORKDIR}" -name '*.jar' -print -delete || die
+ java-pkg_clean
}
src_compile() {
diff --git a/dev-java/jigsaw/Manifest b/dev-java/jigsaw/Manifest
deleted file mode 100644
index 81940823e23..00000000000
--- a/dev-java/jigsaw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jigsaw_2.2.6.tar.bz2 4674802 SHA256 9d0b177c6e2bc07aff91648270ef09e50d3fc2fee0ce87940e29b43695265342 SHA512 99fb362468b13d250d4e5fe33e0dc397b3bd6a98e3c012da10bfdef93511bdf5ae7c0ad3498bbd191b6c07cc658ce55d3737721fdec8f474470cbfc66c4e049a WHIRLPOOL df879de51a084a187a1172212157c486192c5af891be4ebf3c721340bd28cfd78618349bfc0573ee334e54efc87fb170c4257f0263024afd1fc6624f80985020
diff --git a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch b/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
deleted file mode 100644
index d0225de839b..00000000000
--- a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build.xml.vanilla 2012-02-23 01:17:09.137602588 +0100
-+++ build.xml 2012-02-23 01:21:35.431836983 +0100
-@@ -79,6 +79,9 @@
- <pathelement path="classes/xp.jar"/>
- <pathelement path="classes/servlet.jar"/>
- <pathelement path="${build.core.classes}"/>
-+ <fileset dir="jars">
-+ <include name="**/*.jar"/>
-+ </fileset>
- </path>
-
- <!-- =================================================================== -->
-@@ -99,6 +102,7 @@
- <!-- =================================================================== -->
- <target name="compile.core" depends="prepare">
- <javac srcdir="${src.dir}"
-+ encoding="iso-8859-1"
- destdir="${build.core.classes}"
- debug="${debug}"
- excludes="org/w3c/jigadm/** org/w3c/jigedit/**"
-@@ -111,6 +115,7 @@
- <!-- =================================================================== -->
- <target name="compile.admin" depends="compile.core">
- <javac srcdir="${src.dir}"
-+ encoding="iso-8859-1"
- destdir="${build.admin.classes}"
- debug="${debug}"
- includes="org/w3c/jigadm/**"
-@@ -122,7 +127,8 @@
- <!-- Compiles the edit package -->
- <!-- =================================================================== -->
- <target name="compile.edit" depends="compile.core">
-- <javac srcdir="${src.dir}"
-+ <javac srcdir="${src.dir}"
-+ encoding="iso-8859-1"
- destdir="${build.edit.classes}"
- debug="${debug}"
- includes="org/w3c/jigedit/**"
-@@ -173,7 +179,9 @@
- <target name="javadocs" depends="prepare">
- <mkdir dir="${build.javadocs}"/>
- <javadoc packagenames="${packages}"
-+ encoding="iso-8859-1"
- sourcepath="${src.dir}"
-+ classpathref="build.classpath"
- destdir="${build.javadocs}"
- author="true"
- version="true"
diff --git a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
deleted file mode 100644
index 58f4df3c12a..00000000000
--- a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-# Jigsaw is actually a WWW server, it would be nice to package it as such, not
-# as a raw library like this ebuild does.
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="W3 Consortium's Java-based Web server libraries"
-HOMEPAGE="http://jigsaw.w3.org/"
-SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
- dev-java/jtidy:0
- dev-java/xerces:2
- dev-java/jakarta-oro:2.0
- java-virtuals/servlet-api:2.3"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.6"
-
-EANT_DOC_TARGET="javadocs"
-
-S="${WORKDIR}/Jigsaw"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.xml.patch"
-)
-
-java_prepare() {
- epatch "${PATCHES[@]}"
-
- java-pkg_clean
-
- mkdir -p "${S}/jars" || die "mkdir failed"
-
- java-pkg_jar-from --into jars/ jakarta-oro-2.0
- java-pkg_jar-from --into jars/ servlet-api-2.3
- java-pkg_jar-from --into jars/ xerces-2
- java-pkg_jar-from --into jars/ jtidy
-
- cd "${S}/jars" || die
- ln -s $(java-config --tools) || die
-}
-
-src_install() {
- java-pkg_dojar classes/{jigsaw,jigadmin,jigedit}.jar
-
- dodoc ANNOUNCE README
- use doc && java-pkg_dojavadoc ant.build/javadocs
-}
diff --git a/dev-java/jpf/Manifest b/dev-java/jpf/Manifest
deleted file mode 100644
index 64718e7683a..00000000000
--- a/dev-java/jpf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jpf-src-1.5.1.zip 1115573 SHA256 93bc9852b9d86f788f5e3c53650aa11a18758526542e0ebc17a508818e91c2e4 SHA512 90326013b110f5729e25bde3f61985f7bee9f78c58ebc3631c271c3d02fc7e91851adf3aa79de71b8e1a1411a2d3b67ba8e4e13f55c9332505ea2adbbc00149b WHIRLPOOL 8530c8e01e034dcc4a642d6756d1bbf48572ed7dc15548bdd448847c661acfc80b6cc1d60f8bf147aab7e314114d077b6924768cfe2e2e7b04b371f3aacb5d52
diff --git a/dev-java/jpf/jpf-1.5.1.ebuild b/dev-java/jpf/jpf-1.5.1.ebuild
deleted file mode 100644
index 6f637194ccb..00000000000
--- a/dev-java/jpf/jpf-1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Plugin Framework - a runtime engine that dynamically discovers and loads plugins"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-LICENSE="LGPL-2.1"
-
-SLOT="1.5"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-COMMON_DEP="dev-java/commons-logging:0
- dev-java/ant-core"
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- java-ant_rewrite-classpath
- rm -fv lib/*.jar || die
- # needs some not yet packaged jxp dep, will add only on demand
- rm -rfv source-tools/org/java/plugin/tools/{docgen,ant/DocTask.java} || die
-}
-
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
-
-src_install() {
- java-pkg_dojar build/lib/jpf*.jar
- java-pkg_register-ant-task
-
- newdoc README.txt README || die
- dodoc changelog.txt || die
-}
diff --git a/dev-java/jpfcodegen/Manifest b/dev-java/jpfcodegen/Manifest
deleted file mode 100644
index a6157e49a56..00000000000
--- a/dev-java/jpfcodegen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jpfcodegen-0.4.tar.bz2 27201 SHA256 c88401b6d872bf52aeb473bda16a77fb51b2f0236a4fb88ba4847d1bde174699 SHA512 9af5de54621afc941ac56f463b76a31732d97ad4fbbeabf43772c27e91f0e8fdfe5c089fc1cd22b2ad0bbac88d624086c94d751110bc77348706b39cedd45897 WHIRLPOOL c7005df485de6694658444cabdbcfa5ce20b35fe563f253a5b213801e98ee19eae48087df688281edc5ffd6f99eb481478ade568c2da3fc49287ac7e6795fe49
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
deleted file mode 100644
index cdecabd733e..00000000000
--- a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.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
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generator of classes for accessing the attributes and extensions of JPF plug-ins"
-HOMEPAGE="http://jabref.sourceforge.net/"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="LGPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-CDEPEND="dev-java/velocity:0
- dev-java/jpf:1.5"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_BUILD_TARGET="jars"
-EANT_GENTOO_CLASSPATH="jpf-1.5,velocity"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
- java-pkg_newjar JPFCodeGenerator-${PV}.jar JPFCodeGenerator.jar
- java-pkg_newjar JPFCodeGenerator-${PV}-rt.jar JPFCodeGenerator-rt.jar
- dohtml index.html
-}
diff --git a/dev-java/jpfcodegen/metadata.xml b/dev-java/jpfcodegen/metadata.xml
deleted file mode 100644
index 3a6d059d80c..00000000000
--- a/dev-java/jpfcodegen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>java</herd>
- <upstream>
- <remote-id type="sourceforge">jabref</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-java/mg4j/Manifest b/dev-java/mg4j/Manifest
deleted file mode 100644
index dc337235c28..00000000000
--- a/dev-java/mg4j/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mg4j-0.9.1-src.tar.gz 169529 SHA256 8ca5c99facd9be71af57f0e71f746e83af98018774afe37d2a7a83aa356dc828 SHA512 b9831ed28360836a1828011bd9bf6474303f2125e1643fcb600a14aa8851468785d60739f85c1cfd9762e1744765a17827b334f194169786f54419d6b1f711c3 WHIRLPOOL 43fb4f7b8b786f66aa84b86cdcdcb758e9da727a5c88c0fb6f755c71a450f671be80901c1b5bde4486dab4a8621f0aa8f75c59bacf59b5c1a54b68b81c624759
diff --git a/dev-java/mg4j/files/mg4j-build.patch b/dev-java/mg4j/files/mg4j-build.patch
deleted file mode 100644
index eef1c4878cb..00000000000
--- a/dev-java/mg4j/files/mg4j-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -uprN mg4j-0.9.orig/build.xml mg4j-0.9/build.xml
---- mg4j-0.9.orig/build.xml 2004-09-01 12:04:18.000000000 +0200
-+++ mg4j-0.9/build.xml 2004-11-17 00:30:41.879119728 +0100
-@@ -39,25 +39,34 @@
- includes="it/unimi/dsi/mg4j/query/parser/**"
- nowarn="on"
- debug="on"
-- optimize="on"
-+ optimize="on"
- destdir="${build}"
-- source="1.4"
-- />
-+ source="1.4"
-+ target="1.4">
-+
-+ <classpath>
-+ <pathelement path="lib/jal.jar;lib/fastutil.jar;lib/gnu.getopt.jar;lib/libreadline-java.jar;lib/colt.jar" />
-+ </classpath>
-+ </javac>
- </target>
-
- <target name="compile" depends="init,compile-parser">
- <javac srcdir="${src}"
- debug="on"
-- optimize="on"
-+ optimize="on"
- destdir="${build}"
-- source="1.4"
-- />
-+ source="1.4"
-+ target="1.4">
-+
-+ <classpath>
-+ <pathelement path="lib/jal.jar;lib/fastutil.jar;lib/gnu.getopt.jar;lib/libreadline-java.jar;lib/colt.jar" />
-+ </classpath>
-+ </javac>
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="mg4j-${version}.jar"
-- basedir="${build}"
-- />
-+ basedir="${build}" />
- </target>
-
-
-@@ -69,8 +78,7 @@
- sourcepath="${src}"
- private="off"
- source="1.4"
-- windowtitle="MG4J ${version}"
-- >
-+ windowtitle="MG4J ${version}">
- <link href="${j2se.apiurl}"/>
- <link href="${fastutil.apiurl}"/>
- <link href="${colt.apiurl}"/>
diff --git a/dev-java/mg4j/metadata.xml b/dev-java/mg4j/metadata.xml
deleted file mode 100644
index 0aca2297599..00000000000
--- a/dev-java/mg4j/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-
-MG4J (Managing Gigabytes for Java) is a collaborative effort aimed at providing
-a free Java implementation of inverted-index compression techniques; as a
-by-product, it offers several general-purpose optimised classes, including fast
-&amp; compact mutable strings, bit-level I/O, fast unsychronised buffered
-streams, (possibly signed) minimal perfect hashing for very large strings
-collections, etc.
-
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/mg4j/mg4j-0.9.1-r2.ebuild b/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
deleted file mode 100644
index 9c00faf44f3..00000000000
--- a/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A free Java implementation of inverted-index compression technique"
-SRC_URI="http://mg4j.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://mg4j.dsi.unimi.it"
-
-LICENSE="LGPL-2.1"
-SLOT="0.9"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="
- dev-java/colt:0
- dev-java/fastutil:4.3
- dev-java/jal:0
- dev-java/java-getopt:1
- dev-java/libreadline-java:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- dev-java/javacc:0"
-
-java_prepare() {
- epatch "${FILESDIR}/mg4j-build.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="colt,fastutil-4.3,jal,java-getopt-1,libreadline-java"
-
-src_install() {
- java-pkg_newjar ${P}.jar
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc java/it
-}
diff --git a/dev-java/milton-api/Manifest b/dev-java/milton-api/Manifest
index 535318af0b4..1b952564ac3 100644
--- a/dev-java/milton-api/Manifest
+++ b/dev-java/milton-api/Manifest
@@ -1,2 +1 @@
-DIST milton-api-2.5.1.5-sources.jar 210148 SHA256 e55d3919b6852206137121f0bf240607b82011bc4a21f1ac4f58be247ba0d221 SHA512 2cfc5cf5b81e36055871351cabced0b83e0c24aff3adb222cbb9a22d13bb19619e315606ccfbd4d0b14d3951deeb51442fa86fb587ecedd7cfbbc5ee54b76803 WHIRLPOOL 0c74aabff88f7b5d586d369cdc074bc227b3b0b1303268f90e52ea1b2bf42f3c53323ffdd8d8f31d626b18aeb5e2d2b0d7ee3426c409b62b6b3f07939961dc5e
-DIST milton-api-2.6.5.5-sources.jar 227823 SHA256 bfd1fd7cd0560024cb64630e3660873d13033cc18d783a6f3deda2dfa7784e59 SHA512 66730e025399039537b31f635546375939e98c27e4250283342d8dec350a682368f5991d969dfecce9ab45f541d2da448f9786c8265ae55caa742f887a97899f WHIRLPOOL ed9578e52c477675f55209e5223b744a967f616f3d2b17aea87145ceac32cc69516535261a599814ca7a0e86d01adaa30ec2c96b3be0a280b9199b8fb09345a2
+DIST milton-api-2.7.1.3-sources.jar 240367 SHA256 56d79201eff9d2287ae4a516f2d70c71d5813e20b1c5b669f16acad7b522d5cb SHA512 9d73e830a4c62b872fe756679158a961d6160016cc6db6915dd17f65f9ca6008cf7f451aae71beb735b24c7b0872b8b672f53f4a0ecb1279d9572e1908fd5f08 WHIRLPOOL d191a43b4c3d108f933f900a1a48a43cb8ce86e94bc84227152e89ba4bf7b7e38f95af67f61735ee174106ef7c92bfdca733a63c17359a43d06d2c62a174c564
diff --git a/dev-java/milton-api/milton-api-2.5.1.5.ebuild b/dev-java/milton-api/milton-api-2.5.1.5.ebuild
deleted file mode 100644
index d44d58f3dd5..00000000000
--- a/dev-java/milton-api/milton-api-2.5.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 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="Milton WebDav library"
-HOMEPAGE="http://milton.io"
-SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
- dev-java/commons-codec:0
- dev-java/commons-io:1
- dev-java/slf4j-api:0
-"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
-
-JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-api/milton-api-2.6.5.5.ebuild b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
index 4e2f26b160c..bc54c3b25fe 100644
--- a/dev-java/milton-api/milton-api-2.6.5.5.ebuild
+++ b/dev-java/milton-api/milton-api-2.7.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="http://milton.io"
SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
LICENSE="Apache-2.0"
-SLOT="2.6"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
@@ -24,10 +24,12 @@ CDEPEND="
dev-java/slf4j-api:0
"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
JAVA_GENTOO_CLASSPATH="commons-codec,commons-io-1,slf4j-api"
diff --git a/dev-java/milton-mail-api/Manifest b/dev-java/milton-mail-api/Manifest
index 37c7d48ee1f..0b8b6848975 100644
--- a/dev-java/milton-mail-api/Manifest
+++ b/dev-java/milton-mail-api/Manifest
@@ -1 +1 @@
-DIST milton-mail-api-2.5.1.5-sources.jar 34106 SHA256 537fd8b99b29574705be8c82ffd5d447bbcc009f4d94fd9b2b53540177dab868 SHA512 c2f244f7fb500828ed26cdc254de428324f560a9f9809373b8aca0fb1a71a70bc748e0155f4c68448307bc272dd7b671a1003522b6eacf8c41cdea116f5ebd5d WHIRLPOOL 9a29b4ffbd6fd457b2bf59b4f71d8a42c0037ff566dd8f95bbc400f3a8a873b28daa20e8757dc323855812c73087490bfb6c9226c6b26699e526aebb19d03911
+DIST milton-mail-api-2.7.1.3-sources.jar 34106 SHA256 4947db22c73db8f7b8fbf3d549b62d622c7ec33a42a774662e60bb8bce88153a SHA512 c0b7f7d62b54f996f42c44e8b28eeaee8a76e8990be5a9894a0f3b2daead699e78442c5cf96a272f71a54536c87247f366f10f3aa2c3adb9d4870253ec8c3b67 WHIRLPOOL 7109d5a62f919503ad21a557e7e15f0428afe1ae72f9a8129dd58ec551d684934e8d48095c86d0d5cb2c250163c143e6ea7af6d172152b5e60fa7aa643a9eb86
diff --git a/dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
index f242270479a..477761825a7 100644
--- a/dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild
+++ b/dev-java/milton-mail-api/milton-mail-api-2.7.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,25 +13,27 @@ HOMEPAGE="http://milton.io"
SRC_URI="http://milton.io/maven/io/milton/${PN}/${PV}/${P}-sources.jar"
LICENSE="Apache-2.0"
-SLOT="2.5"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
CDEPEND="
- dev-java/milton-api:${SLOT}
dev-java/slf4j-api:0
+ dev-java/milton-api:0
dev-java/oracle-javamail:0
"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
JAVA_GENTOO_CLASSPATH="
- milton-api-${SLOT}
- oracle-javamail
slf4j-api
+ milton-api
+ oracle-javamail
"
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 958338365cf..074e7eeaeab 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1 +1,2 @@
DIST javamail-1.5.2-src.zip 1573447 SHA256 76efde22a38a021baa99087be1878787bf5e72ceb684b1bc33eb260a8ddcbdd5 SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc WHIRLPOOL 6c438c6569cbd689eeaa8398301b5481956443ccb9f2112891bce5e97d1a792e0176e8fb395cbadd4175e87c253db833760aff96ea61654dad3d478d386fbf7b
+DIST oracle-javamail-1.5.5.zip 1794428 SHA256 33d0b71714931b586bbb61367fd6491f7c100b9ddca597a62e51e5d5ac308bd8 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a WHIRLPOOL 363c62731b924ed8f48a60382ccb853789c1d0645ef77f1fe9370283d58acb3e74aa311e7e72512f80f97598c33050426865178a93d22aaf882c19581af8c241
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
new file mode 100644
index 00000000000..845cbb06b57
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 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="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ default
+
+ # build.xml expects it here
+ mkdir -p legal/src/main/resources/META-INF || die
+ cp mail/src/main/resources/META-INF/LICENSE.txt \
+ legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+ java-pkg_dojar target/release/mail.jar
+
+ dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+ dohtml -r doc/release/{*.html,images} || die
+
+ use doc && java-pkg_dojavadoc target/release/docs/javadocs
+ use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/webgraph/Manifest b/dev-java/webgraph/Manifest
deleted file mode 100644
index 8e03d8d80f3..00000000000
--- a/dev-java/webgraph/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST webgraph-1.4.1-src.tar.gz 55467 SHA256 a91402ae46c60234f8234a9b05078feb7d23bfa12a68447ef410e24ceb4dc133 SHA512 6c7ae24ad1a3f05d547bd49b83446f42177d50b86db60815208a18fe86129dc1264c9c2d67f6992dd930333e7150b952e27d8cc510179fd362879c719900d5cb WHIRLPOOL 34ba6c65f7051a400eb2de07ff0eaec3cf20fe3b3cb10db927249a3ca269206be990cdb2018101c4695a77e5b8892f77ca18d25e1bd38b4b50d46c9dc30bd666
diff --git a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
deleted file mode 100644
index a4ad2d262a1..00000000000
--- a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- build.xml.orig 2005-04-15 14:36:14.000000000 +0200
-+++ build.xml 2005-04-15 14:38:45.000000000 +0200
-@@ -19,6 +19,14 @@
- <property name="jar.base" value="/usr/share/java"/>
- <property name="javadoc.base" value="/usr/share/javadoc"/>
-
-+ <path id="compile.classpath">
-+ <pathelement location="lib/jal.jar" />
-+ <pathelement location="lib/colt.jar" />
-+ <pathelement location="lib/fastutil.jar" />
-+ <pathelement location="lib/gnu.getopt.jar" />
-+ <pathelement location="lib/mg4j.jar" />
-+ </path>
-+
- <!--
- Groovy and Cobertura need different versions of asm.
- Due to the delegation-based class-loading model used
-@@ -119,7 +127,9 @@
- <target name="all" depends="jar,javadoc"/>
-
- <target name="compile" depends="init" description="Compile standard sources (not test files)">
-- <javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4"/>
-+ <javac srcdir="${src}" includes="**${subdir}" excludes="test/**" debug="on" optimize="on" destdir="${build}" source="1.4" target="1.4">
-+ <classpath refid="compile.classpath" />
-+ </javac>
- </target>
-
- <target name="jar" depends="compile" description="Creates jar (without tests)">
-@@ -144,6 +154,7 @@
- <link href="${colt.apiurl}"/>
- <link href="${jal.apiurl}"/>
- <link href="${mg4j.apiurl}"/>
-+ <classpath refid="compile.classpath" />
- </javadoc>
- </target>
-
diff --git a/dev-java/webgraph/metadata.xml b/dev-java/webgraph/metadata.xml
deleted file mode 100644
index 2ff9b03e880..00000000000
--- a/dev-java/webgraph/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-<herd>java</herd>
-
-<longdescription>
-WebGraph is a framework to study the web graph. It provides simple ways to
-manage very large graphs, exploiting modern compression techniques.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/webgraph/webgraph-1.4.1-r1.ebuild b/dev-java/webgraph/webgraph-1.4.1-r1.ebuild
deleted file mode 100644
index 13d57e54a2e..00000000000
--- a/dev-java/webgraph/webgraph-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +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 eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="WebGraph is a framework to study the web graph"
-SRC_URI="http://webgraph.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://webgraph.dsi.unimi.it"
-LICENSE="LGPL-2.1"
-SLOT="1.4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="=dev-java/java-getopt-1.0*
- =dev-java/fastutil-4.4*
- =dev-java/colt-1*
- >=dev-java/jal-20031117
- =dev-java/mg4j-0.9*"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-
-src_unpack() {
-
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/${P}-gentoo.patch"
-
- mkdir lib/ && cd lib/
- java-pkg_jar-from java-getopt-1
- java-pkg_jar-from fastutil-4.4
- java-pkg_jar-from colt colt.jar
- java-pkg_jar-from jal jal.jar
- java-pkg_jar-from mg4j-0.9
-
-}
-
-src_install() {
-
- java-pkg_newjar ${P}.jar ${PN}.jar
-
- dodoc CHANGES
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc java/it
-
-}
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 3cce75cb59f..8204db7e135 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,20 +13,23 @@ HOMEPAGE="https://github.com/FasterXML/woodstox"
SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
-CDEPEND="dev-java/sax:0
+CDEPEND="
+ dev-java/sax:0
dev-java/msv:0
dev-java/relaxng-datatype:0"
-RDEPEND="${CDEPEND}
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-java/ant-junit:0 )
app-arch/unzip
- test? ( dev-java/ant-junit:0 )"
+ >=virtual/jdk-1.6"
EANT_BUILD_TARGET="jars"
EANT_DOC_TARGET="javadoc"
diff --git a/dev-java/wstx/wstx-3.2.9.ebuild b/dev-java/wstx/wstx-3.2.9.ebuild
deleted file mode 100644
index a9852b817a1..00000000000
--- a/dev-java/wstx/wstx-3.2.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Woodstox is a high-performance validating namespace-aware XML-processor"
-HOMEPAGE="http://woodstox.codehaus.org/"
-SRC_URI="http://woodstox.codehaus.org/${PV}/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-COMMON_DEP="
- dev-java/emma:0
- dev-java/sax:0
- java-virtuals/jaxp-virtual
- dev-java/stax:0
- dev-java/msv:0
- dev-java/xsdlib:0
- dev-java/relaxng-datatype:0
- dev-java/junit:0"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadoc"
-
-# Don't need to make a folder
-S="${WORKDIR}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
- rm -v lib/msv/*.jar || die
- rm -v lib/*.jar || die
-
- # Get rid of a missing include.
- epatch "${FILESDIR}"/${P}-build.xml.patch
-}
-
-EANT_GENTOO_CLASSPATH="emma,sax,jaxp-virtual,msv,xsdlib,relaxng-datatype,junit"
-
-src_test(){
- ANT_TASKS="ant-junit ant-nodeps ant-trax" eant test || die "Tests failed"
-}
-
-src_install() {
- java-pkg_newjar build/"${PN}"-api-"${PV}".jar "${PN}"-api.jar
- java-pkg_newjar build/"${PN}"-asl-"${PV}".jar "${PN}".jar
- use doc && java-pkg_dojavadoc build/javadoc
- use source && java-pkg_dosrc src
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r3.ebuild b/dev-java/xstream/xstream-1.3.1-r3.ebuild
deleted file mode 100644
index 46fdf943ee6..00000000000
--- a/dev-java/xstream/xstream-1.3.1-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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="A text-processing Java classes that serialize objects to XML and back again"
-HOMEPAGE="http://xstream.codehaus.org/index.html"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-# By default, these tests exit successfully on failure. Chewi has fixed
-# that below but it's probably because they blow up spectacularly on
-# every VM he has tried.
-RESTRICT="test"
-
-CDEPEND="dev-java/cglib:3
- dev-java/dom4j:1
- dev-java/jdom:1.0
- dev-java/joda-time:0
- dev-java/xom:0
- dev-java/xpp3:0
- dev-java/xml-commons-external:1.3
- dev-java/jettison:0
- java-virtuals/stax-api:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- test? (
- dev-java/ant-junit:0
- dev-java/ant-trax:0
- dev-java/junit:4
- dev-java/xml-writer:0
- dev-java/commons-lang:2.1
- dev-java/jmock:1.0
- dev-java/jakarta-oro:2.0
- dev-java/stax:0
- dev-java/wstx:3.2
- )
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xpp3,jdom-1.0,xom,dom4j-1,joda-time,cglib-3,xml-commons-external-1.3,jettison,stax-api"
-EANT_BUILD_TARGET="benchmark:compile jar"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Djunit.haltonfailure=true"
-
-java_prepare() {
- rm -v lib/*.jar || die
- rm -rfv lib/jdk1.3 || die
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,jmock-1.0,commons-lang-2.1,xml-writer,wstx-3.2,stax,jakarta-oro-2.0"
-EANT_TEST_TARGET="test"
-ANT_TASKS="ant-junit ant-trax"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install(){
- java-pkg_newjar target/${P}.jar
- java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
-
- use doc && java-pkg_dojavadoc target/javadoc
- use source && java-pkg_dosrc src/java/com
-}
-
-pkg_postinst(){
- elog "Major Changes from 1.2 See:"
- elog "http://xstream.codehaus.org/changes.html"
- elog "to prevent breakage ..."
-}
diff --git a/dev-java/xstream/xstream-1.3.1-r4.ebuild b/dev-java/xstream/xstream-1.3.1-r4.ebuild
index e0f82b3bb84..306f95876bf 100644
--- a/dev-java/xstream/xstream-1.3.1-r4.ebuild
+++ b/dev-java/xstream/xstream-1.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ HOMEPAGE="http://x-stream.github.io"
SRC_URI="http://repo.maven.apache.org/maven2/com/thoughtworks/${PN}/${PN}-distribution/${PV}/${PN}-distribution-${PV}-src.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
# By default, these tests exit successfully on failure. Chewi has fixed
# that below but it's probably because they blow up spectacularly on
@@ -22,21 +22,24 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
# last-rited, so we no longer bother to support them at all.
RESTRICT="test"
-CDEPEND="dev-java/cglib:3
- dev-java/dom4j:1
- dev-java/jdom:0
- dev-java/joda-time:0
+CDEPEND="
dev-java/xom:0
+ dev-java/jdom:0
dev-java/xpp3:0
- dev-java/xml-commons-external:1.3
- dev-java/jettison:0"
+ dev-java/cglib:3
+ dev-java/dom4j:1
+ dev-java/jettison:0
+ dev-java/joda-time:0
+ dev-java/xml-commons-external:1.3"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
+DEPEND="
+ ${CDEPEND}
app-arch/unzip
- ${CDEPEND}"
+ >=virtual/jdk-1.6"
S="${WORKDIR}/${P}/${PN}"
@@ -50,9 +53,9 @@ java_prepare() {
rm -rfv lib/jdk1.3 || die
}
-src_install(){
- java-pkg_newjar target/${P}.jar
- java-pkg_newjar target/${PN}-benchmark-${PV}.jar ${PN}-benchmark.jar
+src_install() {
+ java-pkg_newjar "target/${P}.jar"
+ java-pkg_newjar "target/${PN}-benchmark-${PV}.jar" "${PN}-benchmark.jar"
use doc && java-pkg_dojavadoc target/javadoc
use source && java-pkg_dosrc src/java/com
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a60e55e5549..95f848f1151 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,2 +1,3 @@
DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e
+DIST R-3.2.3.tar.gz 29816176 SHA256 b93b7d878138279234160f007cb9b7f81b8a72c012a15566e9ec5395cfd9b6c1 SHA512 9d7294af860204f4d84e25eb503111c9607beedbc42f01de073c915945a6342c3e24e25a9cc038a2e58442036bee931975d93dc327081ed02afe5ffa365170ea WHIRLPOOL 31ecbaa5c4340e02551eefe17f7f2e9ae075778e7b568a2c477b9f31f1b9598380edb8cb53c713df6643d2cba62ea97c6f225490ade2fc8a9e2b4d88426c7883
diff --git a/dev-lang/R/R-3.2.3.ebuild b/dev-lang/R/R-3.2.3.ebuild
new file mode 100644
index 00000000000..c8227c911b1
--- /dev/null
+++ b/dev-lang/R/R-3.2.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+
+BCP=${PN}-20130129.bash_completion
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="
+ mirror://cran/src/base/R-3/${P}.tar.gz
+ https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
+REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
+
+CDEPEND="
+ app-arch/bzip2:0=
+ app-arch/xz-utils:0=
+ app-text/ghostscript-gpl
+ >=dev-libs/libpcre-8.35:3=
+ virtual/blas:0
+ || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
+ cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
+ icu? ( dev-libs/icu:= )
+ jpeg? ( virtual/jpeg:0 )
+ lapack? ( virtual/lapack:0 )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0= )
+ readline? ( sys-libs/readline:0= )
+ tiff? ( media-libs/tiff:0= )
+ tk? ( dev-lang/tk:0= )
+ X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? (
+ virtual/latex-base
+ dev-texlive/texlive-fontsrecommended
+ )"
+
+RDEPEND="${CDEPEND}
+ >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+ java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+ if use openmp; then
+ if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+ ewarn "OpenMP is not available in your current selected gcc"
+ die "need openmp capable gcc"
+ fi
+ FORTRAN_NEED_OPENMP=1
+ fi
+ fortran-2_pkg_setup
+ filter-ldflags -Wl,-Bdirect -Bdirect
+ # avoid using existing R installation
+ unset R_HOME
+ # Temporary fix for bug #419761
+ if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+ append-flags -fno-ipa-cp-clone
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
+ "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
+ "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
+
+ # fix packages.html for doc (gentoo bug #205103)
+ sed -i \
+ -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+ src/library/tools/R/Rd.R || die
+
+ # fix Rscript path when installed (gentoo bug #221061)
+ sed -i \
+ -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+ src/unix/Makefile.in || die "sed unix Makefile failed"
+
+ # fix HTML links to manual (gentoo bug #273957)
+ sed -i \
+ -e 's:\.\./manual/:manual/:g' \
+ $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+ use lapack && \
+ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+ if use X; then
+ export R_BROWSER="$(type -p xdg-open)"
+ export R_PDFVIEWER="$(type -p xdg-open)"
+ fi
+ use perl && \
+ export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+ # don't search /usr/local
+ sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+ # Fix for Darwin (OS X)
+ if use prefix; then
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i \
+ -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+ -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+ -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+ -e "/SHLIB_EXT/s/\.so/.dylib/" \
+ configure.ac || die
+ # sort of "undo" 2.14.1-rmath-shared.patch
+ sed -i \
+ -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+ src/nmath/standalone/Makefile.in || die
+ else
+ append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+ fi
+ fi
+ AT_M4DIR=m4 eaclocal
+ eautoconf
+}
+
+src_configure() {
+ # --with-system-tre \
+ # tre is patched from upstream
+ econf \
+ --enable-byte-compiled-packages \
+ --enable-R-shlib \
+ --disable-R-framework \
+ --with-system-zlib \
+ --with-system-bzlib \
+ --with-system-pcre \
+ --with-system-xz \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable nls) \
+ $(use_enable openmp) \
+ $(use_enable profile R-profiling) \
+ $(use_enable profile memory-profiling) \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs R-static-lib) \
+ $(use_with cairo) \
+ $(use_with icu ICU) \
+ $(use_with jpeg jpeglib) \
+ $(use_with lapack) \
+ $(use_with !minimal recommended-packages) \
+ $(use_with png libpng) \
+ $(use_with readline) \
+ $(use_with tiff libtiff) \
+ $(use_with tk tcltk) \
+ $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
+ $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
+ $(use_with X x)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}/fonts"
+ emake AR="$(tc-getAR)"
+ emake -C src/nmath/standalone \
+ shared $(use static-libs && echo static) AR="$(tc-getAR)"
+ use doc && emake info pdf
+}
+
+src_install() {
+ default
+ emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+ if use doc; then
+ emake DESTDIR="${D}" install-info install-pdf
+ dosym ../manual /usr/share/doc/${PF}/html/manual
+ fi
+
+ cat > 99R <<-EOF
+ LDPATH=${R_DIR}/lib
+ R_HOME=${R_DIR}
+ EOF
+ doenvd 99R
+ newbashcomp "${WORKDIR}"/${BCP} ${PN}
+ # The buildsystem has a different understanding of install_names than
+ # we require. Since it builds modules like shared objects (wrong), many
+ # objects (all modules) get an incorrect install_name. Fixing the build
+ # system here is not really trivial.
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local mod
+ pushd "${ED}"/usr/lib/R > /dev/null
+ for mod in $(find . -name "*.dylib") ; do
+ mod=${mod#./}
+ install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
+ "${mod}"
+ done
+ popd > /dev/null
+ fi
+ docompress -x /usr/share/doc/${PF}/NEWS.rds
+}
+
+pkg_postinst() {
+ if use java; then
+ einfo "Re-initializing java paths for ${P}"
+ R CMD javareconf
+ fi
+}
diff --git a/dev-lang/lua/lua-5.1.4-r8.ebuild b/dev-lang/lua/lua-5.1.4-r8.ebuild
index b2f0b687718..3a4bbf15caf 100644
--- a/dev-lang/lua/lua-5.1.4-r8.ebuild
+++ b/dev-lang/lua/lua-5.1.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline )"
@@ -26,6 +26,12 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+ # use glibtool on Darwin (versus Apple libtool)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
+ Makefile src/Makefile || die
+ fi
+
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
@@ -54,9 +60,9 @@ src_prepare() {
# We want packages to find our things...
sed -i \
- -e 's:/usr/local:/usr:' \
+ -e "s:/usr/local:${EPREFIX}/usr:" \
-e "s:/\<lib\>:/$(get_libdir):g" \
- etc/lua.pc
+ etc/lua.pc src/luaconf.h
}
# no need for a configure phase
diff --git a/dev-lang/lua/lua-5.1.5-r100.ebuild b/dev-lang/lua/lua-5.1.5-r100.ebuild
index a02c3a334c2..88cc8703076 100644
--- a/dev-lang/lua/lua-5.1.5-r100.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r100.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )
@@ -34,6 +34,12 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+ # use glibtool on Darwin (versus Apple libtool)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
+ Makefile src/Makefile || die
+ fi
+
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
diff --git a/dev-lang/lua/lua-5.1.5-r3.ebuild b/dev-lang/lua/lua-5.1.5-r3.ebuild
index 49edd5e7448..ab765921e94 100644
--- a/dev-lang/lua/lua-5.1.5-r3.ebuild
+++ b/dev-lang/lua/lua-5.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] )"
@@ -30,6 +30,12 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
+ # use glibtool on Darwin (versus Apple libtool)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \
+ Makefile src/Makefile || die
+ fi
+
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
diff --git a/dev-lang/lua/lua-5.2.3-r1.ebuild b/dev-lang/lua/lua-5.2.3-r1.ebuild
index 01c8f60d69a..16d253d6bd8 100644
--- a/dev-lang/lua/lua-5.2.3-r1.ebuild
+++ b/dev-lang/lua/lua-5.2.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
LICENSE="MIT"
SLOT="5.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-aix ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline )
@@ -31,6 +31,12 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+ # use glibtool on Darwin (versus Apple libtool)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
+ Makefile src/Makefile || die
+ fi
+
[ -d "${FILESDIR}/${PV}" ] && \
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild
index 78856d0eb6c..0c2d1d37193 100644
--- a/dev-lang/luajit/luajit-2.0.4.ebuild
+++ b/dev-lang/luajit/luajit-2.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
LICENSE="MIT"
# this should probably be pkgmoved to 2.0 for sake of consistency.
SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="lua52compat"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/python/python-2.7.10-r3.ebuild b/dev-lang/python/python-2.7.10-r3.ebuild
deleted file mode 100644
index f0723ccf511..00000000000
--- a/dev-lang/python/python-2.7.10-r3.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-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.10-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/~floppym/python/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
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- xml? ( >=dev-libs/expat-2.1 )
- 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[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- dev-tcltk/tix
- )
- !!<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-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"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # 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 )
-
- # 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
-}
-
-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-lang/python/python-2.7.10-r5.ebuild b/dev-lang/python/python-2.7.10-r5.ebuild
deleted file mode 100644
index e4d9824406d..00000000000
--- a/dev-lang/python/python-2.7.10-r5.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# 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.10-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/~floppym/python/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-20151117-r1
- 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-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
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
- fi
-}
-
-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-lang/python/python-2.7.11-r1.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
index 3cf1079074b..8f8ae73215a 100644
--- a/dev-lang/python/python-2.7.11-r1.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -340,7 +340,7 @@ src_install() {
"${D}${PYTHON_SCRIPTDIR}/pydoc" || die
# idle
if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
+ ln -s "../../../bin/idle${SLOT}" \
"${D}${PYTHON_SCRIPTDIR}/idle" || die
fi
}
diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild
deleted file mode 100644
index 37e68f3b95f..00000000000
--- a/dev-lang/python/python-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV}"
-PATCHSET_VERSION="${PV}-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/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
- mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk 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
- app-arch/xz-utils
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- !build? (
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2:0
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? ( dev-libs/openssl )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1 )
- )
- !!<sys-apps/sandbox-2.6-r1"
-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}"
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if tc-is-cross-compiler; then
- # Invokes BUILDPYTHON, which is built for the host arch
- local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.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@@"
-
- # Disable ABI flags.
- sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
- # bug #514686
- epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
-
- epatch_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use build; then
- # Disable extraneous modules with extra dependencies.
- export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
- export PYTHON_DISABLE_SSL="1"
- else
- local disable
- 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
- 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
-
- # Export CXX so it ends up in /usr/lib/python3.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 -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- 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) \
- --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
-
- 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 || die
-
- cd "${BUILD_DIR}" || die
- emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
- # 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="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /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/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # Fix collisions between different slots of Python.
- rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
- if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter}
- else
- use elibc_uclibc && rm -fr "${libdir}/test"
- use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
- fi
-
- use threads || rm -fr "${libdir}/multiprocessing"
- use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
- 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 )
-
- # 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${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; 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
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- ewarn
- ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.3.5-r2.ebuild b/dev-lang/python/python-3.3.5-r2.ebuild
index f35f7efc7e1..79a844f6022 100644
--- a/dev-lang/python/python-3.3.5-r2.ebuild
+++ b/dev-lang/python/python-3.3.5-r2.ebuild
@@ -19,8 +19,8 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2"
SLOT="3.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk 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
@@ -35,14 +35,11 @@ RDEPEND="app-arch/bzip2
!build? (
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
- >=sys-libs/ncurses-5.2
+ >=sys-libs/ncurses-5.2:0
readline? ( >=sys-libs/readline-4.1 )
)
sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
+ ssl? ( dev-libs/openssl )
tk? (
>=dev-lang/tk-8.0
dev-tcltk/blt
@@ -75,7 +72,6 @@ src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch"
- epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
Lib/distutils/command/install.py \
@@ -94,8 +90,6 @@ src_prepare() {
# bug #514686
epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch"
- epatch "${FILESDIR}"/${PN}-3.3-libressl.patch
-
epatch_user
eautoconf
@@ -296,7 +290,7 @@ src_install() {
vars=( PYTHON "${vars[@]}" )
fi
- python_export "python${PYVER}" "${vars[@]}"
+ python_export "python${SLOT}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
index 67231a25b42..0f32b9467bb 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -285,7 +285,7 @@ src_install() {
vars=( PYTHON "${vars[@]}" )
fi
- python_export "python${PYVER}" "${vars[@]}"
+ python_export "python${SLOT}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.4.3-r2.ebuild b/dev-lang/python/python-3.4.3-r2.ebuild
deleted file mode 100644
index aea8b53602d..00000000000
--- a/dev-lang/python/python-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk 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
- app-arch/xz-utils
- >=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- xml? ( >=dev-libs/expat-2.1 )
- gdbm? ( sys-libs/gdbm[berkdb] )
- ncurses? (
- >=sys-libs/ncurses-5.2
- readline? ( >=sys-libs/readline-4.1 )
- )
- sqlite? ( >=dev-db/sqlite-3.3.8:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- tk? (
- >=dev-lang/tk-8.0
- dev-tcltk/blt
- dev-tcltk/tix
- )
- !!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND="app-eselect/eselect-python
- app-admin/python-updater"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if tc-is-cross-compiler; then
- # Invokes BUILDPYTHON, which is built for the host arch
- local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
- epatch "${FILESDIR}/${PN}-3.4-gcc-5.patch" #547626
-
- 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@@"
-
- # Disable ABI flags.
- sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- 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
-
- # Export CXX so it ends up in /usr/lib/python3.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 -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- 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) \
- --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 || die
-
- cd "${BUILD_DIR}" || die
- emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
-
- # 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="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- local -x PYTHONDONTWRITEBYTECODE=
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /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/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
-
- # Backwards compat with Gentoo divergence.
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
-
- # Fix collisions between different slots of Python.
- rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
- use elibc_uclibc && rm -fr "${libdir}/test"
- use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
- use threads || rm -fr "${libdir}/multiprocessing"
- use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
- 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 )
-
- # 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${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; 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
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.5.0-r1.ebuild b/dev-lang/python/python-3.5.0-r2.ebuild
index e67b55e388e..cde95c3b5ac 100644
--- a/dev-lang/python/python-3.5.0-r1.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -283,7 +283,7 @@ src_install() {
vars=( PYTHON "${vars[@]}" )
fi
- python_export "python${PYVER}" "${vars[@]}"
+ python_export "python${SLOT}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
}
diff --git a/dev-lang/python/python-3.5.0-r5.ebuild b/dev-lang/python/python-3.5.0-r5.ebuild
deleted file mode 100644
index 2ed98982edb..00000000000
--- a/dev-lang/python/python-3.5.0-r5.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# 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
-
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.5.0-0"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
-
-LICENSE="PSF-2"
-SLOT="3.5/3.5m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk 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=
- app-arch/xz-utils:0=
- >=sys-libs/zlib-1.1.3:0=
- virtual/libffi
- virtual/libintl
- 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:0= )
- !!<sys-apps/sandbox-2.6-r1"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20151117-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-PYVER=${SLOT%/*}
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat
- rm -fr Modules/_ctypes/libffi*
- rm -fr Modules/zlib
-
- if tc-is-cross-compiler; then
- # Invokes BUILDPYTHON, which is built for the host arch
- local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
- epatch "${FILESDIR}/3.5-secondary-targets.patch"
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- configure.ac \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/getpath.c \
- Modules/Setup.dist \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- #sed -i -e 's/\$(GRAMMAR_H): \$(GRAMMAR_INPUT) \$(PGEN)/$(GRAMMAR_H): \$(GRAMMAR_INPUT)/' Makefile.pre.in || die
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- 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
-
- # Export CXX so it ends up in /usr/lib/python3.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 -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
-
- BUILD_DIR="${WORKDIR}/${CHOST}"
- mkdir -p "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local myeconfargs=(
- --with-fpectl
- --enable-shared
- $(use_enable ipv6)
- $(use_with threads)
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --without-ensurepip
- --with-system-expat
- --with-system-ffi
- )
-
- ECONF_SOURCE="${S}" OPT="" econf "${myeconfargs[@]}"
-
- 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 regenerating these for cross-compiles
- touch Include/graminit.h Python/graminit.c Python/importlib.h Python/importlib_external.h || die
-
- cd "${BUILD_DIR}" || die
-
- emake CPPFLAGS= CFLAGS= LDFLAGS=
-
- # 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="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- local -x PYTHONDONTWRITEBYTECODE=
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /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${PYVER}/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${PYVER}
-
- cd "${BUILD_DIR}" || die
-
- emake DESTDIR="${D}" altinstall
-
- sed \
- -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
- # Fix collisions between different slots of Python.
- rm -f "${ED}usr/$(get_libdir)/libpython3.so"
-
- # Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED}usr/include"; echo python*)
- if [[ ${abiver} != python${PYVER} ]]; then
- # Replace python3.X with a symlink to python3.Xm
- rm "${ED}usr/bin/python${PYVER}" || die
- dosym "${abiver}" "/usr/bin/python${PYVER}"
- # Create python3.X-config symlink
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
- # Create python-3.5m.pc symlink
- dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
- fi
-
- use elibc_uclibc && rm -fr "${libdir}/test"
- use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
-
- use threads || rm -fr "${libdir}/multiprocessing"
- use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
-
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
- 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-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || 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${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
- # python and pythonX
- ln -s "../../../bin/${abiver}" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" \
- "${D}${PYTHON_SCRIPTDIR}/python" || die
- # python-config and pythonX-config
- ln -s "../../../bin/${abiver}-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-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
- ln -s "../../../bin/pyvenv-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
- fi
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; 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
- ewarn "Please adjust PYTHON_TARGETS (